From 988cc62d3026680362b76e017a441f40b9cedc6d Mon Sep 17 00:00:00 2001 From: Lynx Linden Date: Fri, 15 Jan 2010 19:25:42 +0000 Subject: EXT-4340: Fixed llviewerhelputil_test.cpp on Linux. The gcc compiler will strip out the stubbed isGodlike() method under an optimized build. There's no way to stop this without either putting the definition in another cpp file, which is hard to do with our unit test infrastructure, or disabling gcc's inlining of the method. So I did the latter, using __attribute__ ((noinline). --- indra/newview/tests/llviewerhelputil_test.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/tests/llviewerhelputil_test.cpp b/indra/newview/tests/llviewerhelputil_test.cpp index d7dd199722..297d98ad8d 100644 --- a/indra/newview/tests/llviewerhelputil_test.cpp +++ b/indra/newview/tests/llviewerhelputil_test.cpp @@ -83,6 +83,9 @@ class LLAgent public: LLAgent() {} ~LLAgent() {} +#ifdef __GNUC__ + __attribute__ ((noinline)) +#endif BOOL isGodlike() const { return FALSE; } private: int dummy; -- cgit v1.2.3