From: g0dil <g0dil@270642c3-0616-0410-b53a-bc976706d245>
Date: Thu, 27 Aug 2009 06:01:54 +0000 (+0000)
Subject: Fix ambiguous variable declarations for gcc 4.4.1
X-Git-Url: http://g0dil.de/git?a=commitdiff_plain;h=e9c7485ed08869e7813ee36c0c5712371bad0f30;hp=a266a7c438396cfea4c17f95d1556471dfcc2317;p=senf.git

Fix ambiguous variable declarations for gcc 4.4.1

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

diff --git a/senf/Scheduler/FIFORunner.cc b/senf/Scheduler/FIFORunner.cc
index 6b14c94..4d7db5d 100644
--- a/senf/Scheduler/FIFORunner.cc
+++ b/senf/Scheduler/FIFORunner.cc
@@ -256,7 +256,7 @@ prefix_ void senf::scheduler::detail::FIFORunner::watchdogError()
     for (unsigned i (0); i < nEntries; ++i) {
         write(1, " 0x", 3);
         for (unsigned j (sizeof(void*)); j > 0; --j) {
-             ::uintptr_t v( ::uintptr_t (entries[i])>>(8*(j-1)));
+            uintptr_t v ( reinterpret_cast<uintptr_t>(entries[i]) >> (8*(j-1)) );
             write(1, &(hex[ (v >> 4) & 0x0f ]), 1);
             write(1, &(hex[ (v     ) & 0x0f ]), 1);
         }
diff --git a/senf/Utils/Daemon/Daemon.cc b/senf/Utils/Daemon/Daemon.cc
index e705022..5cda008 100644
--- a/senf/Utils/Daemon/Daemon.cc
+++ b/senf/Utils/Daemon/Daemon.cc
@@ -317,7 +317,7 @@ prefix_ void senf::Daemon::configure()
         if (argv_[i] == std::string("--no-daemon"))
             daemonize(false);
         else if (boost::starts_with(argv_[i], std::string("--console-log="))) {
-            std::string arg (std::string(argv_[i]), 14u);
+            std::string arg (std::string(argv_[i]).substr(14u));
             std::string::size_type komma (arg.find(','));
             if (komma == std::string::npos) {
                 boost::trim(arg);