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

Bugfix/fix windows warnings (#5121) 

* fix windows warnings
* don't use <date/datetime.h> in global scope so it doesn't interfere with iresearch
This commit is contained in:
Wilfried Goesgens 2018-04-17 15:44:32 +02:00 committed by Max Neunhöffer
parent 9f5323bc53
commit a6ddeb3782
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Basics/datetime.cpp
View File

@ -20,6 +20,8 @@
/// @author Manuel Baesler /// @author Manuel Baesler
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#include <date/date.h>
#include <regex>
#include "Basics/datetime.h" #include "Basics/datetime.h"
#include "Logger/Logger.h" #include "Logger/Logger.h"
#include "lib/Basics/StringUtils.h" #include "lib/Basics/StringUtils.h"

2
lib/Basics/datetime.h
View File

@ -24,7 +24,7 @@
#define ARANGODB_BASICS_DATETIME_H 1 #define ARANGODB_BASICS_DATETIME_H 1
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <date/date.h> #include <chrono>
#include <regex> #include <regex>

1
tests/Basics/datetime.cpp
View File

@ -1,6 +1,7 @@
#include "Basics/datetime.h" #include "Basics/datetime.h"
#include "catch.hpp" #include "catch.hpp"
#include <date/date.h>
using namespace arangodb; using namespace arangodb;
using namespace arangodb::basics; using namespace arangodb::basics;