You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stdcxx.apache.org by se...@apache.org on 2006/08/21 03:34:09 UTC
svn commit: r433116 - in /incubator/stdcxx/trunk/src: collate.cpp podarray.h
Author: sebor
Date: Sun Aug 20 18:34:07 2006
New Revision: 433116
URL: http://svn.apache.org/viewvc?rev=433116&view=rev
Log:
2006-08-20 Martin Sebor <se...@roguewave.com>
* collate.cpp ("podarray.cc"): Removed #include directive
to prevent multiple definition errors.
(__rw_pod_array): Moved explicit instantiation...
* podarray.h: ...to here.
Modified:
incubator/stdcxx/trunk/src/collate.cpp
incubator/stdcxx/trunk/src/podarray.h
Modified: incubator/stdcxx/trunk/src/collate.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/src/collate.cpp?rev=433116&r1=433115&r2=433116&view=diff
==============================================================================
--- incubator/stdcxx/trunk/src/collate.cpp (original)
+++ incubator/stdcxx/trunk/src/collate.cpp Sun Aug 20 18:34:07 2006
@@ -58,12 +58,6 @@
#include "podarray.h" // for __rw_pod_array
#include "setlocale.h" // for __rw_setlocale
-#ifdef _RWSTD_NO_IMPLICIT_INCLUSION
- // included for the explicit instantiation below
-# include "podarray.cc"
-#endif // _RWSTD_NO_IMPLICIT_INCLUSION
-
-
// define _RWSTD_MB_MAX to the greater of MB_LEN_MAX and 8
// where 8 the maximum length necessary to encode a Unicode
// character in UTF-8
@@ -132,16 +126,6 @@
#undef min
#undef max
-
-
-#ifndef _RWSTD_NO_EXPLICIT_INSTANTIATION
-
-// explicitly instantiate for compilers such as Compaq/HP C++ that
-// do not do so automatically when a template specialization is
-// used
-template class _RWSTD_EXPORT __rw_pod_array<const unsigned int*, 1024>;
-
-#endif // _RWSTD_NO_EXPLICIT_INSTANTIATION
// computes LC_XXX category from a numeric facet id, returns the
Modified: incubator/stdcxx/trunk/src/podarray.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/src/podarray.h?rev=433116&r1=433115&r2=433116&view=diff
==============================================================================
--- incubator/stdcxx/trunk/src/podarray.h (original)
+++ incubator/stdcxx/trunk/src/podarray.h Sun Aug 20 18:34:07 2006
@@ -206,7 +206,13 @@
#if _RWSTD_INSTANTIATE_POD_ARRAY
+// used throughout locale
_RWSTD_INSTANTIATE_2 (class _RWSTD_EXPORT __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