stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r669554 - /stdcxx/branches/4.3.x/include/rw/_meta_other.h
Date Thu, 19 Jun 2008 16:49:54 GMT
Author: vitek
Date: Thu Jun 19 09:49:53 2008
New Revision: 669554

URL: http://svn.apache.org/viewvc?rev=669554&view=rev
Log:
2008-06-19  Travis Vitek  <vitek@roguewave.com>

	STDCXX-926
	* include/rw/_meta_other.h: Add typedef keyword to nested union
	types used by aligned_storage and aligned_union types. Require
	at least one type be provided to aligned_union. Allow length
	passed to aligned_union to be 0.

Modified:
    stdcxx/branches/4.3.x/include/rw/_meta_other.h

Modified: stdcxx/branches/4.3.x/include/rw/_meta_other.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_meta_other.h?rev=669554&r1=669553&r2=669554&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_meta_other.h (original)
+++ stdcxx/branches/4.3.x/include/rw/_meta_other.h Thu Jun 19 09:49:53 2008
@@ -37,69 +37,33 @@
 
 _RWSTD_NAMESPACE (__rw) {
 
-template <_RWSTD_SIZE_T _Align>
-struct __rw_aligned_storage_impl;
-
-template <>
-struct __rw_aligned_storage_impl<1>
-{
-    _RWSTD_UINT_LEAST8_T _C_type;
-};
-
-template <>
-struct __rw_aligned_storage_impl<2>
-{
-    _RWSTD_UINT_LEAST16_T _C_type;
-};
-
-template <>
-struct __rw_aligned_storage_impl<3>
-{
-    _RWSTD_UINT_LEAST32_T _C_type;
-};
-
-template <>
-struct __rw_aligned_storage_impl<4>
-{
-    _RWSTD_UINT_LEAST32_T _C_type;
-};
-
 template <_RWSTD_SIZE_T _Len, _RWSTD_SIZE_T _Align = 4>
 struct __rw_aligned_storage
 {
-    // the member typedef _C_type shall be a pod-type suitable for
-    // use as uninitialized storage for any object whose size is at
-    // most _Len and whose alignment is a divisor of _Align.
-    //
-    // i think they mean divisible by _Align. i.e. if _Align is 4, we
-    // could return 4, 8 or 16 byte aligned data, but we could not
-    // return 1 byte aligned data.        
-    union {
+    typedef union {
         unsigned char __data [_Len];
-        typename __rw_aligned_storage_impl<_Align>::_C_type __align;
+        // not implemented
     } type;
 };
 
 
 #ifndef _RWSTD_NO_VARIADIC_TEMPLATES
 
-template <_RWSTD_SIZE_T _Len, class... Types>
-struct __rw_aligned_union_impl;
-
-template <_RWSTD_SIZE_T _Len, class Type, class... Types>
-struct __rw_aligned_union_impl<_Len, Type, Types...>
+template <_RWSTD_SIZE_T _Len, class _TypeT, class... _Types>
+struct __rw_aligned_union_impl<_Len, _TypeT, _Types...>
 {
-    union {
-        unsigned char __pad [_Len];
+    typedef union {
+        unsigned char __pad [_Len ? _Len : 1];
+        _TypeT __type1;
         typename __rw_aligned_union_impl<_Len, Types...>::_C_type __align;
     } _C_type;
 };
 
-template <_RWSTD_SIZE_T _Len>
-struct __rw_aligned_union_impl<_Len>
+template <_RWSTD_SIZE_T _Len, class _TypeT>
+struct __rw_aligned_union_impl<_Len, _TypeT>
 {
-    union {
-        unsigned char __pad [_Len];
+    typedef union {
+        unsigned char __pad [_Len ? _Len : 1];
     } _C_type;
 };
 
@@ -115,14 +79,14 @@
 struct __rw_empty { };
 
 template <_RWSTD_SIZE_T _Len,
-          class _Type1 = __rw_empty, class _Type2 = __rw_empty,
+          class _Type1             , class _Type2 = __rw_empty,
           class _Type3 = __rw_empty, class _Type4 = __rw_empty,
           class _Type5 = __rw_empty, class _Type6 = __rw_empty,
           class _Type7 = __rw_empty, class _Type8 = __rw_empty>
 struct __rw_aligned_union
 {
-    union {
-        unsigned char __pad [_Len];
+    typedef union {
+        unsigned char __pad [_Len ? _Len : 1];
         _Type1 __object1;
         _Type2 __object2;
         _Type3 __object3;
@@ -161,7 +125,8 @@
 {
 };
 
-//#define _RWSTD_ENABLE_IF(C,T) _RW::__rw_enable_if<C,T>::type
+#define _RWSTD_ENABLE_IF(C,T) _RW::__rw_enable_if<C,T>::type
+
 
 /**
  * Conditional primitive that provides a member typedef type that is
@@ -188,7 +153,8 @@
 {
 };
 
-//#define _RWSTD_DISABLE_IF(C,T) _RW::__rw_disable_if<C,T>::type
+#define _RWSTD_DISABLE_IF(C,T) _RW::__rw_disable_if<C,T>::type
+
 
 /**
  * Metaprogramming conditional primitive that provides a member typedef
@@ -214,7 +180,8 @@
     typedef _TypeU type;
 };
 
-//#define _RWSTD_CONDITIONAL(C,T,U) _RW::__rw_conditional<C,T,U>::type
+#define _RWSTD_CONDITIONAL(C,T,U) _RW::__rw_conditional<C,T,U>::type
+
 
 /**
  * TransformationTrait that implements compile time array-to-pointer
@@ -248,7 +215,8 @@
                     >::type type;
 };
 
-//#define _RWSTD_DECAY(T) _RW::__rw_decay<T>::type
+#define _RWSTD_DECAY(T) _RW::__rw_decay<T>::type
+
 
 } // namespace __rw
 



Mime
View raw message