Merge branch 'master' into feature/bug_code_lang

1 files changed, 9 insertions, 9 deletions

diff --git a/src/constexp_p.h b/src/constexp_p.h
index ad09b2d..1f3408b 100644
--- a/src/constexp_p.h
+++ b/src/constexp_p.h
@@ -1,10 +1,10 @@
 /******************************************************************************
  *
- * Copyright (C) 1997-2019 by Dimitri van Heesch.
+ * Copyright (C) 1997-2021 by Dimitri van Heesch.
  *
  * Permission to use, copy, modify, and distribute this software and its
- * documentation under the terms of the GNU General Public License is hereby 
- * granted. No representations are made about the suitability of this software 
+ * documentation under the terms of the GNU General Public License is hereby
+ * granted. No representations are made about the suitability of this software
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
@@ -16,7 +16,7 @@
 #ifndef _CONSTEXP_P_H
 #define _CONSTEXP_P_H
 
-#include <qcstring.h>
+#include <string>
 
 //! @file
 //! @brief Private interface between Parser (constexp.y) and Lexer (constexp.l)
@@ -27,12 +27,12 @@
 typedef void* yyscan_t;
 struct constexpYY_state
 {
-  QCString    strToken;
-  CPPValue    resultValue;
-  int         constExpLineNr;
-  QCString    constExpFileName;
+  std::string  strToken;
+  CPPValue     resultValue;
+  int          constExpLineNr;
+  std::string  constExpFileName;
 
-  const char *inputString;
+  std::string inputString;
   int         inputPosition;
 };
 constexpYY_state* constexpYYget_extra(yyscan_t yyscanner );