Core/Misc: Added regex compatibility layer to fall back to boost::regex for really old compiler

(cherry picked from commit b6f1f8405f)

dep/boost/CMakeLists.txt

@@ -26,12 +26,21 @@ if(WIN32)
   set(Boost_USE_STATIC_RUNTIME     OFF)
 endif()
 
-find_package(Boost 1.55 REQUIRED system filesystem thread program_options iostreams)
+include (CheckCXXSourceCompiles)
+
+check_cxx_source_compiles("
+  #include <regex>
+  int main() { std::wregex r(L\".*\"); }"
+  STD_HAS_WORKING_WREGEX)
+
+if (STD_HAS_WORKING_WREGEX)
+  find_package(Boost 1.55 REQUIRED system filesystem thread program_options iostreams)
+else()
+  find_package(Boost 1.55 REQUIRED system filesystem thread program_options iostreams regex)
+endif()
 
 # Find if Boost was compiled in C++03 mode because it requires -DBOOST_NO_CXX11_SCOPED_ENUMS
 
-include (CheckCXXSourceCompiles)
-
 set(CMAKE_REQUIRED_INCLUDES ${Boost_INCLUDE_DIR})
 set(CMAKE_REQUIRED_LIBRARIES ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${Boost_IOSTREAMS_LIBRARY})
 set(CMAKE_REQUIRED_FLAGS "-std=c++11")
@@ -54,17 +63,20 @@ target_include_directories(boost
   INTERFACE
     ${Boost_INCLUDE_DIRS})
 
-if (boost_filesystem_copy_links_without_NO_SCOPED_ENUM)
+target_compile_definitions(boost
+  INTERFACE
+    -DBOOST_DATE_TIME_NO_LIB
+    -DBOOST_REGEX_NO_LIB
+    -DBOOST_CHRONO_NO_LIB)
+
+if (NOT boost_filesystem_copy_links_without_NO_SCOPED_ENUM)
   target_compile_definitions(boost
     INTERFACE
-      -DBOOST_DATE_TIME_NO_LIB
-      -DBOOST_REGEX_NO_LIB
-      -DBOOST_CHRONO_NO_LIB)
-else()
-  target_compile_definitions(boost
-    INTERFACE
-      -DBOOST_DATE_TIME_NO_LIB
-      -DBOOST_REGEX_NO_LIB
-      -DBOOST_CHRONO_NO_LIB
       -DBOOST_NO_CXX11_SCOPED_ENUMS)
 endif()
+
+if (NOT STD_HAS_WORKING_WREGEX)
+  target_compile_definitions(boost
+    INTERFACE
+      -DTC_HAS_BROKEN_WSTRING_REGEX)
+endif()

src/common/Utilities/Regex.h

@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef TrinityCore_Regex_h__
+#define TrinityCore_Regex_h__
+
+#ifndef TC_HAS_BROKEN_WSTRING_REGEX
+#include <regex>
+#define TC_REGEX_NAMESPACE std
+#else
+#include <boost/regex.hpp>
+#define TC_REGEX_NAMESPACE boost
+#endif
+
+// regex compatibility layer, required for clang building with libstdc++-4.9
+namespace Trinity
+{
+    using regex = TC_REGEX_NAMESPACE :: regex;
+    using wregex = TC_REGEX_NAMESPACE :: wregex;
+
+    using :: TC_REGEX_NAMESPACE :: regex_match;
+    using :: TC_REGEX_NAMESPACE :: regex_search;
+}
+
+#endif // TrinityCore_Regex_h__

src/server/game/DataStores/DBCStores.cpp

@@ -24,8 +24,8 @@
 #include "DBCfmt.h"
 #include "Timer.h"
 #include "ObjectDefines.h"
+#include "Regex.h"
 
-#include <regex>
 #include <map>
 
 typedef std::map<uint16, uint32> AreaFlagByAreaID;
@@ -145,7 +145,7 @@ DBCStorage <MovieEntry> sMovieStore(MovieEntryfmt);
 
 DBCStorage<NamesProfanityEntry> sNamesProfanityStore(NamesProfanityEntryfmt);
 DBCStorage<NamesReservedEntry> sNamesReservedStore(NamesReservedEntryfmt);
-typedef std::array<std::vector<std::wregex>, TOTAL_LOCALES> NameValidationRegexContainer;
+typedef std::array<std::vector<Trinity::wregex>, TOTAL_LOCALES> NameValidationRegexContainer;
 NameValidationRegexContainer NamesProfaneValidators;
 NameValidationRegexContainer NamesReservedValidators;
 
@@ -414,10 +414,10 @@ void LoadDBCStores(const std::string& dataPath)
         ASSERT(Utf8toWStr(namesProfanity->Name, wname));
 
         if (namesProfanity->Language != -1)
-            NamesProfaneValidators[namesProfanity->Language].emplace_back(wname, std::regex::icase | std::regex::optimize);
+            NamesProfaneValidators[namesProfanity->Language].emplace_back(wname, Trinity::regex::icase | Trinity::regex::optimize);
         else
             for (uint32 i = 0; i < TOTAL_LOCALES; ++i)
-                NamesProfaneValidators[i].emplace_back(wname, std::regex::icase | std::regex::optimize);
+                NamesProfaneValidators[i].emplace_back(wname, Trinity::regex::icase | Trinity::regex::optimize);
     }
 
     for (uint32 i = 0; i < sNamesReservedStore.GetNumRows(); ++i)
@@ -431,10 +431,10 @@ void LoadDBCStores(const std::string& dataPath)
         ASSERT(Utf8toWStr(namesReserved->Name, wname));
 
         if (namesReserved->Language != -1)
-            NamesReservedValidators[namesReserved->Language].emplace_back(wname, std::regex::icase | std::regex::optimize);
+            NamesReservedValidators[namesReserved->Language].emplace_back(wname, Trinity::regex::icase | Trinity::regex::optimize);
         else
             for (uint32 i = 0; i < TOTAL_LOCALES; ++i)
-                NamesReservedValidators[i].emplace_back(wname, std::regex::icase | std::regex::optimize);
+                NamesReservedValidators[i].emplace_back(wname, Trinity::regex::icase | Trinity::regex::optimize);
     }
 
 
