Author: sebor
Date: Thu Oct 18 08:56:38 2007
New Revision: 586017
URL: http://svn.apache.org/viewvc?rev=586017&view=rev
Log:
2007-10-18 Martin Sebor <[EMAIL PROTECTED]>
Merged rev 586016 from branches/4.2.0 disabling the fix for STDCXX-469
for Microsoft Visual Studio to maintain binary compatibility with stdcxx
4.1 (the compiler mangles the access of class members into their names).
* include/loc/_facet.h [_MSC_VER] (__rw_facet, ~__rw_facet): Made class
ctor and dtor public again until stdcxx 5.0.
Modified:
incubator/stdcxx/trunk/include/loc/_facet.h
Modified: incubator/stdcxx/trunk/include/loc/_facet.h
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/loc/_facet.h?rev=586017&r1=586016&r2=586017&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/loc/_facet.h (original)
+++ incubator/stdcxx/trunk/include/loc/_facet.h Thu Oct 18 08:56:38 2007
@@ -25,7 +25,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*
- * Copyright 1994-2006 Rogue Wave Software.
+ * Copyright 1994-2007 Rogue Wave Software, Inc.
*
**************************************************************************/
@@ -56,7 +56,13 @@
// of standard types by the library
typedef __rw_facet* (_C_ctor_t)(_RWSTD_SIZE_T, const char*);
+#if !defined (_MSC_VER) || 5 <= _RWSTD_VER_MAJOR
+
+ // disabled for binary compatibility with stdcxx 4.1.x for MSVC
+ // (the compiler mangles access specifiers into class members)
protected:
+
+#endif // !MSVC || 5 <= stdcxx version
_EXPLICIT __rw_facet (_RWSTD_SIZE_T = 0);
