[libcxx] r195223 - Merging r195143:

[Bill Wendling]

Author: void
Date: Wed Nov 20 00:40:42 2013
New Revision: 195223

URL: http://llvm.org/viewvc/llvm-project?rev=195223&view=rev
Log:
Merging r195143:
------------------------------------------------------------------------
r195143 | marshall | 2013-11-19 11:14:27 -0800 (Tue, 19 Nov 2013) | 1 line

Fix a test that I broke over the weekend
------------------------------------------------------------------------

Modified:
    libcxx/branches/release_34/   (props changed)
    libcxx/branches/release_34/test/input.output/iostream.format/quoted.manip/quoted.pass.cpp

Propchange: libcxx/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 20 00:40:42 2013
@@ -1 +1,2 @@
 /libcxx/branches/apple:136569-137939
+/libcxx/trunk:195143

Modified: libcxx/branches/release_34/test/input.output/iostream.format/quoted.manip/quoted.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_34/test/input.output/iostream.format/quoted.manip/quoted.pass.cpp?rev=195223&r1=195222&r2=195223&view=diff
==============================================================================
--- libcxx/branches/release_34/test/input.output/iostream.format/quoted.manip/quoted.pass.cpp (original)
+++ libcxx/branches/release_34/test/input.output/iostream.format/quoted.manip/quoted.pass.cpp Wed Nov 20 00:40:42 2013
@@ -18,16 +18,6 @@
 
 #if _LIBCPP_STD_VER > 11
 
-void both_ways ( const char *p ) {
-	std::string str(p);
-	auto q = std::quoted(s);
-
-    std::stringstream ss;
-    bool skippingws = is_skipws ( &ss );
-	ss << q;
-	ss >> q;
-    }
-
 bool is_skipws ( const std::istream *is ) {
     return ( is->flags() & std::ios_base::skipws ) != 0;
     }
@@ -37,6 +27,16 @@ bool is_skipws ( const std::wistream *is
     return ( is->flags() & std::ios_base::skipws ) != 0;
     }
 
+void both_ways ( const char *p ) {
+	std::string str(p);
+	auto q = std::quoted(str);
+
+    std::stringstream ss;
+    bool skippingws = is_skipws ( &ss );
+	ss << q;
+	ss >> q;
+    }
+
 void round_trip ( const char *p ) {
     std::stringstream ss;
     bool skippingws = is_skipws ( &ss );