Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fix build under Visual Studio 2008

Browse source 
--HG--
branch : develop
This commit is contained in:
Jan Boon 2018-07-03 16:09:15 +08:00
parent 0863830734
commit 13e2da698a
4 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/CMakeModules/GetRevision.cmake
View file

@ -83,4 +83,6 @@ ENDIF()
IF(DEFINED REVISION) IF(DEFINED REVISION)
MESSAGE(STATUS "Found revision ${REVISION}") MESSAGE(STATUS "Found revision ${REVISION}")
ELSE()
SET(REVISION 0)
ENDIF() ENDIF()

4
code/nel/include/nel/gui/http_hsts.h
View file

@ -42,7 +42,7 @@ namespace NLGUI
class CStrictTransportSecurity class CStrictTransportSecurity
{ {
public: public:
typedef std::map<std::string, SHSTSObject> THSTSObject; typedef std::map<std::string, SHSTSObject> THSTSObjectMap;
static CStrictTransportSecurity* getInstance(); static CStrictTransportSecurity* getInstance();
static void release(); static void release();
@ -66,7 +66,7 @@ namespace NLGUI
~CStrictTransportSecurity(); ~CStrictTransportSecurity();
std::string _Filename; std::string _Filename;
THSTSObject _Domains; THSTSObjectMap _Domains;
}; };
} }

4
code/nel/src/gui/CMakeLists.txt
View file

@ -6,9 +6,9 @@ SOURCE_GROUP("src" FILES ${SRC})
NL_TARGET_LIB(nelgui ${SRC} ${HEADERS}) NL_TARGET_LIB(nelgui ${SRC} ${HEADERS})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${LUA_INCLUDE_DIR} ${LUABIND_INCLUDE_DIR} ${CURL_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${LUA_INCLUDE_DIR} ${LUABIND_INCLUDE_DIR} ${CURL_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(nelgui nelmisc nel3d ${LUA_LIBRARIES} ${LUABIND_LIBRARIES} ${CURL_LIBRARIES}) TARGET_LINK_LIBRARIES(nelgui nelmisc nel3d ${LUA_LIBRARIES} ${LUABIND_LIBRARIES} ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES})
NL_DEFAULT_PROPS(nelgui "NeL, Library: NeL GUI") NL_DEFAULT_PROPS(nelgui "NeL, Library: NeL GUI")
NL_ADD_RUNTIME_FLAGS(nelgui) NL_ADD_RUNTIME_FLAGS(nelgui)

16
code/nel/src/gui/http_hsts.cpp
View file

@ -87,9 +87,12 @@ namespace NLGUI {
if (domain.empty() || _Domains.empty()) if (domain.empty() || _Domains.empty())
return false; return false;
if (_Domains.count(domain) > 0) THSTSObjectMap::const_iterator itHsts;
itHsts = _Domains.find(domain);
if (itHsts != _Domains.end())
{ {
hsts = _Domains.at(domain); hsts = itHsts->second;
return true; return true;
} }
@ -99,11 +102,12 @@ namespace NLGUI {
{ {
std::string tmp; std::string tmp;
tmp = domain.substr(firstOf+1); tmp = domain.substr(firstOf+1);
if (_Domains.count(tmp)) itHsts = _Domains.find(tmp);
if (itHsts != _Domains.end())
{ {
if (_Domains.at(tmp).IncludeSubDomains) if (itHsts->second.IncludeSubDomains)
{ {
hsts = _Domains.at(tmp); hsts = itHsts->second;
return true; return true;
} }
@ -182,7 +186,7 @@ namespace NLGUI {
{ {
uint32 nbItems = _Domains.size(); uint32 nbItems = _Domains.size();
f.serial(nbItems); f.serial(nbItems);
for (THSTSObject::iterator it = _Domains.begin(); it != _Domains.end(); ++it) for (THSTSObjectMap::iterator it = _Domains.begin(); it != _Domains.end(); ++it)
{ {
std::string domain(it->first); std::string domain(it->first);
f.serial(domain); f.serial(domain);