diff --git a/AMDiS/cmake/muparser.cmake b/AMDiS/cmake/muparser.cmake
index bb161dae18fff36f053654897606788e4c39b957..36aacc92bf772dadab9c6f66b20d866c00f72af7 100644
--- a/AMDiS/cmake/muparser.cmake
+++ b/AMDiS/cmake/muparser.cmake
@@ -18,7 +18,7 @@ include_directories(${MUPARSER_INCLUDE_DIR})
if (ENABLE_CXX11)
- add_definitions(-DMUPARSER_HAS_CXX11=1)
+ add_definitions(-DAMDIS_HAS_CXX11=1)
endif (ENABLE_CXX11)
# specify how to install this target:
diff --git a/AMDiS/cmake3/muparser.cmake b/AMDiS/cmake3/muparser.cmake
index 448bd8f2fcbd2ef07c6ec7b9149acfe35a279d3f..22427c2bfa094cd8b4b0cb53450c7e9a3f04c5fb 100644
--- a/AMDiS/cmake3/muparser.cmake
+++ b/AMDiS/cmake3/muparser.cmake
@@ -18,7 +18,7 @@ target_include_directories(muparser PUBLIC ${MUPARSER_INCLUDE_DIR})
if (ENABLE_CXX11)
target_enable_cxx11(MUPARSER_ENABLE_CXX11 muparser PRIVATE)
- target_compile_definitions(muparser PRIVATE MUPARSER_HAS_CXX11=1)
+ target_compile_definitions(muparser PRIVATE AMDIS_HAS_CXX11=1)
endif (ENABLE_CXX11)
# specify how to install this target:
diff --git a/AMDiS/lib/muparser_v134/include/muParserBase.h b/AMDiS/lib/muparser_v134/include/muParserBase.h
index be7f02c0a41218c08d2fcd3a515593006ee24459..f15eb2d2678b1ba8f33af48c2a56f2331261215a 100644
--- a/AMDiS/lib/muparser_v134/include/muParserBase.h
+++ b/AMDiS/lib/muparser_v134/include/muParserBase.h
@@ -262,7 +262,7 @@ private:
mutable stringbuf_type m_vStringBuf; ///< String buffer, used for storing string function arguments
stringbuf_type m_vStringVarBuf;
-#if MUPARSER_HAS_CXX11
+#if AMDIS_HAS_CXX11
std::unique_ptr<token_reader_type> m_pTokenReader; ///< Managed pointer to the token reader object.
#else
std::auto_ptr<token_reader_type> m_pTokenReader; ///< Managed pointer to the token reader object.
diff --git a/AMDiS/lib/muparser_v134/include/muParserToken.h b/AMDiS/lib/muparser_v134/include/muParserToken.h
index e2ea7f5ebfedf2602d71242e29d239055f8fb560..512f6d6cbab69bc9381f1bb81b329a896e37c614 100644
--- a/AMDiS/lib/muparser_v134/include/muParserToken.h
+++ b/AMDiS/lib/muparser_v134/include/muParserToken.h
@@ -78,7 +78,7 @@ namespace mu
TString m_strTok; ///< Token string
TString m_strVal; ///< Value for string variables
value_type m_fVal;
-#if MUPARSER_HAS_CXX11
+#if AMDIS_HAS_CXX11
std::unique_ptr<ParserCallback> m_pCallback;
#else
std::auto_ptr<ParserCallback> m_pCallback;
diff --git a/AMDiS/lib/muparser_v134/src/muParserTest.cpp b/AMDiS/lib/muparser_v134/src/muParserTest.cpp
index cd61092f42e26f49fab69a73f85fb74a7f02fbf0..3b2b85605c76b962d9525077783cb2ecfb63aca8 100644
--- a/AMDiS/lib/muparser_v134/src/muParserTest.cpp
+++ b/AMDiS/lib/muparser_v134/src/muParserTest.cpp
@@ -1040,7 +1040,7 @@ namespace mu
try
{
-#if MUPARSER_HAS_CXX11
+#if AMDIS_HAS_CXX11
std::unique_ptr<Parser> p1;
#else
std::auto_ptr<Parser> p1;
diff --git a/AMDiS/lib/muparser_v134/src/muParserTokenReader.cpp b/AMDiS/lib/muparser_v134/src/muParserTokenReader.cpp
index 02dd026b43c563ba9e14b1e6e04add8e8cbffedc..b39cd524bed7cb45d7cd1309fc71a4131de20d6e 100644
--- a/AMDiS/lib/muparser_v134/src/muParserTokenReader.cpp
+++ b/AMDiS/lib/muparser_v134/src/muParserTokenReader.cpp
@@ -145,7 +145,7 @@ namespace mu
*/
ParserTokenReader* ParserTokenReader::Clone(ParserBase *a_pParent) const
{
-#if MUPARSER_HAS_CXX11
+#if AMDIS_HAS_CXX11
std::unique_ptr<ParserTokenReader> ptr(new ParserTokenReader(*this));
#else
std::auto_ptr<ParserTokenReader> ptr(new ParserTokenReader(*this));
diff --git a/AMDiS/src/config/Config_msc.h b/AMDiS/src/config/Config_msc.h
index e08c42883253160285de9b3e28f074fba9176a91..fbc74b1606b6d702aac749a40f976f0fb21f253f 100644
--- a/AMDiS/src/config/Config_msc.h
+++ b/AMDiS/src/config/Config_msc.h
@@ -57,6 +57,14 @@ typedef __declspec(align(CACHE_LINE)) size_t aligned_size_t;
#undef min
#endif
+#ifdef NONE
+#undef NONE
+#endif
+
+#ifdef THIS
+#undef THIS
+#endif
+
#if MSC_VERSION >= 1800 && !defined(HAS_VARIADIC_TEMPLATES)
#define HAS_VARIADIC_TEMPLATES 1
#endif
diff --git a/AMDiS/src/io/detail/Arh3Writer.cc b/AMDiS/src/io/detail/Arh3Writer.cc
index 2af797c775c28e054f3b90f47fa98a88009e74a2..c2f90774f16c000788f73069eac16bfc3c5c8fa8 100644
--- a/AMDiS/src/io/detail/Arh3Writer.cc
+++ b/AMDiS/src/io/detail/Arh3Writer.cc
@@ -140,7 +140,7 @@ namespace AMDiS { namespace io {
macroFilename + ';' + perFilename;
macroFile_nl = macroFile.length();
- } else if (writeMacro == Macroformat::THIS) {
+ } else if (writeMacro == Macroformat::SELF) {
macroFile_nl = 13;
readFileToString(macroFilename, macroData);
@@ -163,7 +163,7 @@ namespace AMDiS { namespace io {
}
// write macro and periodic file
- if (writeMacro == Macroformat::THIS && macroFilename.length()) {
+ if (writeMacro == Macroformat::SELF && macroFilename.length()) {
file.seekp(0, ios_base::end);
long macroPos = file.tellp(), perPos = 0;
file.write(macroData.c_str(), macroData.length());
@@ -354,7 +354,7 @@ namespace AMDiS { namespace io {
macroFilename + ';' + perFilename;
macroFile_nl = macroFile.length();
- } else if (writeMacro == Macroformat::THIS) {
+ } else if (writeMacro == Macroformat::SELF) {
macroFile_nl = perFilename.length() ? 27 : 13;
macroFile.resize(macroFile_nl, ' ');
}
@@ -604,7 +604,7 @@ namespace AMDiS { namespace io {
//reset the macro positions in file
setMacrosPos(file, headerLen, macroSize);
- if (writeMacro == Macroformat::THIS)
+ if (writeMacro == Macroformat::SELF)
setMacroFile(file, headerLen, mesh, writeMacro);
file.close();
@@ -634,8 +634,8 @@ namespace AMDiS { namespace io {
{
FUNCNAME("setMacroFile()");
- TEST_EXIT(writeMacro == Macroformat::THIS)
- ("This function should only be called under Macroformat::THIS.\n");
+ TEST_EXIT(writeMacro == Macroformat::SELF)
+ ("This function should only be called under Macroformat::SELF.\n");
string macroFilename = "", perFilename = "";
string macroData = "", periodicData = "";
diff --git a/AMDiS/src/io/detail/Arh3Writer.h b/AMDiS/src/io/detail/Arh3Writer.h
index 6e9ac97adf6826bc3e8ac5796170e137f5005b8a..61986009adf2fb904f628d59e9d2f08e34298f0c 100644
--- a/AMDiS/src/io/detail/Arh3Writer.h
+++ b/AMDiS/src/io/detail/Arh3Writer.h
@@ -27,7 +27,7 @@ namespace AMDiS { namespace io {
typedef enum{
NONE = 0, // no macro
PT_MACROFILE = 1, // pointer to macro file
- THIS = 2 // pointer to this file, at the end of this file
+ SELF = 2 // pointer to this file, at the end of this file
} Value;
};