Another try at fixing gcc 4.4.1 ambiguous declarations

[senf.git] / senf / Scheduler / FIFORunner.cc

diff --git a/senf/Scheduler/FIFORunner.cc b/senf/Scheduler/FIFORunner.cc
index 6ddd914..4d7db5d 100644 (file)
--- a/senf/Scheduler/FIFORunner.cc
+++ b/senf/Scheduler/FIFORunner.cc
@@ -30,11 +30,11 @@
 #include <signal.h>
 #include <time.h>
 #include <boost/lambda/lambda.hpp>
-#include "../Utils/Exception.hh"
-#include "../Utils/senfassert.hh"
-#include "../Utils/ScopeExit.hh"
+#include <senf/Utils/Exception.hh>
+#include <senf/Utils/senfassert.hh>
+#include <senf/Utils/ScopeExit.hh>
 #include <execinfo.h>
-#include "../config.hh"
+#include <senf/config.hh>
 #include <stdint.h>
 
 //#include "FIFORunner.mpp"
@@ -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);
         }