Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-31 14:17:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sync with 3.3.5a

Browse Source
This commit is contained in:
Aokromes
2017-02-10 06:45:33 +01:00
parent ce5a361470
commit bc19916d79
6 changed files with 92 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/game/Scripting/ScriptReloadMgr.cpp
View File

@@ -297,12 +297,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
@@ -1509,8 +1509,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)