diff options
Diffstat (limited to 'cpp/src/posix/QpiddBroker.cpp')
-rw-r--r-- | cpp/src/posix/QpiddBroker.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/cpp/src/posix/QpiddBroker.cpp b/cpp/src/posix/QpiddBroker.cpp index 1cebcfc3ac..fd2fb6184f 100644 --- a/cpp/src/posix/QpiddBroker.cpp +++ b/cpp/src/posix/QpiddBroker.cpp @@ -31,14 +31,15 @@ #include <unistd.h> #include <sys/utsname.h> -using namespace std; -using namespace qpid; -using qpid::broker::Broker; -using qpid::broker::Daemon; +using std::cout; +using std::endl; + +namespace qpid { +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) { @@ -90,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) { @@ -197,7 +198,9 @@ int QpiddBroker::execute (QpiddOptions *options) { return 0; } +}} // namespace qpid::Broker + int main(int argc, char* argv[]) { - return run_broker(argc, argv); + return qpid::broker::run_broker(argc, argv); } |