@@ -1011,13 +1011,13 @@ ResponseCodes ValidateName(std::wstring const& name, LocaleConstant locale)
     if (locale >= TOTAL_LOCALES)
         return RESPONSE_FAILURE;
 
-    for (std::wregex const& regex : NamesProfaneValidators[locale])
-        if (std::regex_search(name, regex))
+    for (Trinity::wregex const& regex : NamesProfaneValidators[locale])
+        if (Trinity::regex_search(name, regex))
             return CHAR_NAME_PROFANE;
 
     // regexes at TOTAL_LOCALES are loaded from NamesReserved which is not locale specific
-    for (std::wregex const& regex : NamesReservedValidators[locale])
-        if (std::regex_search(name, regex))
+    for (Trinity::wregex const& regex : NamesReservedValidators[locale])
+        if (Trinity::regex_search(name, regex))
             return CHAR_NAME_RESERVED;
 
     return CHAR_NAME_SUCCESS;

src/server/game/Scripting/ScriptReloadMgr.cpp

@@ -308,12 +308,12 @@ Optional<std::shared_ptr<ScriptModule>>
 static bool HasValidScriptModuleName(std::string const& name)
 {
     // Detects scripts_NAME.dll's / .so's
-    static std::regex const regex(
+    static Trinity::regex const regex(
         Trinity::StringFormat("^%s[sS]cripts_[a-zA-Z0-9_]+\\.%s$",
             GetSharedLibraryPrefix(),
             GetSharedLibraryExtension()));
 
-    return std::regex_match(name, regex);
+    return Trinity::regex_match(name, regex);
 }
 
 /// File watcher responsible for watching shared libraries
@@ -1529,8 +1529,8 @@ void LibraryUpdateListener::handleFileAction(efsw::WatchID watchid, std::string
 /// Returns true when the given path has a known C++ file extension
 static bool HasCXXSourceFileExtension(fs::path const& path)
 {
-    static std::regex const regex("^\\.(h|hpp|c|cc|cpp)$");
-    return std::regex_match(path.extension().generic_string(), regex);
+    static Trinity::regex const regex("^\\.(h|hpp|c|cc|cpp)$");
+    return Trinity::regex_match(path.extension().generic_string(), regex);
 }
 
 SourceUpdateListener::SourceUpdateListener(fs::path path, std::string script_module_name)