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

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

This commit is contained in:
Jan Steemann 2015-12-04 15:53:08 +01:00
parent 1a3ea99e95 35fbe9aefd
commit c0def05b1b
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/Aql/AstNode.cpp
View File

@ -43,6 +43,8 @@
#include <iostream> #include <iostream>
#endif #endif
#include <array>
using namespace triagens::aql; using namespace triagens::aql;
using JsonHelper = triagens::basics::JsonHelper; using JsonHelper = triagens::basics::JsonHelper;
using Json = triagens::basics::Json; using Json = triagens::basics::Json;

2
arangod/VocBase/KeyGenerator.cpp
View File

@ -39,6 +39,8 @@
#include "VocBase/vocbase.h" #include "VocBase/vocbase.h"
#include <array>
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// --SECTION-- private variables // --SECTION-- private variables
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------