Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r63940 - in trunk/libs/uuid: . test
From: atompkins_at_[hidden]
Date: 2010-07-12 20:17:40


Author: atompkins
Date: 2010-07-12 20:17:38 EDT (Mon, 12 Jul 2010)
New Revision: 63940
URL: http://svn.boost.org/trac/boost/changeset/63940

Log:
Fixed bug in documentation (forgot a dash in 3 uuid strings).
Fixed test_io.cpp for some platforms for wstring (I hope).
Text files modified:
   trunk/libs/uuid/test/test_io.cpp | 2 ++
   trunk/libs/uuid/uuid.html | 6 +++---
   2 files changed, 5 insertions(+), 3 deletions(-)

Modified: trunk/libs/uuid/test/test_io.cpp
==============================================================================
--- trunk/libs/uuid/test/test_io.cpp (original)
+++ trunk/libs/uuid/test/test_io.cpp 2010-07-12 20:17:38 EDT (Mon, 12 Jul 2010)
@@ -19,6 +19,7 @@
 #include <iomanip>
 
 #ifndef BOOST_NO_STD_WSTRING
+namespace std {
 template <typename Elem, typename Traits>
 std::basic_ostream<Elem, Traits>& operator<<(std::basic_ostream<Elem, Traits>& os, std::wstring const& s) {
     // convert to string
@@ -26,6 +27,7 @@
     os << temp;
     return os;
 }
+} // namespace std
 #endif
 
 int main(int, char*[])

Modified: trunk/libs/uuid/uuid.html
==============================================================================
--- trunk/libs/uuid/uuid.html (original)
+++ trunk/libs/uuid/uuid.html 2010-07-12 20:17:38 EDT (Mon, 12 Jul 2010)
@@ -447,10 +447,10 @@
 <p>The <tt>boost::uuids::string_generator</tt> class generates a <b>uuid</b> from a string.
 <pre>
 boost::uuids::string_generator gen;
-boost::uuids::uuid u1 = gen("{01234567-89ab-cdef-0123456789abcdef}");
-boost::uuids::uuid u2 = gen(L"01234567-89ab-cdef-0123456789abcdef");
+boost::uuids::uuid u1 = gen("{01234567-89ab-cdef-0123-456789abcdef}");
+boost::uuids::uuid u2 = gen(L"01234567-89ab-cdef-0123-456789abcdef");
 boost::uuids::uuid u3 = gen(std::string("0123456789abcdef0123456789abcdef"));
-boost::uuids::uuid u4 = gen(std::wstring(L"01234567-89ab-cdef-0123456789abcdef"));
+boost::uuids::uuid u4 = gen(std::wstring(L"01234567-89ab-cdef-0123-456789abcdef"));
 </pre>
 
 <h3><a name="boost/uuid/name_generator.hpp" href="./../../boost/uuid/name_generator.hpp">boost/uuid/name_generator.hpp</a></h3>


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk