From 142e52224d5602097b112eace4d73c09509e6f42 Mon Sep 17 00:00:00 2001
From: Kamil Diedrich <kamil.diedrich@intel.com>
Date: Mon, 9 Jul 2018 13:32:11 +0200
Subject: [PATCH] Upgrade c++ version with 14

Change-Id: Idbb80f1208a06dfbf91f6214929719833a622004
---
 CMakeLists.txt                           |  4 ++--
 unit_tests/helpers/memory_management.cpp | 21 +++++++++++----------
 2 files changed, 13 insertions(+), 12 deletions(-)

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 <Windows.h>
 #endif
 
-#if defined(_MSC_VER)
-#define NOEXCEPT
-#else
-#define NOEXCEPT noexcept
-#endif
-
 namespace MemoryManagement {
 size_t failingAllocation = -1;
 std::atomic<size_t> 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<AllocationEvent::EVENT_NEW_NOTHROW, AllocationEvent::EVENT_NEW_NOTHROW_FAIL>(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<AllocationEvent::EVENT_NEW_ARRAY_NOTHROW, AllocationEvent::EVENT_NEW_ARRAY_NOTHROW_FAIL>(size, std::nothrow);
     initMemory(p, size);
     return p;
 }
 
-void operator delete(void *p) throw() {
+void operator delete(void *p) noexcept {
     deallocate<AllocationEvent::EVENT_DELETE>(p);
 }
 
-void operator delete[](void *p) throw() {
+void operator delete[](void *p) noexcept {
+    deallocate<AllocationEvent::EVENT_DELETE_ARRAY>(p);
+}
+void operator delete(void *p, size_t size) noexcept {
+    deallocate<AllocationEvent::EVENT_DELETE>(p);
+}
+
+void operator delete[](void *p, size_t size) noexcept {
     deallocate<AllocationEvent::EVENT_DELETE_ARRAY>(p);
 }