diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | src/server/shared/DataStores/DB2StorageLoader.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 6acf9de3ddb..2d3ec5cce28 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ before_install: - sudo apt-get -qq update - sudo apt-get -qq install build-essential libtool gcc-4.8 g++-4.8 make cmake openssl - sudo apt-get -qq install libssl-dev libmysqlclient-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev libzmq3-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 + - 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 install: - mysql -uroot -e 'create database test_mysql;' diff --git a/src/server/shared/DataStores/DB2StorageLoader.cpp b/src/server/shared/DataStores/DB2StorageLoader.cpp index a67d921ba90..617c9649691 100644 --- a/src/server/shared/DataStores/DB2StorageLoader.cpp +++ b/src/server/shared/DataStores/DB2StorageLoader.cpp @@ -564,7 +564,7 @@ char* DB2DatabaseLoader::Load(const char* format, HotfixDatabaseStatements prepa ASSERT(*slot); // Value in database in main table field must be for enUS locale - if (char* str = AddString(&(*slot)->Str[LOCALE_enUS], fields[f].GetStringView())) + if (char* str = AddString(&(*slot)->Str[LOCALE_enUS], fields[f].GetString())) stringPool.push_back(str); ++stringFieldNumInRecord; @@ -578,7 +578,7 @@ char* DB2DatabaseLoader::Load(const char* format, HotfixDatabaseStatements prepa ASSERT(*slot); // Value in database in main table field must be for enUS locale - if (char* str = AddString(slot, fields[f].GetStringView())) + if (char* str = AddString(slot, fields[f].GetString())) stringPool.push_back(str); ++stringFieldNumInRecord; @@ -659,7 +659,7 @@ void DB2DatabaseLoader::LoadStrings(const char* format, HotfixDatabaseStatements // fill only not filled entries LocalizedString* db2str = *(LocalizedString**)(&dataValue[offset]); if (db2str->Str[locale] == nullStr) - if (char* str = AddString(&db2str->Str[locale], fields[1 + stringFieldNumInRecord].GetStringView())) + if (char* str = AddString(&db2str->Str[locale], fields[1 + stringFieldNumInRecord].GetString())) stringPool.push_back(str); ++stringFieldNumInRecord; |