From d2854834e18443876c8f75e0a7f3b88d1d549fc4 Mon Sep 17 00:00:00 2001
From: Daniel Wilhelm <daniel@wili.li>
Date: Fri, 18 Apr 2014 17:15:39 +0200
Subject: 4.2

---
 zen/perf.h | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'zen/perf.h')

diff --git a/zen/perf.h b/zen/perf.h
index f9970d0a..688043a7 100644
--- a/zen/perf.h
+++ b/zen/perf.h
@@ -8,15 +8,9 @@
 #define DEBUG_PERF_HEADER
 
 #include <sstream>
+#include "deprecate.h"
 #include "win.h" //includes "windows.h"
 
-#ifdef __MINGW32__
-#define DEPRECATED(x) x __attribute__ ((deprecated))
-#elif defined _MSC_VER
-#define DEPRECATED(x) __declspec(deprecated) x
-#endif
-
-
 //two macros for quick performance measurements
 #define PERF_START CpuTimer perfTest;
 #define PERF_STOP  perfTest.showResult();
@@ -26,7 +20,8 @@ class CpuTimer
 public:
     class TimerError {};
 
-    DEPRECATED(CpuTimer()) : frequency(), startTime(), resultShown(false)
+    ZEN_DEPRECATE
+    CpuTimer() : frequency(), startTime(), resultShown(false)
     {
         SetThreadAffinity dummy;
         if (!::QueryPerformanceFrequency(&frequency)) throw TimerError();
-- 
cgit