From 58e8addad681fa0a4ba0eee843d4eda7a843d5f7 Mon Sep 17 00:00:00 2001 From: "Vicente J. Botet Escriba" Date: Wed, 6 May 2015 13:51:21 +0200 Subject: [PATCH] Try to get rid of bad link issue while defining global new. --- test/threads/thread/constr/FArgs_pass.cpp | 8 ++++---- test/threads/thread/constr/lambda_pass.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/threads/thread/constr/FArgs_pass.cpp b/test/threads/thread/constr/FArgs_pass.cpp index c6630760..7b05786b 100644 --- a/test/threads/thread/constr/FArgs_pass.cpp +++ b/test/threads/thread/constr/FArgs_pass.cpp @@ -26,9 +26,9 @@ unsigned throw_one = 0xFFFF; #if defined _GLIBCXX_THROW -void* operator new(std::size_t s) _GLIBCXX_THROW (std::bad_alloc) +inline void* operator new(std::size_t s) _GLIBCXX_THROW (std::bad_alloc) #elif defined BOOST_MSVC -void* operator new(std::size_t s) +inline void* operator new(std::size_t s) #else void* operator new(std::size_t s) throw (std::bad_alloc) #endif @@ -40,9 +40,9 @@ void* operator new(std::size_t s) throw (std::bad_alloc) } #if defined BOOST_MSVC -void operator delete(void* p) +inline void operator delete(void* p) #else -void operator delete(void* p) throw () +inline void operator delete(void* p) throw () #endif { std::cout << __FILE__ << ":" << __LINE__ << std::endl; diff --git a/test/threads/thread/constr/lambda_pass.cpp b/test/threads/thread/constr/lambda_pass.cpp index 1d585a23..0ce72534 100644 --- a/test/threads/thread/constr/lambda_pass.cpp +++ b/test/threads/thread/constr/lambda_pass.cpp @@ -28,9 +28,9 @@ unsigned throw_one = 0xFFFF; #if defined _GLIBCXX_THROW -void* operator new(std::size_t s) _GLIBCXX_THROW (std::bad_alloc) +inline void* operator new(std::size_t s) _GLIBCXX_THROW (std::bad_alloc) #elif defined BOOST_MSVC -void* operator new(std::size_t s) +inline void* operator new(std::size_t s) #else void* operator new(std::size_t s) throw (std::bad_alloc) #endif @@ -41,9 +41,9 @@ void* operator new(std::size_t s) throw (std::bad_alloc) } #if defined BOOST_MSVC -void operator delete(void* p) +inline void operator delete(void* p) #else -void operator delete(void* p) throw () +inline void operator delete(void* p) throw () #endif { std::free(p);