Merge branch 'feat_rnsmetadara' of https://github.com/jtwhite79/pestpp …

…into feat_rnsmetadara
jtwhite79 · Jan 14, 2024 · b3e2188 · b3e2188
2 parents b1974ec + 12d3884
commit b3e2188
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -85,6 +85,8 @@ set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
+add_compile_definitions(_HAS_STD_BYTE=0)
+
 # Use global "-fvisibility=hidden" see https://gcc.gnu.org/wiki/Visibility
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 

diff --git a/scripts/build_pestpp_win_no_ifort.bat b/scripts/build_pestpp_win_no_ifort.bat
@@ -9,9 +9,9 @@ rmdir /Q /S bin
 rmdir /Q /S build
 mkdir build
 rem call "C:\Program Files (x86)\IntelSWTools\compilers_and_libraries\windows\bin\compilervars.bat" intel64
-call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat" intel64
+call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat" intel64 --force
 cd build
-cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=icl ..
+cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=icx ..
 ninja
 cpack -G ZIP
 copy /y *.zip ..\

diff --git a/src/libs/opt/CoinModelUseful2.cpp b/src/libs/opt/CoinModelUseful2.cpp
@@ -179,7 +179,7 @@ union yyalloc
 #   define YYCOPY(To, From, Count)		\
       do					\
 	{					\
-	  register YYSIZE_T yyi;		\
+	  YYSIZE_T yyi;		\
 	  for (yyi = 0; yyi < (Count); yyi++)	\
 	    (To)[yyi] = (From)[yyi];		\
 	}					\
@@ -603,7 +603,7 @@ yystrlen (yystr)
      const char *yystr;
 #   endif
 {
-  register const char *yys = yystr;
+  const char *yys = yystr;
 
   while (*yys++ != '\0')
     continue;
@@ -628,8 +628,8 @@ yystpcpy (yydest, yysrc)
      const char *yysrc;
 #   endif
 {
-  register char *yyd = yydest;
-  register const char *yys = yysrc;
+  char *yyd = yydest;
+  const char *yys = yysrc;
 
   while ((*yyd++ = *yys++) != '\0')
     continue;