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

Fixes to compile under Visual Studio.

This commit is contained in:
Jan Steemann 2014-05-22 16:27:30 +02:00
parent bb5b341ba6
commit 922d4890f2
6 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/Ahuacatl/ahuacatl-parser-functions.cpp
View File

@ -42,7 +42,7 @@
/// @brief init the lexer /// @brief init the lexer
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
bool TRI_InitParserAql (TRI_aql_context_t* const context) { bool TRI_InitParserAql (TRI_aql_context_t* context) {
assert(context); assert(context);
assert(context->_parser); assert(context->_parser);

4
arangod/Ahuacatl/ahuacatl-parser-functions.h
View File

@ -65,7 +65,7 @@ int Ahuacatllex_destroy (void *);
/// @brief forward for the context function provided by the lexer (.l) /// @brief forward for the context function provided by the lexer (.l)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void Ahuacatlset_extra (TRI_aql_context_t* const, void*); void Ahuacatlset_extra (TRI_aql_context_t*, void*);
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @} /// @}
@ -84,7 +84,7 @@ void Ahuacatlset_extra (TRI_aql_context_t* const, void*);
/// @brief init the lexer /// @brief init the lexer
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
bool TRI_InitParserAql (TRI_aql_context_t* const); bool TRI_InitParserAql (TRI_aql_context_t*);
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief parse & validate the query string /// @brief parse & validate the query string

2
arangod/Wal/LogfileManager.cpp
View File

@ -131,7 +131,7 @@ LogfileManager* LogfileManager::instance () {
/// @brief initialise the logfile manager instance /// @brief initialise the logfile manager instance
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void LogfileManager::initialise (string* path) { void LogfileManager::initialise (std::string* path) {
assert(Instance == nullptr); assert(Instance == nullptr);
Instance = new LogfileManager(path); Instance = new LogfileManager(path);

24
arangod/Wal/Marker.cpp
View File

@ -67,7 +67,7 @@ Marker::Marker (Marker const& other)
Marker::Marker (TRI_df_marker_type_e type, Marker::Marker (TRI_df_marker_type_e type,
size_t size) size_t size)
: _buffer(new char[size]), : _buffer(new char[size]),
_size(size) { _size(static_cast<uint32_t>(size)) {
TRI_df_marker_t* m = reinterpret_cast<TRI_df_marker_t*>(begin()); TRI_df_marker_t* m = reinterpret_cast<TRI_df_marker_t*>(begin());
m->_type = type; m->_type = type;
@ -429,12 +429,11 @@ EdgeMarker EdgeMarker::clone (TRI_df_marker_t const* other,
if (other->_type == TRI_DOC_MARKER_KEY_EDGE) { if (other->_type == TRI_DOC_MARKER_KEY_EDGE) {
TRI_doc_edge_key_marker_t const* original = reinterpret_cast<TRI_doc_edge_key_marker_t const*>(other); TRI_doc_edge_key_marker_t const* original = reinterpret_cast<TRI_doc_edge_key_marker_t const*>(other);
TRI_document_edge_t const edge = { TRI_document_edge_t edge;
._fromCid = original->_fromCid, edge._fromCid = original->_fromCid;
._toCid = original->_toCid, edge._toCid = original->_toCid;
._toKey = (TRI_voc_key_t) base + original->_offsetToKey, edge._toKey = (TRI_voc_key_t) base + original->_offsetToKey;
._fromKey = (TRI_voc_key_t) base + original->_offsetFromKey edge._fromKey = (TRI_voc_key_t) base + original->_offsetFromKey;
};
return EdgeMarker(databaseId, return EdgeMarker(databaseId,
collectionId, collectionId,
@ -453,12 +452,11 @@ EdgeMarker EdgeMarker::clone (TRI_df_marker_t const* other,
assert(original->_databaseId == databaseId); assert(original->_databaseId == databaseId);
assert(original->_collectionId == collectionId); assert(original->_collectionId == collectionId);
TRI_document_edge_t const edge = { TRI_document_edge_t edge;
._fromCid = original->_fromCid, edge._fromCid = original->_fromCid;
._toCid = original->_toCid, edge._toCid = original->_toCid;
._toKey = (TRI_voc_key_t) base + original->_offsetToKey, edge._toKey = (TRI_voc_key_t) base + original->_offsetToKey;
._fromKey = (TRI_voc_key_t) base + original->_offsetFromKey edge._fromKey = (TRI_voc_key_t) base + original->_offsetFromKey;
};
return EdgeMarker(original->_databaseId, return EdgeMarker(original->_databaseId,
original->_collectionId, original->_collectionId,

3
lib/ShapedJson/Legends.cpp
View File

@ -269,6 +269,9 @@ size_t JsonLegend::getSize () const {
+ roundup8(_shape_data.length()); // shape data, padded + roundup8(_shape_data.length()); // shape data, padded
} }
JsonLegend::AttributeComparerClass JsonLegend::AttributeComparerObject;
JsonLegend::ShapeComparerClass JsonLegend::ShapeComparerObject;
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief dump the legend to the buffer pointed to by buf /// @brief dump the legend to the buffer pointed to by buf
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

1
lib/ShapedJson/Legends.h
View File

@ -40,6 +40,7 @@
namespace triagens { namespace triagens {
namespace basics { namespace basics {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief create a legend for one or more shaped json objects /// @brief create a legend for one or more shaped json objects
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////