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

backport: address MSVC build warnings

This commit is contained in:
Vasiliy 2018-04-13 11:38:43 +03:00
parent ee407f8b82
commit a69e4a63d0
4 changed files with 53 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arangod/IResearch/IResearchAnalyzerFeature.cpp
View File

@ -21,15 +21,22 @@
/// @author Vasiliy Nabatchikov
////////////////////////////////////////////////////////////////////////////////
// otherwise define conflict between 3rdParty\date\include\date\date.h and 3rdParty\iresearch\core\shared.hpp
#if defined(_MSC_VER)
#include "date/date.h"
#undef NOEXCEPT
#endif
#include "analysis/analyzers.hpp"
#include "analysis/token_attributes.hpp"
#include "utils/hash_utils.hpp"
#include "utils/object_pool.hpp"
#include "ApplicationServerHelper.h"
#include "IResearchAnalyzerFeature.h"
#include "IResearchFeature.h"
#include "SystemDatabaseFeature.h"
#include "VelocyPackHelper.h"
#include "Aql/AqlFunctionFeature.h"
#include "Basics/StaticStrings.h"
#include "Cluster/ServerState.h"
@ -46,9 +53,6 @@
#include "VocBase/ManagedDocumentResult.h"
#include "VocBase/vocbase.h"
#include "IResearchAnalyzerFeature.h"
#include "IResearchFeature.h"
NS_LOCAL
static std::string const ANALYZER_COLLECTION_NAME("_iresearch_analyzers");

31
arangod/IResearch/IResearchFeature.cpp
View File

@ -22,16 +22,29 @@
/// @author Vasily Nabatchikov
////////////////////////////////////////////////////////////////////////////////
#include "search/scorers.hpp"
// otherwise define conflict between 3rdParty\date\include\date\date.h and 3rdParty\iresearch\core\shared.hpp
#if defined(_MSC_VER)
#include "date/date.h"
#undef NOEXCEPT
#endif
#include "search/scorers.hpp"
#include "utils/log.hpp"
#include "ApplicationServerHelper.h"
#include "IResearchFeature.h"
#include "IResearchMMFilesLink.h"
#include "IResearchRocksDBLink.h"
#include "IResearchRocksDBRecoveryHelper.h"
#include "IResearchView.h"
#include "IResearchViewCoordinator.h"
#include "ApplicationServerHelper.h"
#include "Aql/AqlValue.h"
#include "Aql/AqlFunctionFeature.h"
#include "Aql/Function.h"
#include "Basics/SmallVector.h"
#include "Cluster/ServerState.h"
#include "Logger/Logger.h"
#include "Logger/LogMacros.h"
#include "RestServer/ViewTypesFeature.h"
#include "RocksDBEngine/RocksDBEngine.h"
#include "StorageEngine/EngineSelectorFeature.h"
@ -39,18 +52,6 @@
#include "StorageEngine/TransactionState.h"
#include "Transaction/Methods.h"
#include "VocBase/LogicalView.h"
#include "Cluster/ServerState.h"
#include "Aql/AqlValue.h"
#include "Aql/AqlFunctionFeature.h"
#include "Aql/Function.h"
#include "Logger/Logger.h"
#include "Logger/LogMacros.h"
#include "Basics/SmallVector.h"
#include "utils/log.hpp"
NS_BEGIN(arangodb)

34
arangod/IResearch/IResearchFilterFactory.cpp
View File

@ -21,20 +21,14 @@
/// @author Vasiliy Nabatchikov
////////////////////////////////////////////////////////////////////////////////
#include "IResearchFilterFactory.h"
#include "IResearchDocument.h"
#include "IResearchAnalyzerFeature.h"
#include "IResearchFeature.h"
#include "IResearchKludge.h"
#include "ExpressionFilter.h"
#include "ApplicationServerHelper.h"
#include "AqlHelper.h"
// otherwise define conflict between 3rdParty\date\include\date\date.h and 3rdParty\iresearch\core\shared.hpp
#if defined(_MSC_VER)
#include "date/date.h"
#undef NOEXCEPT
#endif
#include "Aql/Function.h"
#include "Aql/Ast.h"
#include "Logger/Logger.h"
#include "Logger/LogMacros.h"
#include <cctype>
#include <type_traits>
#include "search/all_filter.hpp"
#include "search/boolean_filter.hpp"
@ -45,8 +39,18 @@
#include "search/column_existence_filter.hpp"
#include "search/phrase_filter.hpp"
#include <cctype>
#include <type_traits>
#include "ApplicationServerHelper.h"
#include "AqlHelper.h"
#include "ExpressionFilter.h"
#include "IResearchFilterFactory.h"
#include "IResearchDocument.h"
#include "IResearchAnalyzerFeature.h"
#include "IResearchFeature.h"
#include "IResearchKludge.h"
#include "Aql/Function.h"
#include "Aql/Ast.h"
#include "Logger/Logger.h"
#include "Logger/LogMacros.h"
NS_LOCAL

12
arangod/IResearch/IResearchOrderFactory.cpp
View File

@ -21,18 +21,22 @@
/// @author Vasiliy Nabatchikov
////////////////////////////////////////////////////////////////////////////////
#include "IResearchOrderFactory.h"
// otherwise define conflict between 3rdParty\date\include\date\date.h and 3rdParty\iresearch\core\shared.hpp
#if defined(_MSC_VER)
#include "date/date.h"
#undef NOEXCEPT
#endif
#include "search/scorers.hpp"
#include "AqlHelper.h"
#include "IResearchAttributes.h"
#include "IResearchOrderFactory.h"
#include "VelocyPackHelper.h"
#include "Aql/AstNode.h"
#include "Aql/Function.h"
#include "Aql/SortCondition.h"
#include "search/scorers.hpp"
// ----------------------------------------------------------------------------
// --SECTION-- OrderFactory dependencies
// ----------------------------------------------------------------------------