summaryrefslogtreecommitdiff
path: root/indra/newview/tests
diff options
context:
space:
mode:
authorLynx Linden <lynx@lindenlab.com>2010-01-15 19:25:42 +0000
committerLynx Linden <lynx@lindenlab.com>2010-01-15 19:25:42 +0000
commit988cc62d3026680362b76e017a441f40b9cedc6d (patch)
treeac31fd5b34fc24ba5015692a4b4468fa6a400e1d /indra/newview/tests
parent5c09d482a47a8894ebebc9d3c8053b25a280f58e (diff)
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).
Diffstat (limited to 'indra/newview/tests')
-rw-r--r--indra/newview/tests/llviewerhelputil_test.cpp3
1 files changed, 3 insertions, 0 deletions
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;