david/librubberband
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove some hopefully unnecessary references to global namespace

Browse Source
This commit is contained in:
Chris Cannam
2021-10-12 16:27:19 +01:00
parent 9394a9ad09
commit e868ff32de
3 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
otherbuilds/check.sh
View File

@@ -1,17 +1,47 @@
#!/bin/bash #!/bin/bash
set -eu set -eu
if [ ! -d /Applications ]; then 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 make -f otherbuilds/Makefile.linux
echo " *** Linking against static library"
g++ main/main.cpp lib/librubberband.a -I. -Isrc -o test -lsndfile -lsamplerate -lpthread g++ main/main.cpp lib/librubberband.a -I. -Isrc -o test -lsndfile -lsamplerate -lpthread
echo " *** Running build from Linux-specific Makefile"
./test -V ./test -V
echo " *** Building with single-file source"
g++ main/main.cpp single/RubberBandSingle.cpp -o test_single -lsndfile g++ main/main.cpp single/RubberBandSingle.cpp -o test_single -lsndfile
echo " *** Running build from single-file source"
./test_single -V ./test_single -V
echo " *** OK"
else else
make -f otherbuilds/Makefile.macos
c++ main/main.cpp lib/librubberband.a -I. -Isrc -o test -lsndfile -lsamplerate -framework Accelerate echo " *** Building static library using macOS-specific Makefile"
./test -V
c++ main/main.cpp single/RubberBandSingle.cpp -o test_single -lsndfile -framework Accelerate
./test_single -V
make -f otherbuilds/Makefile.macos clean 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
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
echo " *** Building static library using iOS-specific Makefile"
make -f otherbuilds/Makefile.ios clean
make -f otherbuilds/Makefile.ios make -f otherbuilds/Makefile.ios
fi fi

4
src/system/Allocators.h
View File

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

4
src/system/sysutils.h
View File

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