From: g0dil <g0dil@270642c3-0616-0410-b53a-bc976706d245>
Date: Fri, 28 Aug 2009 08:00:10 +0000 (+0000)
Subject: Another try at fixing gcc 4.4.1 ambiguous declarations
X-Git-Url: http://g0dil.de/git?a=commitdiff_plain;h=da70cacdbf91e4c6d8a0cf22ad7a9edbd6335805;p=senf.git

Another try at fixing gcc 4.4.1 ambiguous declarations

git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1348 270642c3-0616-0410-b53a-bc976706d245
---

diff --git a/senf/Utils/Daemon/Daemon.cc b/senf/Utils/Daemon/Daemon.cc
index 5cda008..b84e759 100644
--- a/senf/Utils/Daemon/Daemon.cc
+++ b/senf/Utils/Daemon/Daemon.cc
@@ -314,10 +314,11 @@ prefix_ void senf::Daemon::configure()
 {
     // int i (not unsigned) since argc_ is int ...
     for (int i (1); i<argc_; ++i) {
-        if (argv_[i] == std::string("--no-daemon"))
+        std::string argv (argv_[i]);
+        if (argv == "--no-daemon")
             daemonize(false);
-        else if (boost::starts_with(argv_[i], std::string("--console-log="))) {
-            std::string arg (std::string(argv_[i]).substr(14u));
+        else if (boost::starts_with(argv, "--console-log=")) {
+            std::string arg (argv.substr(14u));
             std::string::size_type komma (arg.find(','));
             if (komma == std::string::npos) {
                 boost::trim(arg);
@@ -334,7 +335,7 @@ prefix_ void senf::Daemon::configure()
                 else if (! arg2.empty() )        consoleLog(arg2, StdErr);
             }
         }
-        else if (boost::starts_with(argv_[i], std::string("--pid-file="))) 
+        else if (boost::starts_with(argv, "--pid-file="))
             pidFile(std::string(std::string(argv_[i]), 11u));
     }
 }