Merge master 6.4.6 into DRTVWR-510

Includes the conversion to VS2017 build tools.

1 files changed, 4 insertions, 14 deletions

diff --git a/indra/llcorehttp/tests/test_allocator.cpp b/indra/llcorehttp/tests/test_allocator.cpp
index ea12dc58eb..597e0d2fc9 100644
--- a/indra/llcorehttp/tests/test_allocator.cpp
+++ b/indra/llcorehttp/tests/test_allocator.cpp
@@ -43,16 +43,6 @@
 
 #include <boost/thread.hpp>
 
-
-#if	defined(WIN32)
-#define	THROW_BAD_ALLOC()	_THROW1(std::bad_alloc)
-#define	THROW_NOTHING()		_THROW0()
-#else
-#define	THROW_BAD_ALLOC()	throw(std::bad_alloc)
-#define	THROW_NOTHING()		throw()
-#endif
-
-
 struct BlockHeader
 {
 	struct Block * next;
@@ -152,19 +142,19 @@ std::size_t GetMemTotal()
 }
 
 
-void * operator new(std::size_t size) THROW_BAD_ALLOC()
+void * operator new(std::size_t size) //throw(std::bad_alloc)
 {
 	return GetMem( size );
 }
 
 
-void * operator new[](std::size_t size) THROW_BAD_ALLOC()
+void * operator new[](std::size_t size) //throw(std::bad_alloc)
 {
 	return GetMem( size );
 }
 
 
-void operator delete(void * p) THROW_NOTHING()
+void operator delete(void * p) throw()
 {
 	if (p)
 	{
@@ -173,7 +163,7 @@ void operator delete(void * p) THROW_NOTHING()
 }
 
 
-void operator delete[](void * p) THROW_NOTHING()
+void operator delete[](void * p) throw()
 {
 	if (p)
 	{