2c40c3a5af03 — Chris Cannam 12 days ago
Remove some hopefully unnecessary references to global namespace
3 files changed, 36 insertions(+), 6 deletions(-)

M otherbuilds/check.sh
M src/system/Allocators.h
M src/system/sysutils.h
M otherbuilds/check.sh +32 -2
@@ 1,17 1,47 @@ 
 #!/bin/bash
 set -eu
+
 if [ ! -d /Applications ]; then
+    # Assumed to be Linux
+
+    echo " *** Building static library using Linux-specific Makefile"
+#    make -f otherbuilds/Makefile.linux clean
     make -f otherbuilds/Makefile.linux
+    
+    echo " *** Linking against static library"
     g++ main/main.cpp lib/librubberband.a -I. -Isrc -o test -lsndfile -lsamplerate -lpthread
+    
+    echo " *** Running build from Linux-specific Makefile"
     ./test -V
+    
+    echo " *** Building with single-file source"
     g++ main/main.cpp single/RubberBandSingle.cpp -o test_single -lsndfile
+    
+    echo " *** Running build from single-file source"
     ./test_single -V
+    
+    echo " *** OK"
+    
 else
+
+    echo " *** Building static library using macOS-specific Makefile"
+    make -f otherbuilds/Makefile.macos clean
     make -f otherbuilds/Makefile.macos
+
+    echo " *** Linking against static library"
     c++ main/main.cpp lib/librubberband.a -I. -Isrc -o test -lsndfile -lsamplerate -framework Accelerate
+    
+    echo " *** Running build from macOS-specific Makefile"
     ./test -V
-    c++ main/main.cpp single/RubberBandSingle.cpp -o test_single -lsndfile -framework Accelerate
+
+    echo " *** Building with single-file source"
+c++ main/main.cpp single/RubberBandSingle.cpp -o test_single -lsndfile -framework Accelerate
+
+    echo " *** Running build from single-file source"
     ./test_single -V
-    make -f otherbuilds/Makefile.macos clean
+
+    echo " *** Building static library using iOS-specific Makefile"
+    make -f otherbuilds/Makefile.ios clean
     make -f otherbuilds/Makefile.ios
+    
 fi

          
M src/system/Allocators.h +2 -2
@@ 343,12 343,12 @@ public:
             abort();
 #endif
         }
-        return ::RubberBand::allocate<T>(n);
+        return RubberBand::allocate<T>(n);
     }
 
     void
     deallocate(T *const p, const size_t) const {
-        ::RubberBand::deallocate(p);
+        RubberBand::deallocate(p);
     }
 
     template <typename U>

          
M src/system/sysutils.h +2 -2
@@ 135,8 135,8 @@ extern void system_memorybarrier();
 #include <dlfcn.h>
 #include <stdio.h>
 
-#define MLOCK(a,b)   ::mlock((char *)(a),(b))
-#define MUNLOCK(a,b) (::munlock((char *)(a),(b)) ? (::perror("munlock failed"), 0) : 0)
+#define MLOCK(a,b)   mlock((char *)(a),(b))
+#define MUNLOCK(a,b) (munlock((char *)(a),(b)) ? (perror("munlock failed"), 0) : 0)
 #define MUNLOCK_SAMPLEBLOCK(a) do { if (!(a).empty()) { const float &b = *(a).begin(); MUNLOCK(&b, (a).capacity() * sizeof(float)); } } while(0);
 
 #ifdef __APPLE__