Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Jan Steemann 2015-08-04 14:32:42 +02:00
parent 342e44c374 5b4eeb4dae
commit a2d75cd9c8
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arangod/Cluster/ClusterInfo.cpp
View File

@ -43,6 +43,11 @@
#include "Basics/StringUtils.h" #include "Basics/StringUtils.h"
#include "VocBase/server.h" #include "VocBase/server.h"
#ifdef _WIN32
// turn off warnings about too long type name for debug symbols blabla in MSVC only...
#pragma warning(disable : 4503)
#endif
using namespace std; using namespace std;
using namespace triagens::arango; using namespace triagens::arango;
using triagens::basics::JsonHelper; using triagens::basics::JsonHelper;

4
arangod/RestServer/VocbaseContext.cpp
View File

@ -1,4 +1,4 @@
//////////////////////////////////////////////////////////////////////////////// > ////////////////////////////////////////////////////////////////////////////////
/// @brief vocbase context /// @brief vocbase context
/// ///
/// @file /// @file
@ -59,7 +59,7 @@ static triagens::basics::Mutex SidLock;
#ifdef _WIN32 #ifdef _WIN32
// turn off warnings about too long type name for debug symbols blabla in MSVC only... // turn off warnings about too long type name for debug symbols blabla in MSVC only...
#pragma warning(disable : 4503) #pragma warning(disable : 4503)
#endif #endif
typedef std::unordered_map<std::string, std::pair<std::string, double>> DatabaseSessionsType; typedef std::unordered_map<std::string, std::pair<std::string, double>> DatabaseSessionsType;