Author: faridz
Date: Tue Jul 1 08:44:50 2008
New Revision: 673109
URL: http://svn.apache.org/viewvc?rev=673109&view=rev
Log:
2008-07-01 Farid Zaripov <[EMAIL PROTECTED]>
STDCXX-339
* etc/config/src/EXTERN_MEMBER_TEMPLATE.cpp: Removed dependency
on deleted config test. Corrected name of the config macro
_RWSTD_NO_MEMBER_TEMPLATES. Replaced NO_MEMBER_TEMPLATE to
NO_MEMBER_TEMPLATES for consistency.
* etc/config/src/extern_template_imp.cpp: Ditto.
* etc/config/src/extern_template_imp.h: Removed using of the
NO_INLINE_MEMBER_TEMPLATE macro. Replaced NO_MEMBER_TEMPLATE to
NO_MEMBER_TEMPLATES for consistency.
* etc/config/src/MEMBER_TEMPLATES.cpp: Removed inclusion of the
deleted config test.
Modified:
stdcxx/branches/4.2.x/etc/config/src/EXTERN_MEMBER_TEMPLATE.cpp
stdcxx/branches/4.2.x/etc/config/src/MEMBER_TEMPLATES.cpp
stdcxx/branches/4.2.x/etc/config/src/extern_template_imp.cpp
stdcxx/branches/4.2.x/etc/config/src/extern_template_imp.h
Modified: stdcxx/branches/4.2.x/etc/config/src/EXTERN_MEMBER_TEMPLATE.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/etc/config/src/EXTERN_MEMBER_TEMPLATE.cpp?rev=673109&r1=673108&r2=673109&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/etc/config/src/EXTERN_MEMBER_TEMPLATE.cpp (original)
+++ stdcxx/branches/4.2.x/etc/config/src/EXTERN_MEMBER_TEMPLATE.cpp Tue Jul 1
08:44:50 2008
@@ -27,13 +27,9 @@
// establish dependencies on the config tests and define config
// macros used in the header below (the are not autodetected
// in headers)
-#ifdef _RWSTD_NO_INLINE_MEMBER_TEMPLATE
-# define NO_INLINE_MEMBER_TEMPLATE
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATE
-
-#ifdef _RWSTD_NO_MEMBER_TEMPLATE
-# define NO_MEMBER_TEMPLATE
-#endif // _RWSTD_NO_MEMBER_TEMPLATE
+#ifdef _RWSTD_NO_MEMBER_TEMPLATES
+# define NO_MEMBER_TEMPLATES
+#endif // _RWSTD_NO_MEMBER_TEMPLATES
// include a file containing the definition of a template
// and an extern template directive referencing an explicit
Modified: stdcxx/branches/4.2.x/etc/config/src/MEMBER_TEMPLATES.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/etc/config/src/MEMBER_TEMPLATES.cpp?rev=673109&r1=673108&r2=673109&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/etc/config/src/MEMBER_TEMPLATES.cpp (original)
+++ stdcxx/branches/4.2.x/etc/config/src/MEMBER_TEMPLATES.cpp Tue Jul 1
08:44:50 2008
@@ -22,9 +22,6 @@
*
**************************************************************************/
-// both tests must successfully compile
-#include "INLINE_MEMBER_TEMPLATES.cpp"
-
struct C
{
template <class T>
Modified: stdcxx/branches/4.2.x/etc/config/src/extern_template_imp.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/etc/config/src/extern_template_imp.cpp?rev=673109&r1=673108&r2=673109&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/etc/config/src/extern_template_imp.cpp (original)
+++ stdcxx/branches/4.2.x/etc/config/src/extern_template_imp.cpp Tue Jul 1
08:44:50 2008
@@ -26,13 +26,9 @@
// establish dependencies on the config tests and define config
// macros used in the header below (the are not autodetected
// in headers)
-#ifdef _RWSTD_NO_INLINE_MEMBER_TEMPLATE
-# define NO_INLINE_MEMBER_TEMPLATE
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATE
-
-#ifndef _RWSTD_NO_MEMBER_TEMPLATE
-# define NO_MEMBER_TEMPLATE
-#endif // _RWSTD_NO_MEMBER_TEMPLATE
+#ifndef _RWSTD_NO_MEMBER_TEMPLATES
+# define NO_MEMBER_TEMPLATES
+#endif // _RWSTD_NO_MEMBER_TEMPLATES
// explicitly instantiate the template defined in the header
#define INSTANTIATE
Modified: stdcxx/branches/4.2.x/etc/config/src/extern_template_imp.h
URL:
http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/etc/config/src/extern_template_imp.h?rev=673109&r1=673108&r2=673109&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/etc/config/src/extern_template_imp.h (original)
+++ stdcxx/branches/4.2.x/etc/config/src/extern_template_imp.h Tue Jul 1
08:44:50 2008
@@ -47,33 +47,27 @@
return bar ();
}
-#if defined (NO_INLINE_MEMBER_TEMPLATE)
+#if defined (NO_MEMBER_TEMPLATES)
int inline_member_template (int) const {
return 0;
}
-#else // if !defined (NO_INLINE_MEMBER_TEMPLATE)
+ int member_template (int) const {
+ return 0;
+ }
+
+#else // if !defined (NO_MEMBER_TEMPLATES)
template <class U>
U inline_member_template (U) const {
return U ();
}
-#endif // NO_INLINE_MEMBER_TEMPLATE
-
-#if defined (NO_MEMBER_TEMPLATE)
-
- int member_template (int) const {
- return 0;
- }
-
-#else // if !defined (NO_MEMBER_TEMPLATE)
-
template <class U>
U member_template (U) const;
-#endif // NO_MEMBER_TEMPLATE
+#endif // NO_MEMBER_TEMPLATES
};
@@ -93,7 +87,7 @@
#endif // INSTANTIATE
}
-#if !defined (NO_MEMBER_TEMPLATE)
+#if !defined (NO_MEMBER_TEMPLATES)
template <class T>
template <class U>
@@ -102,7 +96,7 @@
return U ();
}
-#endif // NO_MEMBER_TEMPLATE
+#endif // NO_MEMBER_TEMPLATES
#if defined (INSTANTIATE)
