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

Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api

This commit is contained in:
jsteemann 2017-03-06 17:17:02 +01:00
parent 39370aac2f f6414b38ba
commit d55e60cb2e
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Basics/FileResult.h
View File

@ -28,7 +28,7 @@
namespace arangodb { namespace arangodb {
class FileResult : public Result { class FileResult : public Result {
public: public:
FileResult(bool state); explicit FileResult(bool state);
FileResult(bool state, int sysErrorNumber); FileResult(bool state, int sysErrorNumber);
public: public:

5
lib/Basics/Result.h
View File

@ -29,7 +29,10 @@ namespace arangodb {
class Result { class Result {
public: public:
Result() : _errorNumber(TRI_ERROR_NO_ERROR) {} Result() : _errorNumber(TRI_ERROR_NO_ERROR) {}
Result(int errorNumber, std::string errorMessage) {} Result(int errorNumber, std::string const& errorMessage)
: _errorNumber(errorNumber), _errorMessage(errorMessage) {}
Result(int errorNumber, std::string&& errorMessage)
: _errorNumber(errorNumber), _errorMessage(std::move(errorMessage)) {}
virtual ~Result() {} virtual ~Result() {}