You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stdcxx.apache.org by fa...@apache.org on 2008/02/14 04:25:21 UTC
svn commit: r627644 - in /stdcxx/trunk/src: podarray.h ti_podarray.cpp
Author: faridz
Date: Wed Feb 13 19:25:19 2008
New Revision: 627644
URL: http://svn.apache.org/viewvc?rev=627644&view=rev
Log:
2008-02-14 Farid Zaripov <fa...@epam.com>
* 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/trunk/src/podarray.h
stdcxx/trunk/src/ti_podarray.cpp
Modified: stdcxx/trunk/src/podarray.h
URL: http://svn.apache.org/viewvc/stdcxx/trunk/src/podarray.h?rev=627644&r1=627643&r2=627644&view=diff
==============================================================================
--- stdcxx/trunk/src/podarray.h (original)
+++ stdcxx/trunk/src/podarray.h Wed Feb 13 19:25:19 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/trunk/src/ti_podarray.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/src/ti_podarray.cpp?rev=627644&r1=627643&r2=627644&view=diff
==============================================================================
--- stdcxx/trunk/src/ti_podarray.cpp (original)
+++ stdcxx/trunk/src/ti_podarray.cpp Wed Feb 13 19:25:19 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>