diff options
| author | Ted Ross <tross@apache.org> | 2008-06-04 12:56:24 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2008-06-04 12:56:24 +0000 |
| commit | ec51de87d3951474f7c7fc0399ac51b3c7310a2a (patch) | |
| tree | cba015ea1b1b54958cfec97172148f3f08c1ea2e /qpid/cpp/src | |
| parent | 08abbdf35999a36d2df84aedff34e1abc6eded13 (diff) | |
| download | qpid-python-ec51de87d3951474f7c7fc0399ac51b3c7310a2a.tar.gz | |
Removed assignment of a string literal that causes problems with some newer compilers
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@663080 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/broker/Broker.cpp | 6 | ||||
| -rw-r--r-- | qpid/cpp/src/qpidd.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/qpid/cpp/src/qpid/broker/Broker.cpp b/qpid/cpp/src/qpid/broker/Broker.cpp index 4636b94371..fc789e967a 100644 --- a/qpid/cpp/src/qpid/broker/Broker.cpp +++ b/qpid/cpp/src/qpid/broker/Broker.cpp @@ -92,9 +92,9 @@ Broker::Options::Options(const std::string& name) : char *home = ::getenv("HOME"); if (home == 0) - home = "/tmp"; - - dataDir += home; + dataDir += "/tmp"; + else + dataDir += home; dataDir += "/.qpidd"; addOptions() diff --git a/qpid/cpp/src/qpidd.cpp b/qpid/cpp/src/qpidd.cpp index ab4de50a2d..ad3dcb3aeb 100644 --- a/qpid/cpp/src/qpidd.cpp +++ b/qpid/cpp/src/qpidd.cpp @@ -67,9 +67,9 @@ struct DaemonOptions : public qpid::Options { char *home = ::getenv("HOME"); if (home == 0) - home = "/tmp"; - - piddir += home; + piddir += "/tmp"; + else + piddir += home; piddir += "/.qpidd"; addOptions() |