Explicit use of null namespace breaks namespaced build
authorDonald Carr <donald.carr@nokia.com>
Mon, 12 Mar 2012 16:29:59 +0000 (16:29 +0000)
committerQt by Nokia <qt-info@nokia.com>
Wed, 14 Mar 2012 17:31:31 +0000 (18:31 +0100)
These changes are currently required to successfully build Qt when it is
configured with a namespace via the configure -qtnamespace argument

Change-Id: I9f3ab30579c16085c4d3d05705336b810466c331
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
src/corelib/tools/qsimd.cpp

index b3d2d62..6c07480 100644 (file)
@@ -108,12 +108,12 @@ static inline uint detectProcessorFeatures()
     uint features = 0;
 
 #if defined(Q_OS_LINUX)
-    int auxv = ::qt_safe_open("/proc/self/auxv", O_RDONLY);
+    int auxv = qt_safe_open("/proc/self/auxv", O_RDONLY);
     if (auxv != -1) {
         unsigned long vector[64];
         int nread;
         while (features == 0) {
-            nread = ::qt_safe_read(auxv, (char *)vector, sizeof vector);
+            nread = qt_safe_read(auxv, (char *)vector, sizeof vector);
             if (nread <= 0) {
                 // EOF or error
                 break;
@@ -130,7 +130,7 @@ static inline uint detectProcessorFeatures()
                 }
         }
 
-        ::qt_safe_close(auxv);
+        qt_safe_close(auxv);
         return features;
     }
     // fall back if /proc/self/auxv wasn't found