From 349a26193c8024f37ac725030be8fa4f03f5dee6 Mon Sep 17 00:00:00 2001
From: Ted Ross <tross@apache.org>
Date: Wed, 4 Jun 2008 12:56:24 +0000
Subject: 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/qpid@663080 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/qpid/broker/Broker.cpp | 6 +++---
 cpp/src/qpidd.cpp              | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'cpp')

diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index 4636b94371..fc789e967a 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/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/cpp/src/qpidd.cpp b/cpp/src/qpidd.cpp
index ab4de50a2d..ad3dcb3aeb 100644
--- a/cpp/src/qpidd.cpp
+++ b/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()
-- 
cgit v1.2.1