From 73e6a3808fd5063c6f09cfaf5a7334cee1c6712e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20K=C3=B6ppe?= Date: Tue, 30 Jun 2015 22:56:58 +0100 Subject: [PATCH] atomic_ptr.h: clean up the clean-up --- src/atomic_ptr.hpp | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/src/atomic_ptr.hpp b/src/atomic_ptr.hpp index 04be3349..da2d1eb2 100644 --- a/src/atomic_ptr.hpp +++ b/src/atomic_ptr.hpp @@ -217,21 +217,13 @@ namespace zmq } // Remove macros local to this file. -#if defined ZMQ_ATOMIC_PTR_WINDOWS -#undef ZMQ_ATOMIC_PTR_WINDOWS -#endif -#if defined ZMQ_ATOMIC_PTR_ATOMIC_H -#undef ZMQ_ATOMIC_PTR_ATOMIC_H -#endif -#if defined ZMQ_ATOMIC_PTR_X86 -#undef ZMQ_ATOMIC_PTR_X86 -#endif -#if defined ZMQ_ATOMIC_PTR_ARM -#undef ZMQ_ATOMIC_PTR_ARM -#endif -#if defined ZMQ_ATOMIC_PTR_MUTEX #undef ZMQ_ATOMIC_PTR_MUTEX -#endif +#undef ZMQ_ATOMIC_PTR_INTRINSIC +#undef ZMQ_ATOMIC_CXX11 +#undef ZMQ_ATOMIC_PTR_X86 +#undef ZMQ_ATOMIC_PTR_ARM +#undef ZMQ_ATOMIC_PTR_TILE +#undef ZMQ_ATOMIC_PTR_WINDOWS +#undef ZMQ_ATOMIC_PTR_ATOMIC_H #endif -