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

fixed wrong ifdefs and missing constructor for Logger

This commit is contained in:
Frank Celler 2013-12-22 14:58:51 +01:00
parent 9b49d60b0a
commit 9ac2e751c6
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/BasicsC/messages.h
View File

@ -56,7 +56,7 @@ extern "C" {
#define TRI_BYE_MESSAGE_RU "До свидания!" #define TRI_BYE_MESSAGE_RU "До свидания!"
#define TRI_BYE_MESSAGE_SV "Adjö!" #define TRI_BYE_MESSAGE_SV "Adjö!"
#define TRI_BYE_MESSAGE (\ #define TRI_BYE_MESSAGE \
TRI_BYE_MESSAGE_CH " " \ TRI_BYE_MESSAGE_CH " " \
TRI_BYE_MESSAGE_CZ " " \ TRI_BYE_MESSAGE_CZ " " \
TRI_BYE_MESSAGE_DE " " \ TRI_BYE_MESSAGE_DE " " \
@ -69,7 +69,7 @@ extern "C" {
TRI_BYE_MESSAGE_JP " " \ TRI_BYE_MESSAGE_JP " " \
TRI_BYE_MESSAGE_NL " " \ TRI_BYE_MESSAGE_NL " " \
TRI_BYE_MESSAGE_RU " " \ TRI_BYE_MESSAGE_RU " " \
TRI_BYE_MESSAGE_SV) TRI_BYE_MESSAGE_SV
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @} /// @}

2
lib/Logger/LoggerStream.cpp
View File

@ -139,7 +139,7 @@ LoggerStream::LoggerStream (LoggerData::Info const& info) :
/// @brief move or copy constructor /// @brief move or copy constructor
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#if defined(_MSC_VER) #ifdef _MSC_VER
LoggerStream::LoggerStream (LoggerStream&& copy) : LoggerStream::LoggerStream (LoggerStream&& copy) :
_stream(copy._stream), _info(copy._info) { _stream(copy._stream), _info(copy._info) {

5
lib/Logger/LoggerStream.h
View File

@ -51,7 +51,10 @@ namespace triagens {
class LoggerStream { class LoggerStream {
LoggerStream& operator= (LoggerStream const&); LoggerStream& operator= (LoggerStream const&);
#ifdef _MSC_VER
LoggerStream (LoggerStream const&); LoggerStream (LoggerStream const&);
#endif
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @} /// @}
@ -84,7 +87,7 @@ namespace triagens {
/// @brief move or copy constructor /// @brief move or copy constructor
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#if defined(_MSC_VER) #ifdef _MSC_VER
LoggerStream (LoggerStream&&); LoggerStream (LoggerStream&&);
#else #else
LoggerStream (LoggerStream const&); LoggerStream (LoggerStream const&);

2
lib/Makefile.files
View File

@ -95,7 +95,7 @@ lib_libarango_a_SOURCES = \
lib/ShapedJson/shape-accessor.c \ lib/ShapedJson/shape-accessor.c \
lib/ShapedJson/shaped-json.c \ lib/ShapedJson/shaped-json.c \
lib/Statistics/statistics.cpp \ lib/Statistics/statistics.cpp \
lib/Utilities/LineEditor.cpp \ lib/Utilities/LineEditor-readline.cpp \
lib/Utilities/ScriptLoader.cpp \ lib/Utilities/ScriptLoader.cpp \
lib/Zip/ioapi.c \ lib/Zip/ioapi.c \
lib/Zip/unzip.c \ lib/Zip/unzip.c \

2
lib/V8/V8LineEditor.cpp
View File

@ -37,7 +37,7 @@
#include "BasicsC/tri-strings.h" #include "BasicsC/tri-strings.h"
#include "V8/v8-utils.h" #include "V8/v8-utils.h"
#ifdef TRI_HAVE_LINENOISE #ifndef TRI_HAVE_LINENOISE
#if RL_READLINE_VERSION >= 0x0500 #if RL_READLINE_VERSION >= 0x0500
#define completion_matches rl_completion_matches #define completion_matches rl_completion_matches
#endif #endif