Merge pull request #14387 from alalek:fix_winpack_build

modules/core/include/opencv2/core/utils/logtag.hpp

@@ -17,7 +17,7 @@ struct LogTag
     const char* name;
     LogLevel level;
 
-    inline constexpr LogTag(const char* _name, LogLevel _level)
+    inline LogTag(const char* _name, LogLevel _level)
         : name(_name)
         , level(_level)
     {}

modules/core/src/logger.cpp

@@ -31,14 +31,13 @@ struct GlobalLoggingInitStruct
 {
 public:
 #if defined NDEBUG
-    static constexpr bool m_isDebugBuild = false;
+    static const bool m_isDebugBuild = false;
 #else
-    static constexpr bool m_isDebugBuild = true;
+    static const bool m_isDebugBuild = true;
 #endif
 
 public:
-    static constexpr LogLevel m_defaultUnconfiguredGlobalLevel =
-        m_isDebugBuild ? LOG_LEVEL_DEBUG : LOG_LEVEL_WARNING;
+    static LogLevel m_defaultUnconfiguredGlobalLevel;
 
 public:
     LogTagManager logTagManager;
@@ -75,6 +74,11 @@ private:
     }
 };
 
+LogLevel GlobalLoggingInitStruct::m_defaultUnconfiguredGlobalLevel = GlobalLoggingInitStruct::m_isDebugBuild
+                ? LOG_LEVEL_DEBUG
+                : LOG_LEVEL_WARNING;
+
+
 // Static dynamic initialization guard function for the combined struct
 // just defined above
 //

modules/core/src/utils/logtagconfigparser.cpp

