diff options
| author | Kenneth Anthony Giusti <kgiusti@apache.org> | 2012-03-22 13:39:14 +0000 |
|---|---|---|
| committer | Kenneth Anthony Giusti <kgiusti@apache.org> | 2012-03-22 13:39:14 +0000 |
| commit | 3c2954782cc6d27bacf8865cfaea9c71c2bfec2b (patch) | |
| tree | 2f319b97e0c6d9e0052a8606f0e29d2b643834c2 /qpid/cpp/src/windows/QpiddBroker.cpp | |
| parent | b51489127365952db902579438294a587a7acf47 (diff) | |
| download | qpid-python-qpid-3890.tar.gz | |
QPID-3890: resync this branch to latest trunkqpid-3890
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-3890@1303774 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/windows/QpiddBroker.cpp')
| -rw-r--r-- | qpid/cpp/src/windows/QpiddBroker.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/qpid/cpp/src/windows/QpiddBroker.cpp b/qpid/cpp/src/windows/QpiddBroker.cpp index 42ba97bdb1..e73fcf0af5 100644 --- a/qpid/cpp/src/windows/QpiddBroker.cpp +++ b/qpid/cpp/src/windows/QpiddBroker.cpp @@ -32,7 +32,8 @@ #include <iostream> #include <windows.h> -using namespace qpid::broker; +namespace qpid { +namespace broker { BootstrapOptions::BootstrapOptions(const char* argv0) : qpid::Options("Options"), @@ -451,6 +452,7 @@ int QpiddBroker::execute (QpiddOptions *options) { return 0; } +}} // namespace qpid::broker int main(int argc, char* argv[]) { @@ -459,13 +461,13 @@ int main(int argc, char* argv[]) // the service is stopped. SERVICE_TABLE_ENTRY dispatchTable[] = { - { "", (LPSERVICE_MAIN_FUNCTION)ServiceMain }, + { "", (LPSERVICE_MAIN_FUNCTION)qpid::broker::ServiceMain }, { NULL, NULL } }; if (!StartServiceCtrlDispatcher(dispatchTable)) { DWORD err = ::GetLastError(); if (err == ERROR_FAILED_SERVICE_CONTROLLER_CONNECT) // Run as console - return run_broker(argc, argv); + return qpid::broker::run_broker(argc, argv); throw QPID_WINDOWS_ERROR(err); } return 0; |