stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r672039 - in /stdcxx/branches/4.3.x: include/rw/_meta_other.h tests/utilities/20.meta.rel.cpp
Date Thu, 26 Jun 2008 22:06:06 GMT
Author: vitek
Date: Thu Jun 26 15:06:06 2008
New Revision: 672039

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

	* include/rw/_meta_other.h: Enclose type name in sizeof expression in
	parentheses as required.
	* tests/utilities/20.meta.rel.cpp [_RWSTD_NO_EXT_CXX_0X]: Move include
	inside guard to avoid #error.


Modified:
    stdcxx/branches/4.3.x/include/rw/_meta_other.h
    stdcxx/branches/4.3.x/tests/utilities/20.meta.rel.cpp

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=672039&r1=672038&r2=672039&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 26 15:06:06 2008
@@ -230,31 +230,31 @@
 struct __rw_biggest
 {
     typedef typename
-    __rw_conditional<(sizeof _Type1 < sizeof _Type2),
+    __rw_conditional<(sizeof (_Type1) < sizeof (_Type2)),
                      _Type2, _Type1>::type _Type12;
 
     typedef typename
-    __rw_conditional<(sizeof _Type3 < sizeof _Type4),
+    __rw_conditional<(sizeof (_Type3) < sizeof (_Type4)),
                      _Type4, _Type3>::type _Type34;
 
     typedef typename
-    __rw_conditional<(sizeof _Type5 < sizeof _Type6),
+    __rw_conditional<(sizeof (_Type5) < sizeof (_Type6)),
                      _Type6, _Type5>::type _Type56;
 
     typedef typename
-    __rw_conditional<(sizeof _Type7 < sizeof _Type8),
+    __rw_conditional<(sizeof (_Type7) < sizeof (_Type8)),
                      _Type8, _Type7>::type _Type78;
 
     typedef typename
-    __rw_conditional<(sizeof _Type12 < sizeof _Type34),
+    __rw_conditional<(sizeof (_Type12) < sizeof (_Type34)),
                      _Type34, _Type12>::type _Type1234;
 
     typedef typename
-    __rw_conditional<(sizeof _Type56 < sizeof _Type78),
+    __rw_conditional<(sizeof (_Type56) < sizeof (_Type78)),
                      _Type78, _Type56>::type _Type5678;
 
     typedef typename
-    __rw_conditional<(sizeof _Type1234 < sizeof _Type5678),
+    __rw_conditional<(sizeof (_Type1234) < sizeof (_Type5678)),
                      _Type5678, _Type1234>::type type;
 };
 

Modified: stdcxx/branches/4.3.x/tests/utilities/20.meta.rel.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/utilities/20.meta.rel.cpp?rev=672039&r1=672038&r2=672039&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/utilities/20.meta.rel.cpp (original)
+++ stdcxx/branches/4.3.x/tests/utilities/20.meta.rel.cpp Thu Jun 26 15:06:06 2008
@@ -27,13 +27,14 @@
  *
  **************************************************************************/
 
-#include <type_traits>
-
 #include <rw_driver.h>
 
 // compile out all test code if extensions disabled
 #ifndef _RWSTD_NO_EXT_CXX_0X
 
+#include <type_traits>
+
+
 /**************************************************************************/
 
 enum enum_A { E_a = 0 };



Mime
View raw message