From 57b023de066cc00b6fa249e9b0aad08abca7608f Mon Sep 17 00:00:00 2001 From: David Wells Date: Wed, 13 Apr 2022 12:20:14 -0400 Subject: [PATCH] Namespace our own copy of muParser to prevent downstream conflicts. --- bundled/muparser_v2_3_3/include/muParser.h | 3 +++ bundled/muparser_v2_3_3/include/muParserBase.h | 3 +++ bundled/muparser_v2_3_3/include/muParserBytecode.h | 3 +++ bundled/muparser_v2_3_3/include/muParserCallback.h | 3 +++ bundled/muparser_v2_3_3/include/muParserDef.h | 3 +++ bundled/muparser_v2_3_3/include/muParserError.h | 3 +++ bundled/muparser_v2_3_3/include/muParserInt.h | 3 +++ bundled/muparser_v2_3_3/include/muParserTemplateMagic.h | 3 +++ bundled/muparser_v2_3_3/include/muParserTest.h | 3 +++ bundled/muparser_v2_3_3/include/muParserToken.h | 3 +++ bundled/muparser_v2_3_3/include/muParserTokenReader.h | 3 +++ bundled/muparser_v2_3_3/src/muParser.cpp | 3 +++ bundled/muparser_v2_3_3/src/muParserBase.cpp | 3 +++ bundled/muparser_v2_3_3/src/muParserBytecode.cpp | 3 +++ bundled/muparser_v2_3_3/src/muParserCallback.cpp | 3 +++ bundled/muparser_v2_3_3/src/muParserError.cpp | 3 +++ bundled/muparser_v2_3_3/src/muParserInt.cpp | 3 +++ bundled/muparser_v2_3_3/src/muParserTest.cpp | 3 +++ bundled/muparser_v2_3_3/src/muParserTokenReader.cpp | 3 +++ 19 files changed, 57 insertions(+) diff --git a/bundled/muparser_v2_3_3/include/muParser.h b/bundled/muparser_v2_3_3/include/muParser.h index 62032aa1e9..aa51212f58 100644 --- a/bundled/muparser_v2_3_3/include/muParser.h +++ b/bundled/muparser_v2_3_3/include/muParser.h @@ -40,6 +40,8 @@ \brief Definition of the standard floating point parser. */ +namespace dealii +{ namespace mu { /** \brief Mathematical expressions parser. @@ -66,6 +68,7 @@ namespace mu static int IsVal(const char_type* a_szExpr, int* a_iPos, value_type* a_fVal); }; } // namespace mu +} #endif diff --git a/bundled/muparser_v2_3_3/include/muParserBase.h b/bundled/muparser_v2_3_3/include/muParserBase.h index 6d32f2f4d7..fb59183c3b 100644 --- a/bundled/muparser_v2_3_3/include/muParserBase.h +++ b/bundled/muparser_v2_3_3/include/muParserBase.h @@ -50,6 +50,8 @@ #endif +namespace dealii +{ namespace mu { /** \file @@ -309,6 +311,7 @@ namespace mu }; } // namespace mu +} #if defined(_MSC_VER) #pragma warning(pop) diff --git a/bundled/muparser_v2_3_3/include/muParserBytecode.h b/bundled/muparser_v2_3_3/include/muParserBytecode.h index 85b23473e4..0cd778c062 100644 --- a/bundled/muparser_v2_3_3/include/muParserBytecode.h +++ b/bundled/muparser_v2_3_3/include/muParserBytecode.h @@ -42,6 +42,8 @@ */ +namespace dealii +{ namespace mu { struct SToken @@ -146,6 +148,7 @@ namespace mu }; } // namespace mu +} #endif diff --git a/bundled/muparser_v2_3_3/include/muParserCallback.h b/bundled/muparser_v2_3_3/include/muParserCallback.h index 1e53f14c52..55f661188c 100644 --- a/bundled/muparser_v2_3_3/include/muParserCallback.h +++ b/bundled/muparser_v2_3_3/include/muParserCallback.h @@ -36,6 +36,8 @@ \brief Definition of the parser callback class. */ +namespace dealii +{ namespace mu { @@ -156,6 +158,7 @@ namespace mu typedef std::map funmap_type; } // namespace mu +} #endif diff --git a/bundled/muparser_v2_3_3/include/muParserDef.h b/bundled/muparser_v2_3_3/include/muParserDef.h index 13a15c8789..046bd89ce2 100644 --- a/bundled/muparser_v2_3_3/include/muParserDef.h +++ b/bundled/muparser_v2_3_3/include/muParserDef.h @@ -90,6 +90,8 @@ #endif +namespace dealii +{ namespace mu { #if defined(_UNICODE) @@ -509,6 +511,7 @@ namespace mu static const string_type ParserVersion = string_type(_T("2.3.3 (Release)")); static const string_type ParserVersionDate = string_type(_T("20220122")); } // end of namespace +} #if defined(_MSC_VER) #pragma warning(pop) diff --git a/bundled/muparser_v2_3_3/include/muParserError.h b/bundled/muparser_v2_3_3/include/muParserError.h index 90fbfdfaa8..c664b60820 100644 --- a/bundled/muparser_v2_3_3/include/muParserError.h +++ b/bundled/muparser_v2_3_3/include/muParserError.h @@ -47,6 +47,8 @@ \brief This file defines the error class used by the parser. */ +namespace dealii +{ namespace mu { /** \brief A class that handles the error messages. */ @@ -108,6 +110,7 @@ namespace mu const ParserErrorMsg& m_ErrMsg; }; } // namespace mu +} #if defined(_MSC_VER) #pragma warning(pop) diff --git a/bundled/muparser_v2_3_3/include/muParserInt.h b/bundled/muparser_v2_3_3/include/muParserInt.h index 513f0926b1..81c1d4c2c8 100644 --- a/bundled/muparser_v2_3_3/include/muParserInt.h +++ b/bundled/muparser_v2_3_3/include/muParserInt.h @@ -38,6 +38,8 @@ */ +namespace dealii +{ namespace mu { @@ -138,6 +140,7 @@ namespace mu }; } // namespace mu +} #endif diff --git a/bundled/muparser_v2_3_3/include/muParserTemplateMagic.h b/bundled/muparser_v2_3_3/include/muParserTemplateMagic.h index 77fe54935d..eae3489f9d 100644 --- a/bundled/muparser_v2_3_3/include/muParserTemplateMagic.h +++ b/bundled/muparser_v2_3_3/include/muParserTemplateMagic.h @@ -33,6 +33,8 @@ #include "muParserError.h" +namespace dealii +{ namespace mu { //----------------------------------------------------------------------------------------------- @@ -194,5 +196,6 @@ namespace mu static constexpr T CONST_E = (T)2.718281828459045235360287; }; } +} #endif diff --git a/bundled/muparser_v2_3_3/include/muParserTest.h b/bundled/muparser_v2_3_3/include/muParserTest.h index 22d2075f9f..15bd376230 100644 --- a/bundled/muparser_v2_3_3/include/muParserTest.h +++ b/bundled/muparser_v2_3_3/include/muParserTest.h @@ -45,6 +45,8 @@ \brief This file contains the parser test class. */ +namespace dealii +{ namespace mu { /** \brief Namespace for test cases. */ @@ -286,6 +288,7 @@ namespace mu }; } // namespace Test } // namespace mu +} #if defined(_MSC_VER) diff --git a/bundled/muparser_v2_3_3/include/muParserToken.h b/bundled/muparser_v2_3_3/include/muParserToken.h index 7410a65e81..3c069ffc4d 100644 --- a/bundled/muparser_v2_3_3/include/muParserToken.h +++ b/bundled/muparser_v2_3_3/include/muParserToken.h @@ -49,6 +49,8 @@ \brief This file contains the parser token definition. */ +namespace dealii +{ namespace mu { template struct TplCallType; @@ -516,6 +518,7 @@ namespace mu } }; } // namespace mu +} #if defined(_MSC_VER) #pragma warning(pop) diff --git a/bundled/muparser_v2_3_3/include/muParserTokenReader.h b/bundled/muparser_v2_3_3/include/muParserTokenReader.h index 0ea19f533a..b3cf8cd2a9 100644 --- a/bundled/muparser_v2_3_3/include/muParserTokenReader.h +++ b/bundled/muparser_v2_3_3/include/muParserTokenReader.h @@ -45,6 +45,8 @@ */ +namespace dealii +{ namespace mu { // Forward declaration @@ -154,6 +156,7 @@ namespace mu char_type m_cArgSep; ///< The character used for separating function arguments }; } // namespace mu +} #endif diff --git a/bundled/muparser_v2_3_3/src/muParser.cpp b/bundled/muparser_v2_3_3/src/muParser.cpp index 0ebef2a833..d385e6c629 100644 --- a/bundled/muparser_v2_3_3/src/muParser.cpp +++ b/bundled/muparser_v2_3_3/src/muParser.cpp @@ -43,6 +43,8 @@ using namespace std; /** \brief Namespace for mathematical applications. */ +namespace dealii +{ namespace mu { //--------------------------------------------------------------------------- @@ -231,3 +233,4 @@ namespace mu return fRes; } } // namespace mu +} diff --git a/bundled/muparser_v2_3_3/src/muParserBase.cpp b/bundled/muparser_v2_3_3/src/muParserBase.cpp index e71d5e6663..4247b8b953 100644 --- a/bundled/muparser_v2_3_3/src/muParserBase.cpp +++ b/bundled/muparser_v2_3_3/src/muParserBase.cpp @@ -57,6 +57,8 @@ using namespace std; \brief This file contains the basic implementation of the muparser engine. */ +namespace dealii +{ namespace mu { std::locale ParserBase::s_locale = std::locale(std::locale::classic(), new change_dec_sep('.')); @@ -1915,6 +1917,7 @@ namespace mu } } // namespace mu +} #if defined(_MSC_VER) #pragma warning(pop) diff --git a/bundled/muparser_v2_3_3/src/muParserBytecode.cpp b/bundled/muparser_v2_3_3/src/muParserBytecode.cpp index 15007b66c9..4fb2c2618c 100644 --- a/bundled/muparser_v2_3_3/src/muParserBytecode.cpp +++ b/bundled/muparser_v2_3_3/src/muParserBytecode.cpp @@ -45,6 +45,8 @@ #endif +namespace dealii +{ namespace mu { /** \brief Bytecode default constructor. */ @@ -638,6 +640,7 @@ namespace mu mu::console() << _T("END") << std::endl; } } // namespace mu +} #if defined(_MSC_VER) #pragma warning(pop) diff --git a/bundled/muparser_v2_3_3/src/muParserCallback.cpp b/bundled/muparser_v2_3_3/src/muParserCallback.cpp index 8f2265b28d..d8fbd06eae 100644 --- a/bundled/muparser_v2_3_3/src/muParserCallback.cpp +++ b/bundled/muparser_v2_3_3/src/muParserCallback.cpp @@ -38,6 +38,8 @@ */ +namespace dealii +{ namespace mu { static constexpr int CALLBACK_INTERNAL_VAR_ARGS = 1 << 14; @@ -888,6 +890,7 @@ namespace mu return (m_iArgc & CALLBACK_INTERNAL_VAR_ARGS) ? -1 : (m_iArgc & CALLBACK_INTERNAL_FIXED_ARGS_MASK); } } // namespace mu +} #if defined(_MSC_VER) #pragma warning(pop) diff --git a/bundled/muparser_v2_3_3/src/muParserError.cpp b/bundled/muparser_v2_3_3/src/muParserError.cpp index 960e48ab4d..82f630358d 100644 --- a/bundled/muparser_v2_3_3/src/muParserError.cpp +++ b/bundled/muparser_v2_3_3/src/muParserError.cpp @@ -34,6 +34,8 @@ #pragma warning(disable : 26812) // MSVC wants to force me te use enum classes or bother me with pointless warnings #endif +namespace dealii +{ namespace mu { //------------------------------------------------------------------------------ @@ -329,6 +331,7 @@ namespace mu return m_iErrc; } } // namespace mu +} #if defined(_MSC_VER) #pragma warning(pop) diff --git a/bundled/muparser_v2_3_3/src/muParserInt.cpp b/bundled/muparser_v2_3_3/src/muParserInt.cpp index 76189e9198..c21398396c 100644 --- a/bundled/muparser_v2_3_3/src/muParserInt.cpp +++ b/bundled/muparser_v2_3_3/src/muParserInt.cpp @@ -39,6 +39,8 @@ using namespace std; */ /** \brief Namespace for mathematical applications. */ +namespace dealii +{ namespace mu { value_type ParserInt::Abs(value_type v) { return (value_type)Round(fabs((double)v)); } @@ -277,3 +279,4 @@ namespace mu } } // namespace mu +} diff --git a/bundled/muparser_v2_3_3/src/muParserTest.cpp b/bundled/muparser_v2_3_3/src/muParserTest.cpp index 46e0af7ddb..eaff3aa8bf 100644 --- a/bundled/muparser_v2_3_3/src/muParserTest.cpp +++ b/bundled/muparser_v2_3_3/src/muParserTest.cpp @@ -39,6 +39,8 @@ using namespace std; \brief This file contains the implementation of parser test cases. */ +namespace dealii +{ namespace mu { namespace Test @@ -1715,3 +1717,4 @@ namespace mu } } // namespace test } // namespace mu +} diff --git a/bundled/muparser_v2_3_3/src/muParserTokenReader.cpp b/bundled/muparser_v2_3_3/src/muParserTokenReader.cpp index 312a0c5ffe..53a36fe5aa 100644 --- a/bundled/muparser_v2_3_3/src/muParserTokenReader.cpp +++ b/bundled/muparser_v2_3_3/src/muParserTokenReader.cpp @@ -45,6 +45,8 @@ */ +namespace dealii +{ namespace mu { @@ -991,6 +993,7 @@ namespace mu return m_cArgSep; } } // namespace mu +} #if defined(_MSC_VER) #pragma warning(pop) -- 2.39.5