From 898c9f44218353b3bf71b78ffce02662b4927625 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Wed, 13 Mar 2019 13:21:48 -0700
Subject: Mods to make merge with viewer-release have less whitespace-only
 change and fix diffs between EEP and VR.

---
 indra/llcorehttp/tests/test_refcounted.hpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'indra/llcorehttp/tests')

diff --git a/indra/llcorehttp/tests/test_refcounted.hpp b/indra/llcorehttp/tests/test_refcounted.hpp
index 6a516f60c0..5dff143e5d 100644
--- a/indra/llcorehttp/tests/test_refcounted.hpp
+++ b/indra/llcorehttp/tests/test_refcounted.hpp
@@ -30,7 +30,7 @@
 
 #include "test_allocator.h"
 
-#if WANT_TESTS_WITH_RACES_THAT_HANG
+#if 0 // disable all of this because it's hanging win64 builds?
 using namespace LLCoreInt;
 
 namespace tut
@@ -153,6 +153,5 @@ namespace tut
 		ensure(mMemTotal == (GetMemTotal() - sizeof(RefCounted)));
 	}
 }
-#endif
-
+#endif  // if 0
 #endif	// TEST_LLCOREINT_REF_COUNTED_H_
-- 
cgit v1.2.3