summaryrefslogtreecommitdiff
path: root/indra/llcorehttp/tests/test_allocator.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llcorehttp/tests/test_allocator.h')
-rw-r--r--indra/llcorehttp/tests/test_allocator.h13
1 files changed, 4 insertions, 9 deletions
diff --git a/indra/llcorehttp/tests/test_allocator.h b/indra/llcorehttp/tests/test_allocator.h
index 3572bbc5c5..abd88f4c98 100644
--- a/indra/llcorehttp/tests/test_allocator.h
+++ b/indra/llcorehttp/tests/test_allocator.h
@@ -30,18 +30,13 @@
#include <cstdlib>
#include <new>
+#error 2019-06-27 Do not use test_allocator.h -- does not respect alignment.
+
size_t GetMemTotal();
-#if defined(WIN32)
-void * operator new(std::size_t size) _THROW1(std::bad_alloc);
-void * operator new[](std::size_t size) _THROW1(std::bad_alloc);
-void operator delete(void * p) _THROW0();
-void operator delete[](void * p) _THROW0();
-#else
-void * operator new(std::size_t size) throw (std::bad_alloc);
-void * operator new[](std::size_t size) throw (std::bad_alloc);
+void * operator new(std::size_t size); //throw (std::bad_alloc);
+void * operator new[](std::size_t size); //throw (std::bad_alloc);
void operator delete(void * p) throw ();
void operator delete[](void * p) throw ();
-#endif
#endif // TEST_ALLOCATOR_H