1
0
Fork 0

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
commit d55e60cb2e
2 changed files with 5 additions and 2 deletions

View File

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

View File

@ -29,7 +29,10 @@ namespace arangodb {
class Result {
public:
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() {}