From ec7bb3e820572acc373808bf86a7c47b58da5abb Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Thu, 22 Oct 2015 18:41:13 +0200 Subject: [PATCH] fix for Windows build --- arangod/Aql/Index.cpp | 3 +-- arangod/Aql/Index.h | 12 +++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/arangod/Aql/Index.cpp b/arangod/Aql/Index.cpp index cc0ccd54a3..1fe216f1fc 100644 --- a/arangod/Aql/Index.cpp +++ b/arangod/Aql/Index.cpp @@ -30,7 +30,6 @@ #include "Aql/AstNode.h" #include "Aql/SortCondition.h" #include "Aql/Variable.h" -#include "Indexes/Index.h" using namespace std; using namespace triagens::basics; @@ -102,7 +101,7 @@ bool Index::supportsSortCondition (triagens::aql::SortCondition const* sortCondi /// @brief get an iterator for the index //////////////////////////////////////////////////////////////////////////////// -triagens::arango::IndexIterator* Index::getIterator (arango::IndexIteratorContext* context, +triagens::arango::IndexIterator* Index::getIterator (triagens::arango::IndexIteratorContext* context, triagens::aql::Ast* ast, triagens::aql::AstNode const* condition, triagens::aql::Variable const* reference, diff --git a/arangod/Aql/Index.h b/arangod/Aql/Index.h index 49ceefb314..cc57c5718d 100644 --- a/arangod/Aql/Index.h +++ b/arangod/Aql/Index.h @@ -35,9 +35,11 @@ #include "Basics/json.h" #include "Basics/JsonHelper.h" #include "Indexes/Index.h" +#include "Indexes/IndexIterator.h" namespace triagens { namespace aql { + class Ast; struct AstNode; class SortCondition; struct Variable; @@ -183,11 +185,11 @@ namespace triagens { /// @brief get an iterator for the index //////////////////////////////////////////////////////////////////////////////// - arango::IndexIterator* getIterator (arango::IndexIteratorContext*, - triagens::aql::Ast*, - triagens::aql::AstNode const*, - triagens::aql::Variable const*, - bool) const; + triagens::arango::IndexIterator* getIterator (triagens::arango::IndexIteratorContext*, + triagens::aql::Ast*, + triagens::aql::AstNode const*, + triagens::aql::Variable const*, + bool) const; //////////////////////////////////////////////////////////////////////////////// /// @brief specialize the condition for the index