diff options
| author | Ted Ross <tross@apache.org> | 2012-04-23 13:44:11 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2012-04-23 13:44:11 +0000 |
| commit | 5ce9c0625e80ba10b8b067fef8856b7941c66d1f (patch) | |
| tree | 2ad4f1ee52573107de0ef91f8a0bd2dff9d4f6c3 /cpp/src/qpid/client/LoadPlugins.cpp | |
| parent | a53f2eb6572c7dbe7da66a2cdc34c24cc0ff8d58 (diff) | |
| download | qpid-python-5ce9c0625e80ba10b8b067fef8856b7941c66d1f.tar.gz | |
QPID-3510 - Created a separate option in CommonOptions for the client configuration file.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1329236 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/client/LoadPlugins.cpp')
| -rw-r--r-- | cpp/src/qpid/client/LoadPlugins.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/qpid/client/LoadPlugins.cpp b/cpp/src/qpid/client/LoadPlugins.cpp index a8cfe80dc8..d76e1d458e 100644 --- a/cpp/src/qpid/client/LoadPlugins.cpp +++ b/cpp/src/qpid/client/LoadPlugins.cpp @@ -39,11 +39,11 @@ namespace { struct LoadtimeInitialise { LoadtimeInitialise() { - CommonOptions common("", QPIDC_CONF_FILE); + CommonOptions common("", "", QPIDC_CONF_FILE); qpid::ModuleOptions moduleOptions(QPIDC_MODULE_DIR); string defaultPath (moduleOptions.loadDir); - common.parse(0, 0, common.config, true); - moduleOptions.parse (0, 0, common.config, true); + common.parse(0, 0, common.clientConfig, true); + moduleOptions.parse (0, 0, common.clientConfig, true); for (vector<string>::iterator iter = moduleOptions.load.begin(); iter != moduleOptions.load.end(); |