Merge branch 'dev'

Author: gershnik

lib/inc/sys_string/impl/platform.h

@@ -110,7 +110,7 @@
 
     #endif
 
-#elif defined(__linux__) || defined(__FreeBSD__)
+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__unix__)
     #include <sys_string/impl/platforms/unix_generic.h>
 
 

lib/inc/sys_string/impl/platforms/android_java.h

@@ -90,7 +90,7 @@ namespace sysstr
         using super::size;
         using super::operator[];
 
-        auto swap(storage & other) noexcept -> void
+        auto swap(android_storage & other) noexcept -> void
             { super::swap(other); }
 
     private:

lib/inc/sys_string/impl/platforms/unix_generic.h

@@ -87,7 +87,7 @@ namespace sysstr
         using super::size;
         using super::operator[];
 
-        auto swap(storage & other) noexcept -> void
+        auto swap(generic_storage & other) noexcept -> void
             { super::swap(other); }
     };
 }

lib/inc/sys_string/impl/platforms/windows_generic.h

@@ -82,7 +82,7 @@ namespace sysstr
         using super::size;
         using super::operator[];
 
-        auto swap(storage & other) noexcept -> void
+        auto swap(win_generic_storage & other) noexcept -> void
             { super::swap(other); }
     };
 }

lib/inc/sys_string/sys_string.h

@@ -197,8 +197,8 @@ namespace sysstr
     #endif
 
         auto swap(sys_string_t & other) noexcept -> void
-            { storage::swap(other.m_storage); }
-        
+            { storage::swap(static_cast<storage &>(other)); }
+
         friend auto swap(sys_string_t & lhs, sys_string_t & rhs) noexcept -> void
             { lhs.swap(rhs); }
 

test/test_general.cpp

@@ -66,6 +66,12 @@ TEST_CASE( "Creation", "[general]") {
     sys_string temp = S("abc");
     sys_string new_temp(std::move(temp));
     CHECK(new_temp == S("abc"));
+
+    temp = S("abc");
+    new_temp = S("xyz");
+    swap(temp, new_temp);
+    CHECK(temp == S("xyz"));
+    CHECK(new_temp == S("abc"));
 }
 
 TEST_CASE( "Iteration", "[general]" ) {