summaryrefslogtreecommitdiff
path: root/cpp/src/windows
diff options
context:
space:
mode:
authorTed Ross <tross@apache.org>2012-04-23 13:44:11 +0000
committerTed Ross <tross@apache.org>2012-04-23 13:44:11 +0000
commit5ce9c0625e80ba10b8b067fef8856b7941c66d1f (patch)
tree2ad4f1ee52573107de0ef91f8a0bd2dff9d4f6c3 /cpp/src/windows
parenta53f2eb6572c7dbe7da66a2cdc34c24cc0ff8d58 (diff)
downloadqpid-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/windows')
-rw-r--r--cpp/src/windows/QpiddBroker.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/windows/QpiddBroker.cpp b/cpp/src/windows/QpiddBroker.cpp
index e73fcf0af5..89a8945d00 100644
--- a/cpp/src/windows/QpiddBroker.cpp
+++ b/cpp/src/windows/QpiddBroker.cpp
@@ -37,7 +37,7 @@ namespace broker {
BootstrapOptions::BootstrapOptions(const char* argv0)
: qpid::Options("Options"),
- common("", QPIDD_CONF_FILE),
+ common("", QPIDD_CONF_FILE, QPIDC_CONF_FILE),
module(QPIDD_MODULE_DIR),
log(argv0)
{
@@ -315,7 +315,7 @@ struct QpiddWindowsOptions : public QpiddOptionsPrivate {
QpiddOptions::QpiddOptions(const char* argv0)
: qpid::Options("Options"),
- common("", QPIDD_CONF_FILE),
+ common("", QPIDD_CONF_FILE, QPIDC_CONF_FILE),
module(QPIDD_MODULE_DIR),
log(argv0)
{