| author | Stefan Teleman <stefan.teleman@oracle.com> |
| Wed, 29 Jul 2015 13:15:08 -0700 | |
| branch | s11u2-sru |
| changeset 4713 | 0abeb3fa670c |
| permissions | -rw-r--r-- |
|
4713
0abeb3fa670c
19297051 libstdcxx incompatible with C++ mangle6 option
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1 |
# Internal patch for Studio C++ 12.4. |
|
0abeb3fa670c
19297051 libstdcxx incompatible with C++ mangle6 option
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
2 |
# The upstream project at the ASF is defunct. |
|
0abeb3fa670c
19297051 libstdcxx incompatible with C++ mangle6 option
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
3 |
--- stdcxx-4.2.1/include/rw/_config-sunpro.h Mon Apr 6 12:06:23 2015 |
|
0abeb3fa670c
19297051 libstdcxx incompatible with C++ mangle6 option
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
4 |
+++ stdcxx-4.2.1/include/rw/_config-sunpro.h Tue Apr 7 14:35:34 2015 |
|
0abeb3fa670c
19297051 libstdcxx incompatible with C++ mangle6 option
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
5 |
@@ -63,3 +63,8 @@ |
|
0abeb3fa670c
19297051 libstdcxx incompatible with C++ mangle6 option
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
6 |
# define _RWSTD_STRICT_SPARCV8_MUTEX_ALIGNMENT 1 |
|
0abeb3fa670c
19297051 libstdcxx incompatible with C++ mangle6 option
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
7 |
#endif |
|
0abeb3fa670c
19297051 libstdcxx incompatible with C++ mangle6 option
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
8 |
|
|
0abeb3fa670c
19297051 libstdcxx incompatible with C++ mangle6 option
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
9 |
+#if defined(_TEMPLATE_NO_EXTDEF) |
|
0abeb3fa670c
19297051 libstdcxx incompatible with C++ mangle6 option
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
10 |
+#undef _RWSTD_NO_IMPLICIT_INCLUSION |
|
0abeb3fa670c
19297051 libstdcxx incompatible with C++ mangle6 option
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
11 |
+#define _RWSTD_NO_IMPLICIT_INCLUSION |
|
0abeb3fa670c
19297051 libstdcxx incompatible with C++ mangle6 option
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
12 |
+#endif |
|
0abeb3fa670c
19297051 libstdcxx incompatible with C++ mangle6 option
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
13 |
+ |
|
0abeb3fa670c
19297051 libstdcxx incompatible with C++ mangle6 option
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
14 |
--- stdcxx-4.2.1/include/loc/_numpunct.h Mon Mar 30 23:03:58 2015 |
|
0abeb3fa670c
19297051 libstdcxx incompatible with C++ mangle6 option
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
15 |
+++ stdcxx-4.2.1/include/loc/_numpunct.h Wed Apr 1 23:04:38 2015 |
|
0abeb3fa670c
19297051 libstdcxx incompatible with C++ mangle6 option
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
16 |
@@ -84,7 +84,7 @@ |
|
0abeb3fa670c
19297051 libstdcxx incompatible with C++ mangle6 option
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
17 |
|
|
0abeb3fa670c
19297051 libstdcxx incompatible with C++ mangle6 option
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
18 |
protected: |
|
0abeb3fa670c
19297051 libstdcxx incompatible with C++ mangle6 option
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
19 |
|
|
0abeb3fa670c
19297051 libstdcxx incompatible with C++ mangle6 option
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
20 |
- virtual ~numpunct () { }
|
|
0abeb3fa670c
19297051 libstdcxx incompatible with C++ mangle6 option
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
21 |
+ virtual ~numpunct () ; |
|
0abeb3fa670c
19297051 libstdcxx incompatible with C++ mangle6 option
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
22 |
|
|
0abeb3fa670c
19297051 libstdcxx incompatible with C++ mangle6 option
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
23 |
// 22.2.3.1.2, p1 |
|
0abeb3fa670c
19297051 libstdcxx incompatible with C++ mangle6 option
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
24 |
virtual char_type do_decimal_point () const {
|