[Loki-lib-cvs] SF.net SVN: loki-lib:[1011] trunk

[<jfb...@us...>]

Revision: 1011
          http://loki-lib.svn.sourceforge.net/loki-lib/?rev=1011&view=rev
Author:   jfbastien
Date:     2009-03-17 18:21:12 +0000 (Tue, 17 Mar 2009)

Log Message:
-----------
Bug 2690414: flex_string missing swap implementation

Modified Paths:
--------------
    trunk/include/loki/flex/flex_string_shell.h
    trunk/test/flex_string/main.cpp

Modified: trunk/include/loki/flex/flex_string_shell.h
===================================================================
--- trunk/include/loki/flex/flex_string_shell.h	2009-03-13 15:17:59 UTC (rev 1010)
+++ trunk/include/loki/flex/flex_string_shell.h	2009-03-17 18:21:12 UTC (rev 1011)
@@ -1305,8 +1305,12 @@
     const flex_string<E, T, A, S>& rhs)
 { return !(lhs < rhs); }
 
-// subclause 21.3.7.8:
-//void swap(flex_string<E, T, A, S>& lhs, flex_string<E, T, A, S>& rhs);    // to do
+template <typename E, class T, class A, class S>
+inline void swap(flex_string<E, T, A, S>& lhs, flex_string<E, T, A, S>& rhs)
+{
+  // 21.3.7.8
+  lhs.swap(rhs);
+}
 
 template <typename E, class T, class A, class S>
 std::basic_istream<typename flex_string<E, T, A, S>::value_type,

Modified: trunk/test/flex_string/main.cpp
===================================================================
--- trunk/test/flex_string/main.cpp	2009-03-13 15:17:59 UTC (rev 1010)
+++ trunk/test/flex_string/main.cpp	2009-03-17 18:21:12 UTC (rev 1011)
@@ -515,7 +515,7 @@
   template<class String>
   String swap_string_string()
   {
-    using std::swap;
+    // 21.3.7.8
     String random1(RandomString<String>(MaxString<String>::value));
     String random2(RandomString<String>(MaxString<String>::value));
     swap(random1, random2);
@@ -525,7 +525,7 @@
   template<class String>
   String swap_string_string__self()
   {
-    using std::swap;
+    // 21.3.7.8
     String random1(RandomString<String>(MaxString<String>::value));
     swap(random1, random1);
     return random1;
@@ -534,7 +534,7 @@
   template<class String>
   String swap_string_string__selfcopy()
   {
-    using std::swap;
+    // 21.3.7.8
     String random1(RandomString<String>(MaxString<String>::value));
     String copy(random1);
     swap(random1, copy);
@@ -544,7 +544,7 @@
   template<class String>
   String swap_string_string__selfcopy2()
   {
-    using std::swap;
+    // 21.3.7.8
     String random1(RandomString<String>(MaxString<String>::value));
     String copy(random1);
     swap(copy, random1);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.