diff options
| author | Kitty Barnett <develop@catznip.com> | 2024-10-02 00:34:51 +0200 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2024-10-02 00:34:51 +0200 |
| commit | 48b34e07ef33965edcc38006082be01ed7ed239d (patch) | |
| tree | dc236a74a900921ab1fae039f655f1cb9aca7b6c /indra/llcommon/tests/llsingleton_test.cpp | |
| parent | 689f723a5f314ffa0f54c0e50a51cbe464b36ccf (diff) | |
| parent | 002a81ccf5a64fd08e29811a6edea36f2e0408be (diff) | |
Merge branch 'develop' into rlva/base
Diffstat (limited to 'indra/llcommon/tests/llsingleton_test.cpp')
| -rw-r--r-- | indra/llcommon/tests/llsingleton_test.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llcommon/tests/llsingleton_test.cpp b/indra/llcommon/tests/llsingleton_test.cpp index adf5804272..91304b4885 100644 --- a/indra/llcommon/tests/llsingleton_test.cpp +++ b/indra/llcommon/tests/llsingleton_test.cpp @@ -240,12 +240,14 @@ namespace tut PSing1::initParamSingleton("again"); }); ensure_contains("second ctor(string) didn't throw", threw, "twice"); +#ifndef LL_GNUC // FIXME: Fails to build under GCC // try to initialize using the other constructor -- should be // well-formed, but illegal at runtime threw = catcherr.catch_llerrs([](){ PSing1::initParamSingleton(17); }); ensure_contains("other ctor(int) didn't throw", threw, "twice"); +#endif PSing1::deleteSingleton(); ensure("false negative on wasDeleted()", PSing1::wasDeleted()); threw = catcherr.catch_llerrs([](){ @@ -254,6 +256,7 @@ namespace tut ensure_contains("accessed deleted LLParamSingleton", threw, "deleted"); } +#ifndef LL_GNUC // FIXME: Fails to build under GCC template<> template<> void singleton_object_t::test<13>() { @@ -275,6 +278,7 @@ namespace tut }); ensure_contains("other ctor(string) didn't throw", threw, "twice"); } +#endif class CircularPCtor: public LLParamSingleton<CircularPCtor> { |