Merge pull request #20 from glebm/fix-swap

Fix `swap` overload

1 files changed, 8 insertions, 6 deletions

diff --git a/include/marisa/base.h b/include/marisa/base.h
index 17606c0..7b1caf3 100644
--- a/include/marisa/base.h
+++ b/include/marisa/base.h
@@ -162,6 +162,13 @@ typedef enum marisa_config_mask_ {
 #endif  // __cplusplus
 
 #ifdef __cplusplus
+
+// `std::swap` is in <utility> since C++ 11 but in <algorithm> in C++ 98:
+#if __cplusplus>=201103L
+#include <utility>
+#else
+#include <algorithm>
+#endif
 namespace marisa {
 
 typedef ::marisa_uint8  UInt8;
@@ -175,12 +182,7 @@ typedef ::marisa_cache_level CacheLevel;
 typedef ::marisa_tail_mode TailMode;
 typedef ::marisa_node_order NodeOrder;
 
-template <typename T>
-inline void swap(T &lhs, T &rhs) {
-  T temp = lhs;
-  lhs = rhs;
-  rhs = temp;
-}
+using std::swap;
 
 }  // namespace marisa
 #endif  // __cplusplus