atomic_ptr.h: clean up the clean-up

73e6a380 · Thomas Köppe · 80b1e67e · 73e6a380
Commit 73e6a380 authored Jun 30, 2015 by Thomas Köppe
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 14 deletions

atomic_ptr.hpp src/atomic_ptr.hpp +6 -14

No files found.
--- 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_MUTEX
+#undef ZMQ_ATOMIC_PTR_INTRINSIC
+#undef ZMQ_ATOMIC_CXX11
 #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_TILE
+#undef ZMQ_ATOMIC_PTR_WINDOWS
+#undef ZMQ_ATOMIC_PTR_ATOMIC_H

 #endif
-