From 400a5e55d76da310cd77f204e5c8aff0026030f0 Mon Sep 17 00:00:00 2001 From: Cass Everitt Date: Tue, 7 Jan 2014 13:10:03 -0600 Subject: [PATCH] building again on mac with the switch --- scripts/regal/RegalEmuInfo.py | 7 ++++++- scripts/regal/RegalStatistics.py | 2 +- src/regal/RegalEmuInfo.cpp | 7 ++++++- src/regal/RegalPrint.h | 2 +- src/regal/RegalStatistics.cpp | 2 +- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/scripts/regal/RegalEmuInfo.py b/scripts/regal/RegalEmuInfo.py index 4978edc..95868b9 100755 --- a/scripts/regal/RegalEmuInfo.py +++ b/scripts/regal/RegalEmuInfo.py @@ -182,7 +182,12 @@ EmuInfo::init(const ContextInfo &contextInfo) // Form Regal extension string from the set - extensions = ::print_detail::join(extensionsSet,string(" ")); + extensions = ""; + for( std::set::iterator i = extensionsSet.begin(); i != extensionsSet.end(); ++i ) { + extensions += *i; + extensions += " "; + } + extensions.erase( extensions.rfind( " " ) ); Info("Regal vendor : ",vendor); Info("Regal renderer : ",renderer); diff --git a/scripts/regal/RegalStatistics.py b/scripts/regal/RegalStatistics.py index 582959a..2f4581e 100755 --- a/scripts/regal/RegalStatistics.py +++ b/scripts/regal/RegalStatistics.py @@ -108,7 +108,7 @@ void Statistics::log(const char *name, const GLuint count) { if (count) - Info("Statistics ",left(name,30,' '),right(count,6,' ')); + Info("Statistics ",print_left(name,30,' '),print_right(count,6,' ')); } REGAL_NAMESPACE_END diff --git a/src/regal/RegalEmuInfo.cpp b/src/regal/RegalEmuInfo.cpp index b8c4560..09c1745 100644 --- a/src/regal/RegalEmuInfo.cpp +++ b/src/regal/RegalEmuInfo.cpp @@ -184,7 +184,12 @@ EmuInfo::init(const ContextInfo &contextInfo) // Form Regal extension string from the set - extensions = ::print_detail::join(extensionsSet,string(" ")); + extensions = ""; + for( std::set::iterator i = extensionsSet.begin(); i != extensionsSet.end(); ++i ) { + extensions += *i; + extensions += " "; + } + extensions.erase( extensions.rfind( " " ) ); Info("Regal vendor : ",vendor); Info("Regal renderer : ",renderer); diff --git a/src/regal/RegalPrint.h b/src/regal/RegalPrint.h index ed9eae7..7101b0f 100644 --- a/src/regal/RegalPrint.h +++ b/src/regal/RegalPrint.h @@ -85,7 +85,7 @@ T print_hex( const T & t, const U & u ) { #define print_array( ... ) std::string(" implement print_array() ") #define print_optional( ... ) std::string(" implement print_optional() ") #define print_raw( ... ) std::string( " implement print_raw() " ) -#define print_trim( ... ) std::string( " implement trim() " ) +#define print_trim( a, ... ) (a) #define print_right( a, ... ) (a) #define print_left( a, ... ) (a) diff --git a/src/regal/RegalStatistics.cpp b/src/regal/RegalStatistics.cpp index 9bef3e6..fb4f711 100644 --- a/src/regal/RegalStatistics.cpp +++ b/src/regal/RegalStatistics.cpp @@ -5105,7 +5105,7 @@ void Statistics::log(const char *name, const GLuint count) { if (count) - Info("Statistics ",left(name,30,' '),right(count,6,' ')); + Info("Statistics ",print_left(name,30,' '),print_right(count,6,' ')); } REGAL_NAMESPACE_END