Author: elemings
Date: Fri Jun 13 13:20:48 2008
New Revision: 667637
URL: http://svn.apache.org/viewvc?rev=667637&view=rev
Log:
2008-06-13 Eric Lemings <[EMAIL PROTECTED]>
STDCXX-916
* include/rw/_meta_cat.h, include/rw/_meta_ref.h,
include/rw/_meta_rel.h: Include missing headers.
* include/rw/_static_assert.h [_RWSTD_STATIC_ASSERT]: Reverse
definitions. Add Mesg parameter to internal definition so both
definitions have same number of parameters.
* etc/config/src/STATIC_ASSERT.cpp (main): Change main() to a
regular function so config scripts don't find main() and
(unnecessarily) link (and run?) program.
Modified:
stdcxx/branches/4.3.x/etc/config/src/STATIC_ASSERT.cpp
stdcxx/branches/4.3.x/include/rw/_meta_cat.h
stdcxx/branches/4.3.x/include/rw/_meta_ref.h
stdcxx/branches/4.3.x/include/rw/_meta_rel.h
stdcxx/branches/4.3.x/include/rw/_static_assert.h
Modified: stdcxx/branches/4.3.x/etc/config/src/STATIC_ASSERT.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/etc/config/src/STATIC_ASSERT.cpp?rev=667637&r1=667636&r2=667637&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/etc/config/src/STATIC_ASSERT.cpp (original)
+++ stdcxx/branches/4.3.x/etc/config/src/STATIC_ASSERT.cpp Fri Jun 13 13:20:48
2008
@@ -36,11 +36,9 @@
static_assert (1, "pass");
-int main ()
+void g ()
{
S<1> s1;
f<1>();
static_assert (1, "pass");
-
- return 0;
}
Modified: stdcxx/branches/4.3.x/include/rw/_meta_cat.h
URL:
http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_meta_cat.h?rev=667637&r1=667636&r2=667637&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_meta_cat.h (original)
+++ stdcxx/branches/4.3.x/include/rw/_meta_cat.h Fri Jun 13 13:20:48 2008
@@ -31,6 +31,7 @@
#define _RWSTD_META_UNARY_CAT_H_INCLUDED
#include <rw/_defs.h>
+#include <rw/_meta_help.h>
_RWSTD_NAMESPACE (__rw) {
Modified: stdcxx/branches/4.3.x/include/rw/_meta_ref.h
URL:
http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_meta_ref.h?rev=667637&r1=667636&r2=667637&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_meta_ref.h (original)
+++ stdcxx/branches/4.3.x/include/rw/_meta_ref.h Fri Jun 13 13:20:48 2008
@@ -32,6 +32,7 @@
#include <rw/_defs.h>
#include <rw/_meta_cat.h>
+#include <rw/_meta_comp.h>
_RWSTD_NAMESPACE (__rw) {
Modified: stdcxx/branches/4.3.x/include/rw/_meta_rel.h
URL:
http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_meta_rel.h?rev=667637&r1=667636&r2=667637&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_meta_rel.h (original)
+++ stdcxx/branches/4.3.x/include/rw/_meta_rel.h Fri Jun 13 13:20:48 2008
@@ -32,6 +32,7 @@
#include <rw/_defs.h>
+#include <rw/_meta_arr.h>
#include <rw/_meta_ptr.h>
#include <rw/_meta_ref.h>
#include <rw/_meta_cat.h>
Modified: stdcxx/branches/4.3.x/include/rw/_static_assert.h
URL:
http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_static_assert.h?rev=667637&r1=667636&r2=667637&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_static_assert.h (original)
+++ stdcxx/branches/4.3.x/include/rw/_static_assert.h Fri Jun 13 13:20:48 2008
@@ -53,14 +53,12 @@
} // namespace __rw
#ifndef _RWSTD_NO_STATIC_ASSERT
-
-# define _RWSTD_STATIC_ASSERT(Cond) \
+# define _RWSTD_STATIC_ASSERT(Cond,Mesg) static_assert(Cond, Mesg)
+#else
+# define _RWSTD_STATIC_ASSERT(Cond,Mesg) \
typedef \
_RW::__rw_static_assert<sizeof (__rw_assert_failed<(Cond)>) != 0> \
_RWSTD_PASTE(__static_assert,__LINE__)
-
-#else
-# define _RWSTD_STATIC_ASSERT(Cond,Mesg) static_assert(Cond, Mesg)
#endif // _RWSTD_NO_STATIC_ASSERT
#endif // _RWSTD_RW_STATIC_ASSERT_H_INCLUDED
