diff options
| author | callum_linden <none@none> | 2014-10-20 16:02:03 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2014-10-20 16:02:03 -0700 |
| commit | f3baf8dc4e900a4e8d4005e31f20be2bae162a56 (patch) | |
| tree | b7258de470c1c20433ea7236189a45c93c6f979c /indra/test | |
| parent | cad1df584be0ed62e4ae0393b84e57f192009da5 (diff) | |
Update to build on Xcode 6.0: remove #pragmas from code to deal with tut warnigs/errors (moved to package) AND bracket clang #pragmas in #if LL_DARWIN
Diffstat (limited to 'indra/test')
| -rwxr-xr-x | indra/test/llapp_tut.cpp | 4 | ||||
| -rwxr-xr-x | indra/test/llbuffer_tut.cpp | 7 | ||||
| -rwxr-xr-x | indra/test/llpermissions_tut.cpp | 7 |
3 files changed, 0 insertions, 18 deletions
diff --git a/indra/test/llapp_tut.cpp b/indra/test/llapp_tut.cpp index 5dad838a44..aa5c0672e6 100755 --- a/indra/test/llapp_tut.cpp +++ b/indra/test/llapp_tut.cpp @@ -25,11 +25,7 @@ * $/LicenseInfo$ */ -// turn off warnings about unused functions from clang for tut package -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wunused-function" #include <tut/tut.hpp> -#pragma clang diagnostic pop #include "linden_common.h" #include "llapp.h" diff --git a/indra/test/llbuffer_tut.cpp b/indra/test/llbuffer_tut.cpp index 10a23c688a..9b8aae6a73 100755 --- a/indra/test/llbuffer_tut.cpp +++ b/indra/test/llbuffer_tut.cpp @@ -26,14 +26,7 @@ * $/LicenseInfo$ */ -#if LL_DARWIN -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wunused-function" #include <tut/tut.hpp> -#pragma clang diagnostic pop -#elif -#include <tut/tut.hpp> -#endif #include "linden_common.h" #include "lltut.h" diff --git a/indra/test/llpermissions_tut.cpp b/indra/test/llpermissions_tut.cpp index 32a016466d..fa4b085fd3 100755 --- a/indra/test/llpermissions_tut.cpp +++ b/indra/test/llpermissions_tut.cpp @@ -29,14 +29,7 @@ #include <tut/tut.hpp> #include "linden_common.h" -#if LL_DARWIN -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wunused-function" #include "lltut.h" -#pragma clang diagnostic pop -#elif -#include "lltut.h" -#endif #include "message.h" #include "llpermissions.h" |