stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From far...@apache.org
Subject svn commit: r637220 - in /stdcxx/branches/4.2.x/src: podarray.h ti_podarray.cpp
Date Fri, 14 Mar 2008 19:32:04 GMT
Author: faridz
Date: Fri Mar 14 12:32:02 2008
New Revision: 637220

URL: http://svn.apache.org/viewvc?rev=637220&view=rev
Log:
2008-03-14 Farid Zaripov <farid_zaripov@epam.com>

	Merge r627644 from trunk.
	* src/podarray.h: Don't export internal template class __rw_pod_array<>.
	Use _RWSTD_INSTANTIATE() macro for consistency.
	[__GNUG__ >= 3]: Add #pragma to disable gcc error
	"ISO C++ forbids the use of 'extern' on explicit instantiations".
	* src/ti_podarray.cpp: #define two additional macro values to
	properly expand _RWSTD_INSTANTIATE() macro.

Modified:
    stdcxx/branches/4.2.x/src/podarray.h
    stdcxx/branches/4.2.x/src/ti_podarray.cpp

Modified: stdcxx/branches/4.2.x/src/podarray.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/podarray.h?rev=637220&r1=637219&r2=637220&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/podarray.h (original)
+++ stdcxx/branches/4.2.x/src/podarray.h Fri Mar 14 12:32:02 2008
@@ -32,6 +32,12 @@
 #ifndef _RWSTD_PODARRAY_H_INCLUDED
 #define _RWSTD_PODARRAY_H_INCLUDED
 
+
+#if __GNUG__ >= 3
+#  pragma GCC system_header
+#endif   // gcc >= 3
+
+
 #include <string.h>
 #include <rw/_traits.h>
 #include <rw/_defs.h>
@@ -204,17 +210,19 @@
 
 _RWSTD_NAMESPACE (__rw) { 
 
-#if _RWSTD_INSTANTIATE_POD_ARRAY
+#if _RWSTD_INSTANTIATE (_POD_ARRAY, _CHAR)
 
 // used throughout locale
-_RWSTD_INSTANTIATE_2 (class _RWSTD_EXPORT __rw_pod_array<char, 256>);
+_RWSTD_INSTANTIATE_2 (class __rw_pod_array<char, 256>);
 
-// used in collate.cpp
-_RWSTD_INSTANTIATE_2 (class _RWSTD_EXPORT
-                      __rw_pod_array<const unsigned int*, 1024>);
+#endif   // _RWSTD_INSTANTIATE (_POD_ARRAY, _CHAR)
+
+#if _RWSTD_INSTANTIATE (_POD_ARRAY, _UINT)
 
+// used in collate.cpp
+_RWSTD_INSTANTIATE_2 (class __rw_pod_array<const unsigned int*, 1024>);
 
-#endif   // _RWSTD_INSTANTIATE_POD_ARRAY
+#endif   // _RWSTD_INSTANTIATE (_POD_ARRAY, _UINT)
 
 }   // namespace __rw
 

Modified: stdcxx/branches/4.2.x/src/ti_podarray.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/ti_podarray.cpp?rev=637220&r1=637219&r2=637220&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/ti_podarray.cpp (original)
+++ stdcxx/branches/4.2.x/src/ti_podarray.cpp Fri Mar 14 12:32:02 2008
@@ -31,6 +31,8 @@
 
 #define _RWSTD_INSTANTIATE_TEMPLATES       1
 #define _RWSTD_INSTANTIATE_POD_ARRAY       1
+#define _RWSTD_INSTANTIATE_CHAR            1
+#define _RWSTD_INSTANTIATE_UINT            1
 
 #include <rw/_defs.h>
 



Mime
View raw message