From bc5d79e06e1664abd33fbe41e5ec3655f33b7e32 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Tue, 13 Aug 2019 21:46:12 +0300
Subject: DRTVWR-493 Test fix for W64

---
 indra/llcommon/tests/llsingleton_test.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llcommon/tests/llsingleton_test.cpp b/indra/llcommon/tests/llsingleton_test.cpp
index da7bc6355c..75ddff9d7d 100644
--- a/indra/llcommon/tests/llsingleton_test.cpp
+++ b/indra/llcommon/tests/llsingleton_test.cpp
@@ -311,7 +311,11 @@ namespace tut
         virtual void initSingleton()
         {
             // never mind indirection, just go straight for the circularity
-            (void)instance();
+            CircularPInit *pt = getInstance();
+            if (!pt)
+            {
+                throw;
+            }
         }
     };
 
-- 
cgit v1.2.3