From d5c7d80ec55cc9ff7a3fbf28ef7e23c27a0d40b4 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Fri, 10 Feb 2017 17:22:55 +0100 Subject: [PATCH] Make travis happy --- .travis.yml | 3 +-- src/server/game/DataStores/DBCStores.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index cc1197450e2..180e793565c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,9 +14,8 @@ before_install: - sudo apt-get -qq update - sudo apt-get -qq install clang-3.9 - sudo apt-get -qq update - - sudo apt-get -qq install build-essential libtool make cmake cmake-data openssl libzmq3-dev + - sudo apt-get -qq install build-essential libtool make cmake cmake-data openssl libzmq3-dev libboost-all-dev - sudo apt-get -qq install libssl-dev libmysqlclient-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev - - sudo apt-get -qq install libboost1.55-dev libboost-thread1.55-dev libboost-filesystem1.55-dev libboost-system1.55-dev libboost-program-options1.55-dev libboost-iostreams1.55-dev libboost-regex1.55-dev - git config user.email "travis@build.bot" && git config user.name "Travis CI" - git tag -a -m "Travis build" init - export CC=clang-3.9 CXX=clang++-3.9 diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp index 8c59ce0909f..91a613031dc 100644 --- a/src/server/game/DataStores/DBCStores.cpp +++ b/src/server/game/DataStores/DBCStores.cpp @@ -521,10 +521,10 @@ void LoadDBCStores(const std::string& dataPath) ASSERT(Utf8toWStr(namesProfanity->Name, wname)); if (namesProfanity->Language != -1) - NamesProfaneValidators[namesProfanity->Language].emplace_back(wname, Trinity::regex::perl | Trinity::regex::icase | Trinity::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, Trinity::regex::perl | Trinity::regex::icase | Trinity::regex::optimize); + NamesProfaneValidators[i].emplace_back(wname, Trinity::regex::icase | Trinity::regex::optimize); } for (uint32 i = 0; i < sNamesReservedStore.GetNumRows(); ++i) @@ -538,10 +538,10 @@ void LoadDBCStores(const std::string& dataPath) ASSERT(Utf8toWStr(namesReserved->Name, wname)); if (namesReserved->Language != -1) - NamesReservedValidators[namesReserved->Language].emplace_back(wname, Trinity::regex::perl | Trinity::regex::icase | Trinity::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, Trinity::regex::perl | Trinity::regex::icase | Trinity::regex::optimize); + NamesReservedValidators[i].emplace_back(wname, Trinity::regex::icase | Trinity::regex::optimize); } LoadDBC(availableDbcLocales, bad_dbc_files, sPhaseStore, dbcPath, "Phase.dbc"); // 15595