You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2016/03/16 23:36:42 UTC
svn commit: r1735329 -
/qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp
Author: astitcher
Date: Wed Mar 16 22:36:42 2016
New Revision: 1735329
URL: http://svn.apache.org/viewvc?rev=1735329&view=rev
Log:
QPID-7147: Renamed bind to avoid clash with (new for C++11/14) std::bind - The compiler was finding std::bind in preference due to argument dependent lookup.
Modified:
qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp?rev=1735329&r1=1735328&r2=1735329&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp Wed Mar 16 22:36:42 2016
@@ -161,7 +161,7 @@ template <typename T> T get(const Varian
}
}
-bool bind(const Variant::Map& options, const std::string& name, std::string& variable)
+bool getOption(const Variant::Map& options, const std::string& name, std::string& variable)
{
Variant::Map::const_iterator j = options.find(name);
if (j == options.end()) {
@@ -172,7 +172,7 @@ bool bind(const Variant::Map& options, c
}
}
-bool bind(const Variant::Map& options, const std::string& name, Variant::Map& variable)
+bool getOption(const Variant::Map& options, const std::string& name, Variant::Map& variable)
{
Variant::Map::const_iterator j = options.find(name);
if (j == options.end()) {
@@ -183,7 +183,7 @@ bool bind(const Variant::Map& options, c
}
}
-bool bind(const Variant::Map& options, const std::string& name, Variant::List& variable)
+bool getOption(const Variant::Map& options, const std::string& name, Variant::List& variable)
{
Variant::Map::const_iterator j = options.find(name);
if (j == options.end()) {
@@ -194,14 +194,14 @@ bool bind(const Variant::Map& options, c
}
}
-bool bind(const Address& address, const std::string& name, std::string& variable)
+bool getAddressOption(const Address& address, const std::string& name, std::string& variable)
{
- return bind(address.getOptions(), name, variable);
+ return getOption(address.getOptions(), name, variable);
}
-bool bind(const Address& address, const std::string& name, Variant::Map& variable)
+bool getAddressOption(const Address& address, const std::string& name, Variant::Map& variable)
{
- return bind(address.getOptions(), name, variable);
+ return getOption(address.getOptions(), name, variable);
}
bool in(const std::string& value, const std::vector<std::string>& choices)
@@ -251,20 +251,20 @@ AddressHelper::AddressHelper(const Addre
browse(false)
{
verifier.verify(address);
- bind(address, CREATE, createPolicy);
- bind(address, DELETE, deletePolicy);
- bind(address, ASSERT, assertPolicy);
-
- bind(address, NODE, node);
- bind(address, LINK, link);
- bind(node, PROPERTIES, properties);
- bind(node, CAPABILITIES, capabilities);
- bind(link, RELIABILITY, reliability);
+ getAddressOption(address, CREATE, createPolicy);
+ getAddressOption(address, DELETE, deletePolicy);
+ getAddressOption(address, ASSERT, assertPolicy);
+
+ getAddressOption(address, NODE, node);
+ getAddressOption(address, LINK, link);
+ getOption(node, PROPERTIES, properties);
+ getOption(node, CAPABILITIES, capabilities);
+ getOption(link, RELIABILITY, reliability);
durableNode = test(node, DURABLE);
durableLink = test(link, DURABLE);
timeout = get(link, TIMEOUT, durableLink && reliability != AT_LEAST_ONCE ? DEFAULT_DURABLE_TIMEOUT : DEFAULT_TIMEOUT);
std::string mode;
- if (bind(address, MODE, mode)) {
+ if (getAddressOption(address, MODE, mode)) {
if (mode == BROWSE) {
browse = true;
} else if (mode != CONSUME) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org