@@ -145,7 +145,7 @@ void LogTagConfigParser::parseNameAndLevel(const std::string& s)
 
 void LogTagConfigParser::parseWildcard(const std::string& name, LogLevel level)
 {
-    constexpr size_t npos = std::string::npos;
+    const size_t npos = std::string::npos;
     const size_t len = name.length();
     if (len == 0u)
     {

modules/core/src/utils/logtagmanager.cpp

@@ -10,6 +10,10 @@ namespace cv {
 namespace utils {
 namespace logging {
 
+
+const char* LogTagManager::m_globalName = "global";
+
+
 LogTagManager::LogTagManager(LogLevel defaultUnconfiguredGlobalLevel)
     : m_mutex()
     , m_globalLogTag(new LogTag(m_globalName, defaultUnconfiguredGlobalLevel))

modules/core/src/utils/logtagmanager.hpp

@@ -270,7 +270,7 @@ private:
     static bool internal_isNamePartMatch(MatchingScope scope, size_t matchingPos);
 
 private:
-    static constexpr const char* m_globalName = "global";
+    static const char* m_globalName;
 
 private:
     mutable MutexType m_mutex;

modules/core/test/test_logtagmanager.cpp

@@ -23,18 +23,18 @@ using LogTag = cv::utils::logging::LogTag;
 using LogTagManager = cv::utils::logging::LogTagManager;
 
 // Value to initialize log tag constructors
-static constexpr const LogLevel constTestLevelBegin = cv::utils::logging::LOG_LEVEL_SILENT;
+static const LogLevel constTestLevelBegin = cv::utils::logging::LOG_LEVEL_SILENT;
 
 // Value to be set as part of test (to simulate runtime changes)
-static constexpr const LogLevel constTestLevelChanged = cv::utils::logging::LOG_LEVEL_VERBOSE;
+static const LogLevel constTestLevelChanged = cv::utils::logging::LOG_LEVEL_VERBOSE;
 
 // An alternate value to initialize log tag constructors,
 // for test cases where two distinct initialization values are needed.
-static constexpr const LogLevel constTestLevelAltBegin = cv::utils::logging::LOG_LEVEL_FATAL;
+static const LogLevel constTestLevelAltBegin = cv::utils::logging::LOG_LEVEL_FATAL;
 
 // An alternate value to be set as part of test (to simulate runtime changes),
 // for test cases where two distinct runtime set values are needed.
-static constexpr const LogLevel constTestLevelAltChanged = cv::utils::logging::LOG_LEVEL_DEBUG;
+static const LogLevel constTestLevelAltChanged = cv::utils::logging::LOG_LEVEL_DEBUG;
 
 // Enums for specifying which LogTagManager method to call.
 // Used in parameterized tests.
@@ -153,7 +153,7 @@ protected:
     LogTag* m_actualGlobalLogTag;
 
 protected:
-    static constexpr const char* m_globalTagName = "global";
+    static const char* const m_globalTagName;
 
 public:
     LogTagManagerGlobalSmokeTest()
@@ -163,6 +163,9 @@ public:
     }
 };
 
+const char* const LogTagManagerGlobalSmokeTest::m_globalTagName = "global";
+
+
 TEST_F(LogTagManagerGlobalSmokeTest, AfterCtorCanGetGlobalWithoutAssign)
 {
     EXPECT_NE(m_logTagManager.get(m_globalTagName), nullptr);
@@ -217,7 +220,7 @@ protected:
     LogTag m_something;
 
 protected:
-    static constexpr const char* m_somethingTagName = "something";
+    static const char* const m_somethingTagName;
 
 public:
     LogTagManagerNonGlobalSmokeTest()
@@ -227,6 +230,9 @@ public:
     }
 };
 
+const char* const LogTagManagerNonGlobalSmokeTest::m_somethingTagName = "something";
+
+
 TEST_F(LogTagManagerNonGlobalSmokeTest, CanAssignTagAndThenGet)
 {
     m_logTagManager.assign(m_something.name, &m_something);
@@ -332,11 +338,11 @@ protected:
     LogTag tagOurs;
 
 protected:
-    static constexpr const char* strSour = "sour";
-    static constexpr const char* strSop = "sop";
-    static constexpr const char* strSoursop = "soursop";
-    static constexpr const char* strSourDotSop = "sour.sop";
-    static constexpr const char* strOurs = "ours";
+    static const char* const strSour; // = "sour";
+    static const char* const strSop; // = "sop";
+    static const char* const strSoursop; // = "soursop";
+    static const char* const strSourDotSop; // = "sour.sop";
+    static const char* const strOurs; // = "ours";
 
 public:
     LogTagManagerSubstrNonConfusionFixture()
@@ -384,6 +390,13 @@ public:
     }
 };
 
+const char* const LogTagManagerSubstrNonConfusionFixture::strSour = "sour";
+const char* const LogTagManagerSubstrNonConfusionFixture::strSop = "sop";
+const char* const LogTagManagerSubstrNonConfusionFixture::strSoursop = "soursop";
+const char* const LogTagManagerSubstrNonConfusionFixture::strSourDotSop = "sour.sop";
+const char* const LogTagManagerSubstrNonConfusionFixture::strOurs = "ours";
+
+
 INSTANTIATE_TEST_CASE_P(
     LogTagManagerSubstrNonConfusionTest,
     LogTagManagerSubstrNonConfusionFixture,
@@ -482,14 +495,14 @@ protected:
     LogTag m_coconutDotPineapple;
 
 protected:
-    static constexpr const char* strApple = "apple";
-    static constexpr const char* strBanana = "banana";
-    static constexpr const char* strCoconut = "coconut";
-    static constexpr const char* strOrange = "orange";
-    static constexpr const char* strPineapple = "pineapple";
-    static constexpr const char* strBananaDotOrange = "banana.orange";
-    static constexpr const char* strBananaDotPineapple = "banana.pineapple";
-    static constexpr const char* strCoconutDotPineapple = "coconut.pineapple";
+    static const char* const strApple; // = "apple";
+    static const char* const strBanana; // = "banana";
+    static const char* const strCoconut; // = "coconut";
+    static const char* const strOrange; // = "orange";
+    static const char* const strPineapple; // = "pineapple";
+    static const char* const strBananaDotOrange; // = "banana.orange";
+    static const char* const strBananaDotPineapple; // = "banana.pineapple";
+    static const char* const strCoconutDotPineapple; // = "coconut.pineapple";
 
 public:
     LogTagManagerNamePartNonConfusionFixture()
@@ -542,7 +555,7 @@ protected:
         // Each row ("config") specifies the tag name specifier used to call setLevelByFirstPart().
         // Each column ("target") specifies whether an actual tag with the "target"
         // name would have its log level changed because of the call to setLevelByFirstPart().
-        static constexpr const bool expectedResultUsingFirstPart[5][8] =
+        static const bool expectedResultUsingFirstPart[5][8] =
         {
             /*byFirstPart(apple)*/ { true, false, false, false, false, false, false, false },
             /*byFirstPart(banana)*/ { false, true, false, false, false, true, true, false },
@@ -555,7 +568,7 @@ protected:
         // Each row ("config") specifies the tag name specifier used to call setLevelByAnyPart().
         // Each column ("target") specifies whether an actual tag with the "target"
         // name would have its log level changed because of the call to setLevelByAnyPart().
-        static constexpr const bool expectedResultUsingAnyPart[5][8] =
+        static const bool expectedResultUsingAnyPart[5][8] =
         {
             /*byAnyPart(apple)*/ { true, false, false, false, false, false, false, false },
             /*byAnyPart(banana)*/ { false, true, false, false, false, true, true, false },
@@ -578,6 +591,16 @@ protected:
     }
 };
 
+const char* const LogTagManagerNamePartNonConfusionFixture::strApple = "apple";
+const char* const LogTagManagerNamePartNonConfusionFixture::strBanana = "banana";
+const char* const LogTagManagerNamePartNonConfusionFixture::strCoconut = "coconut";
+const char* const LogTagManagerNamePartNonConfusionFixture::strOrange = "orange";
+const char* const LogTagManagerNamePartNonConfusionFixture::strPineapple = "pineapple";
+const char* const LogTagManagerNamePartNonConfusionFixture::strBananaDotOrange = "banana.orange";
+const char* const LogTagManagerNamePartNonConfusionFixture::strBananaDotPineapple = "banana.pineapple";
+const char* const LogTagManagerNamePartNonConfusionFixture::strCoconutDotPineapple = "coconut.pineapple";
+
+
 INSTANTIATE_TEST_CASE_P(
     LogTagManagerNamePartNonConfusionTest,
     LogTagManagerNamePartNonConfusionFixture,