From f3c970c4de16c69a5c45fb2b8140eaf3be7c10bb Mon Sep 17 00:00:00 2001
From: Tomas Pecka <peckato1@fit.cvut.cz>
Date: Tue, 19 Feb 2019 20:12:49 +0100
Subject: [PATCH] Measure: Temporarily disable overloaded op new/delete
---
alib2measure/src/debug/New.cpp | 2 +-
alib2measure/test-src/measurements/MeasurementsTest.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/alib2measure/src/debug/New.cpp b/alib2measure/src/debug/New.cpp
index 7249b814da..a32e842160 100644
--- a/alib2measure/src/debug/New.cpp
+++ b/alib2measure/src/debug/New.cpp
@@ -6,7 +6,7 @@
#include <new>
#include "../measurements/MeasurementNew.hpp"
-#if DEBUG
+#if 0
void * operator new( std::size_t n ) {
return operator new( n, true );
}
diff --git a/alib2measure/test-src/measurements/MeasurementsTest.cpp b/alib2measure/test-src/measurements/MeasurementsTest.cpp
index 0b418c7b4d..a1210d32dc 100644
--- a/alib2measure/test-src/measurements/MeasurementsTest.cpp
+++ b/alib2measure/test-src/measurements/MeasurementsTest.cpp
@@ -111,7 +111,7 @@ void __NO_OPTIMIZE_ATTRIBUTE__ MeasurementsTest::testMemoryMeasurements ( ) {
std::cout << measurements::MeasurementFormat::LIST << measurements::results ( ) << std::endl;
std::cout << measurements::MeasurementFormat::TREE << measurements::results ( ) << std::endl;
-#ifdef DEBUG
+#if 0
int expectedResultsHW [ ] = { 12000, 2000, 12000 , 12000, 4000, 4000 };
int expectedResultsSHU [ ] = { 0, 0 , 4000 , 4000 , 0 , 0 };
int expectedResultsEHU [ ] = { 0, 2000, 0 , 12000, 0 , 0 };
--
GitLab