Merge branch 'devel' of https://github.com/arangodb/arangodb into cursor-refactoring

jsteemann · jsteemann · commit ca6801d473b2 · 2015-03-31T15:13:41.000+02:00
diff --git a/arangod/Aql/ExecutionBlock.cpp b/arangod/Aql/ExecutionBlock.cpp
@@ -1032,7 +1032,7 @@ IndexRangeBlock::IndexRangeBlock (ExecutionEngine* engine,
       isConstant &= r.isConstant();
     }
     _anyBoundVariable |= ! isConstant;
-    _allBoundsConstant.emplace_back(isConstant);
+    _allBoundsConstant.push_back(isConstant);
   }
 }
 
diff --git a/lib/HttpServer/HttpServerJob.cpp b/lib/HttpServer/HttpServerJob.cpp
@@ -193,7 +193,7 @@ bool HttpServerJob::beginShutdown () {
 /// {@inheritDoc}
 ////////////////////////////////////////////////////////////////////////////////
 
-void HttpServerJob::handleError (basics::Exception const& ex) {
+void HttpServerJob::handleError (triagens::basics::Exception const& ex) {
   _handler->handleError(ex);
 }
 
diff --git a/lib/HttpServer/HttpServerJob.h b/lib/HttpServer/HttpServerJob.h
@@ -172,13 +172,13 @@ namespace triagens {
 /// @brief shutdown in progress
 ////////////////////////////////////////////////////////////////////////////////
 
-        std::atomic_bool _shutdown;
+        std::atomic<bool> _shutdown;
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief server is dead
 ////////////////////////////////////////////////////////////////////////////////
 
-        std::atomic_bool _abandon;
+        std::atomic<bool> _abandon;
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief job is detached (executed without a comm-task)

Original file line number	Diff line number	Diff line change
`@@ -1032,7 +1032,7 @@ IndexRangeBlock::IndexRangeBlock (ExecutionEngine* engine,`
`1032`	`1032`	`isConstant &= r.isConstant();`
`1033`	`1033`	`}`
`1034`	`1034`	`_anyBoundVariable \|= ! isConstant;`
`1035`		`- _allBoundsConstant.emplace_back(isConstant);`
	`1035`	`+ _allBoundsConstant.push_back(isConstant);`
`1036`	`1036`	`}`
`1037`	`1037`	`}`
`1038`	`1038`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ bool HttpServerJob::beginShutdown () {`
`193`	`193`	`/// {@inheritDoc}`
`194`	`194`	`////////////////////////////////////////////////////////////////////////////////`
`195`	`195`
`196`		`-void HttpServerJob::handleError (basics::Exception const& ex) {`
	`196`	`+void HttpServerJob::handleError (triagens::basics::Exception const& ex) {`
`197`	`197`	`_handler->handleError(ex);`
`198`	`198`	`}`
`199`	`199`