diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b2a866325..f8eb6bf8ea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,8 +73,8 @@ if(NOT IGDRCL_BINARY_DIR) set(IGDRCL_BINARY_DIR ${CMAKE_BINARY_DIR}) endif() -# we use c++11 -set(CMAKE_CXX_STANDARD 11) +# we use c++14 +set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) # we force using response files diff --git a/unit_tests/helpers/memory_management.cpp b/unit_tests/helpers/memory_management.cpp index e02459ac12..85ad0ee702 100644 --- a/unit_tests/helpers/memory_management.cpp +++ b/unit_tests/helpers/memory_management.cpp @@ -37,12 +37,6 @@ #include #endif -#if defined(_MSC_VER) -#define NOEXCEPT -#else -#define NOEXCEPT noexcept -#endif - namespace MemoryManagement { size_t failingAllocation = -1; std::atomic numAllocations(0); @@ -270,7 +264,7 @@ void *operator new(size_t size) { return p; } -void *operator new(size_t size, const std::nothrow_t &) NOEXCEPT { +void *operator new(size_t size, const std::nothrow_t &) noexcept { void *p = allocate(size, std::nothrow); initMemory(p, size); return p; @@ -282,16 +276,23 @@ void *operator new[](size_t size) { return p; } -void *operator new[](size_t size, const std::nothrow_t &t) NOEXCEPT { +void *operator new[](size_t size, const std::nothrow_t &t) noexcept { void *p = allocate(size, std::nothrow); initMemory(p, size); return p; } -void operator delete(void *p) throw() { +void operator delete(void *p) noexcept { deallocate(p); } -void operator delete[](void *p) throw() { +void operator delete[](void *p) noexcept { + deallocate(p); +} +void operator delete(void *p, size_t size) noexcept { + deallocate(p); +} + +void operator delete[](void *p, size_t size) noexcept { deallocate(p); }