stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From far...@apache.org
Subject svn commit: r597671 - in /incubator/stdcxx/trunk: include/streambuf tests/regress/27.streambuf.imbue.stdcxx-307.cpp
Date Fri, 23 Nov 2007 14:13:38 GMT
Author: faridz
Date: Fri Nov 23 06:13:37 2007
New Revision: 597671

URL: http://svn.apache.org/viewvc?rev=597671&view=rev
Log:
2007-11-23 Farid Zaripov <farid_zaripov@epam.com>

	Merged r597665 from branches/4.2.x with a fix for STDCXX-307
	* streambuf (imbue): Code storing the locale moved from here...
	(pubimbue): ... to here.

2007-11-23 Martin Sebor  <sebor@roguewave.com>

	Merged r597670 from branches/4.2.x
	* 27.streambuf.imbue.stdcxx-307.cpp: New regression test for STDCXX-307.

Added:
    incubator/stdcxx/trunk/tests/regress/27.streambuf.imbue.stdcxx-307.cpp
      - copied, changed from r597669, incubator/stdcxx/branches/4.2.x/tests/regress/27.streambuf.imbue.stdcxx-307.cpp
Modified:
    incubator/stdcxx/trunk/include/streambuf

Modified: incubator/stdcxx/trunk/include/streambuf
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/streambuf?rev=597671&r1=597670&r2=597671&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/streambuf (original)
+++ incubator/stdcxx/trunk/include/streambuf Fri Nov 23 06:13:37 2007
@@ -248,7 +248,7 @@
 
     // 27.5.2.4.1, p1
     virtual void imbue (const locale &__loc) {
-        _C_locale = __loc;
+        // do nothing
     }
 
     // 27.5.2.4.2, p1
@@ -496,6 +496,7 @@
 
     const locale __tmp (getloc ());
     imbue (__loc);
+    _C_locale = __loc;
     return __tmp;
 }
 

Copied: incubator/stdcxx/trunk/tests/regress/27.streambuf.imbue.stdcxx-307.cpp (from r597669,
incubator/stdcxx/branches/4.2.x/tests/regress/27.streambuf.imbue.stdcxx-307.cpp)
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/tests/regress/27.streambuf.imbue.stdcxx-307.cpp?p2=incubator/stdcxx/trunk/tests/regress/27.streambuf.imbue.stdcxx-307.cpp&p1=incubator/stdcxx/branches/4.2.x/tests/regress/27.streambuf.imbue.stdcxx-307.cpp&r1=597669&r2=597671&rev=597671&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.x/tests/regress/27.streambuf.imbue.stdcxx-307.cpp (original)
+++ incubator/stdcxx/trunk/tests/regress/27.streambuf.imbue.stdcxx-307.cpp Fri Nov 23 06:13:37
2007
@@ -55,4 +55,6 @@
     buf.pubimbue (loc);
 
     assert (_STD_HAS_FACET (MyFacet, buf.getloc ()));
+
+    return 0;
 }



Mime
View raw message