Namespace our own copy of muParser to prevent downstream conflicts.

diff --git a/bundled/muparser_v2_3_3/include/muParser.h b/bundled/muparser_v2_3_3/include/muParser.h
index 62032aa1e98135b9a384a212b11b938318c30e18..aa51212f5848c9802240c322019097e777218e05 100644 (file)
--- 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 6d32f2f4d799c3e88e3dad9bdad32687379c6492..fb59183c3be9844f29b9055aedafa7f32a45d266 100644 (file)
--- 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 85b23473e41d7b8ba91227e3488abf93cdfeb39c..0cd778c062265f849f73958b11c91e3d77665899 100644 (file)
--- 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 1e53f14c52428da158d9b4ca464ab9906e7c2928..55f661188c11d5358edced5e6249ffcb180db268 100644 (file)
--- 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<string_type, ParserCallback> 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 13a15c8789dfe0ff0be93fb612d6b24bbe247ac9..046bd89ce245f8a2040776330cde929db0012df3 100644 (file)
--- 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 90fbfdfaa8ec93f925144ee5032df9d3ad2cfaf9..c664b6082023f5bccfc6acb28a57ff5907275e2f 100644 (file)
--- 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 513f0926b18e3c0c7d77e606533a0a7de225e855..81c1d4c2c895a1f5b59223edfc04b8c9c200455d 100644 (file)
--- 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 77fe54935d8d9d11a70fbe52d20f78ab90b1e616..eae3489f9d2d7cb7faaac2144cd7f4703f8d892c 100644 (file)
--- 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 22d2075f9f8da10ca900baa9268420662da46de3..15bd376230207f80511dca235b420dacd095c2a9 100644 (file)
--- 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 7410a65e819396e2d4b7a217c85169f66f573a43..3c069ffc4d64378ef4f8b3461439ab29ceb9bc8b 100644 (file)
--- 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 <std::size_t NbParams> 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 0ea19f533a73e13022cd076b045feb7841c580b7..b3cf8cd2a94023f47ce299056a6cdefc0810cd50 100644 (file)
--- 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 0ebef2a83335c7a2061e1a3b51674326577d31df..d385e6c6293e33ed4a1045a3927122c7bfaa6785 100644 (file)
--- 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 e71d5e666335d295a35085b538613651bb52e907..4247b8b953a9d168adc6282aa8bd4ca642fadfa3 100644 (file)
--- 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<char_type>('.'));
@@ -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 15007b66c95603661f09a502a9f29073118f9986..4fb2c2618c73beb5e29617cacf97f85c26019ab6 100644 (file)
--- 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 8f2265b28db9369c5a50e3a2d4262678c1dd1236..d8fbd06eae05fcffe389b0b714e5a88b3f570c16 100644 (file)
--- 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 960e48ab4d9e8bf0ddee6e627e6ff662ce334364..82f630358db6ed8202ebf346e0ae7a8150d0b5c4 100644 (file)
--- 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 76189e91987e3602b69b82a94f266528e87f5559..c21398396cd535e1518de802a4dcf647dbf7fb6a 100644 (file)
--- 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 46e0af7ddba9f69e47819503416f0ea046ded156..eaff3aa8bf36daba8e5a65baea2d52a2c6bb27ae 100644 (file)
--- 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 312a0c5ffe0c8eee5a96f8642ff018acaf2343fb..53a36fe5aa2e9b4a43b981481ea138416b9511a6 100644 (file)
--- 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)