Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix GCC v5.5.0 build after 82fe21f #962

Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/adaptation/ecap/XactionRep.cc
Expand Up @@ -163,12 +163,12 @@ Adaptation::Ecap::XactionRep::usernameValue() const
}

const libecap::Area
Adaptation::Ecap::XactionRep::masterxSharedValue(const libecap::Name &name) const
Adaptation::Ecap::XactionRep::masterxSharedValue(const libecap::Name &sharedName) const
{
const HttpRequest *request = dynamic_cast<const HttpRequest*>(theCauseRep ?
theCauseRep->raw().header : theVirginRep.raw().header);
Must(request);
if (name.known()) { // must check to avoid empty names matching unset cfg
if (sharedName.known()) { // must check to avoid empty names matching unset cfg
Adaptation::History::Pointer ah = request->adaptHistory(false);
if (ah != NULL) {
String name, value;
Expand Down Expand Up @@ -482,7 +482,6 @@ Adaptation::Ecap::XactionRep::updateHistory(Http::Message *adapted)

// update the adaptation plan if needed
if (service().cfg().routing) {
String services;
if (const libecap::Area services = theMaster->option(libecap::metaNextServices)) {
Adaptation::History::Pointer ah = request->adaptHistory(true);
if (ah != NULL)
Expand Down