summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/posix
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
commitdda3a026db3037ac23570cfd29ee680d33ed4f7b (patch)
tree0cbb8d824351273019e5ba673fec728223a20a07 /qpid/cpp/src/posix
parentf85f5bc89917b064d2fccad078c25bfa1176a616 (diff)
downloadqpid-python-dda3a026db3037ac23570cfd29ee680d33ed4f7b.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@1329236 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/posix')
-rw-r--r--qpid/cpp/src/posix/QpiddBroker.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/src/posix/QpiddBroker.cpp b/qpid/cpp/src/posix/QpiddBroker.cpp
index 694751c27c..fd2fb6184f 100644
--- a/qpid/cpp/src/posix/QpiddBroker.cpp
+++ b/qpid/cpp/src/posix/QpiddBroker.cpp
@@ -39,7 +39,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)
{
@@ -91,7 +91,7 @@ struct QpiddPosixOptions : 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)
{