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

Fixed GCC4.9 compile. Stupid initializer lists.

This commit is contained in:
Frank Celler 2016-10-10 17:43:51 +02:00
parent 0bfe4473ee
commit 6865c7949a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arangod/Cluster/ClusterComm.cpp
View File

@ -335,7 +335,8 @@ OperationID ClusterComm::asyncRequest(
std::unique_ptr<HttpRequest> request; std::unique_ptr<HttpRequest> request;
if (prepared.second == nullptr) { if (prepared.second == nullptr) {
request.reset(HttpRequest::createHttpRequest(ContentType::JSON, "", 0, {})); std::unordered_map<std::string, std::string> unusedHeaders;
request.reset(HttpRequest::createHttpRequest(ContentType::JSON, "", 0, unusedHeaders));
request->setRequestType(reqtype); // mop: a fake but a good one request->setRequestType(reqtype); // mop: a fake but a good one
} else { } else {
request.reset(prepared.second); request.reset(prepared.second);

3
arangod/Cluster/ClusterComm.h
View File

@ -260,7 +260,8 @@ struct ClusterCommResult {
// containing the body of our response // containing the body of our response
// :snake: OPST_CIRCUS // :snake: OPST_CIRCUS
answer_code = dynamic_cast<HttpResponse*>(response.get())->responseCode(); answer_code = dynamic_cast<HttpResponse*>(response.get())->responseCode();
HttpRequest* request = HttpRequest::createHttpRequest(ContentType::JSON, dynamic_cast<HttpResponse*>(response.get())->body().c_str(), dynamic_cast<HttpResponse*>(response.get())->body().length(), {}); std::unordered_map<std::string, std::string> unusedHeaders;
HttpRequest* request = HttpRequest::createHttpRequest(ContentType::JSON, dynamic_cast<HttpResponse*>(response.get())->body().c_str(), dynamic_cast<HttpResponse*>(response.get())->body().length(), unusedHeaders);
auto headers = response->headers(); auto headers = response->headers();
auto errorCodes = headers.find(StaticStrings::ErrorCodes); auto errorCodes = headers.find(StaticStrings::ErrorCodes);