summaryrefslogtreecommitdiff
path: root/indra/llcorehttp/tests/test_refcounted.hpp
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2018-09-26 21:25:11 +0100
committerGraham Linden <graham@lindenlab.com>2018-09-26 21:25:11 +0100
commit2783783575a9b712eb318b450dc5e6bb17d7f7c5 (patch)
treefdec4e4cf274e2a916e22d73d11afbce5bb669c0 /indra/llcorehttp/tests/test_refcounted.hpp
parent6d256d679e9cea63753266420ed79efa8b70dee2 (diff)
parent58aef8beaf79dc83546a7b080014ca5030733ac8 (diff)
Merge to 5.2.0
Diffstat (limited to 'indra/llcorehttp/tests/test_refcounted.hpp')
-rw-r--r--indra/llcorehttp/tests/test_refcounted.hpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcorehttp/tests/test_refcounted.hpp b/indra/llcorehttp/tests/test_refcounted.hpp
index cb4b50287a..5dff143e5d 100644
--- a/indra/llcorehttp/tests/test_refcounted.hpp
+++ b/indra/llcorehttp/tests/test_refcounted.hpp
@@ -30,6 +30,7 @@
#include "test_allocator.h"
+#if 0 // disable all of this because it's hanging win64 builds?
using namespace LLCoreInt;
namespace tut
@@ -152,5 +153,5 @@ namespace tut
ensure(mMemTotal == (GetMemTotal() - sizeof(RefCounted)));
}
}
-
+#endif // if 0
#endif // TEST_LLCOREINT_REF_COUNTED_H_