diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2013-04-17 22:48:02 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2013-04-17 22:48:02 +0000 |
| commit | 18ca133068759d06528bf9cce73a5260650df122 (patch) | |
| tree | 777ca8f6c9455f8d6607dceee377700c5cad8841 /cpp | |
| parent | 8a56d00ccc526779682b9fba2f6f10fe858ad625 (diff) | |
| download | qpid-python-18ca133068759d06528bf9cce73a5260650df122.tar.gz | |
QPID-3689: Change tcp nodelay to be the default
This change also alters the implementation of simple switch
like options when using boost version 1.35 and later. We now
allow these switches to also take an optional "=yes" or "=no"
(and similar) argument.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1469088 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/include/qpid/Options.h | 8 | ||||
| -rw-r--r-- | cpp/src/qpid/broker/Broker.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/qpid/client/ConnectionSettings.cpp | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/cpp/include/qpid/Options.h b/cpp/include/qpid/Options.h index feef5d8b98..993e024f3d 100644 --- a/cpp/include/qpid/Options.h +++ b/cpp/include/qpid/Options.h @@ -90,7 +90,13 @@ po::value_semantic* optValue(std::vector<T>& value, const char* name) { } /** Create a boolean switch value. Presence of the option sets the value. */ -inline po::value_semantic* optValue(bool& value) { return po::bool_switch(&value); } +inline po::value_semantic* optValue(bool& value) { +#if (BOOST_VERSION >= 103500) + return (new OptionValue<bool>(value, ""))->implicit_value(true); +#else + return po::bool_switch(&value); +#endif +} /** * Base class for options. diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp index ab5398a0e8..bdc49e669d 100644 --- a/cpp/src/qpid/broker/Broker.cpp +++ b/cpp/src/qpid/broker/Broker.cpp @@ -133,7 +133,7 @@ Broker::Options::Options(const std::string& name) : replayFlushLimit(0), replayHardLimit(0), queueLimit(100*1048576/*100M default limit*/), - tcpNoDelay(false), + tcpNoDelay(true), requireEncrypted(false), knownHosts(knownHostsNone), qmf2Support(true), diff --git a/cpp/src/qpid/client/ConnectionSettings.cpp b/cpp/src/qpid/client/ConnectionSettings.cpp index 822e4af269..20804572a4 100644 --- a/cpp/src/qpid/client/ConnectionSettings.cpp +++ b/cpp/src/qpid/client/ConnectionSettings.cpp @@ -37,7 +37,7 @@ ConnectionSettings::ConnectionSettings() : maxChannels(32767), maxFrameSize(65535), bounds(2), - tcpNoDelay(false), + tcpNoDelay(true), service(qpid::saslName), minSsf(0), maxSsf(256), |