components/stdcxx/patches/093-7184739-string.patch
author pkidd <patrick.kidd@oracle.com>
Mon, 10 Apr 2017 14:56:53 -0700
branchs11u3-sru
changeset 7856 a95be34a8fe4
parent 926 de73cd5d7f7c
permissions -rw-r--r--
Added tag 0.175.3.20.0.1.0, S11.3SRU20.1 for changeset 87236a3c36b4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
926
de73cd5d7f7c 7184739 _C_null_ref should be exported as a global symbol
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     1
--- stdcxx-4.2.1/include/string	2011-05-04 12:08:04.799700400 -0700
de73cd5d7f7c 7184739 _C_null_ref should be exported as a global symbol
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     2
+++ stdcxx-4.2.1/include/string	2012-07-17 17:38:04.411236200 -0700
de73cd5d7f7c 7184739 _C_null_ref should be exported as a global symbol
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     3
@@ -853,7 +853,7 @@
de73cd5d7f7c 7184739 _C_null_ref should be exported as a global symbol
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     4
 
de73cd5d7f7c 7184739 _C_null_ref should be exported as a global symbol
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     5
 #ifndef _RWSTD_NO_COLLAPSE_TEMPLATE_STATICS
de73cd5d7f7c 7184739 _C_null_ref should be exported as a global symbol
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     6
 
de73cd5d7f7c 7184739 _C_null_ref should be exported as a global symbol
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     7
-    static _RW::__null_ref<_CharT, _Traits, _Allocator> _C_null_ref;
de73cd5d7f7c 7184739 _C_null_ref should be exported as a global symbol
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     8
+    __global static _RW::__null_ref<_CharT, _Traits, _Allocator> _C_null_ref;
de73cd5d7f7c 7184739 _C_null_ref should be exported as a global symbol
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     9
 
de73cd5d7f7c 7184739 _C_null_ref should be exported as a global symbol
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    10
     static _RW::__null_ref<_CharT, _Traits, _Allocator>* _C_nullref () {
de73cd5d7f7c 7184739 _C_null_ref should be exported as a global symbol
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    11
         return &_C_null_ref;