summaryrefslogtreecommitdiff
path: root/qpid/cpp/src
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2008-01-14 18:27:35 +0000
committerAlan Conway <aconway@apache.org>2008-01-14 18:27:35 +0000
commit65d0b3a7e9c1e7a2f978c18ca1e1c97c859e1d86 (patch)
treea82ef3610535de7bdd3dc09a9542b7425dcb982c /qpid/cpp/src
parent1de1c47ea1a106a5c37d9b0d32e37a0f15a74819 (diff)
downloadqpid-python-65d0b3a7e9c1e7a2f978c18ca1e1c97c859e1d86.tar.gz
From https://issues.apache.org/jira/browse/QPID-737 by Ted Ross.
The new --load-dir and --load options don't work with boost-1.33. This older version considers the option --load to be ambiguous. This patch change --load to --load-module to remove the ambiguity. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@611876 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
-rw-r--r--qpid/cpp/src/qpidd.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/qpid/cpp/src/qpidd.cpp b/qpid/cpp/src/qpidd.cpp
index 1081805c03..7be6aea464 100644
--- a/qpid/cpp/src/qpidd.cpp
+++ b/qpid/cpp/src/qpidd.cpp
@@ -48,9 +48,9 @@ struct ModuleOptions : public qpid::Options {
ModuleOptions() : qpid::Options("Module options"), loadDir("/usr/lib/qpidd"), noLoad(false)
{
addOptions()
- ("load-dir", optValue(loadDir, "DIR"), "Load all modules from this directory")
- ("load", optValue(load, "FILE"), "Specifies additional module(s) to be loaded")
- ("no-modules", optValue(noLoad), "Don't load any modules");
+ ("load-dir", optValue(loadDir, "DIR"), "Load all modules from this directory")
+ ("load-module", optValue(load, "FILE"), "Specifies additional module(s) to be loaded")
+ ("no-modules", optValue(noLoad), "Don't load any modules");
}
};