diff options
| author | Alan Conway <aconway@apache.org> | 2008-01-14 18:27:35 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2008-01-14 18:27:35 +0000 |
| commit | ae6c80a67213bb59de8e7c07dc5f688df03ddbb8 (patch) | |
| tree | a2a4dac2886d3dabe9f564ab1de67218ccb9b39e /cpp/src/qpidd.cpp | |
| parent | 6904c8e416af1e5388b20bdd7e5f56f91b416766 (diff) | |
| download | qpid-python-ae6c80a67213bb59de8e7c07dc5f688df03ddbb8.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/qpid@611876 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpidd.cpp')
| -rw-r--r-- | cpp/src/qpidd.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/qpidd.cpp b/cpp/src/qpidd.cpp index 1081805c03..7be6aea464 100644 --- a/cpp/src/qpidd.cpp +++ b/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"); } }; |