Roland Levillain <roland(a)lrde.epita.fr> writes:
https://svn.lrde.epita.fr/svn/oln/trunk/metalic
Index: ChangeLog
from Roland Levillain <roland(a)lrde.epita.fr>
Add spaces in macros to please icpc.
* mlc/is_a.hh, mlc/case.hh: Add spaces in macros to please icpc.
0 files changed
Index: mlc/is_a.hh
Index: mlc/case.hh
Sorry for this ``blank'' patch, but Vcs removes any white space in altered
lines in diffs.
BTW, is there an option to disable this behavior in Vcs? If not, I
suggest adding an option like `--show-space-change' (i.e., the
opposite from diff's --ignore-space-change).
Here is a more readable diff:
Index: mlc/is_a.hh
===================================================================
--- mlc/is_a.hh (révision 693)
+++ mlc/is_a.hh (révision 694)
@@ -240,11 +240,11 @@
# define mlc_is_a(T, U) \
mlc::wrap_< \
- typename mlc::is_a_< sizeof(mlc::form::of< U >()) >::template ret<
typename mlc::basic_<T>::ret, U > \
+ typename mlc::is_a_< sizeof(mlc::form::of< U >()) >::template ret<
typename mlc::basic_< T >::ret, U > \
# define mlc_is_a_(T, U) \
-mlc::is_a_< sizeof(mlc::form::of< U >()) >::ret<
mlc::basic_<T>::ret, U
+mlc::is_a_<
sizeof(mlc::form::of< U >()) >::ret< mlc::basic_< T >::ret, U
/*! \def mlc_is_not_a(T, U)
@@ -257,11 +257,11 @@
# define mlc_is_not_a(T, U) \
mlc::not_< \
- typename mlc::is_a_<sizeof(mlc::form::of<U >())>::template ret< typename
mlc::basic_<T>::ret, U > \
+ typename mlc::is_a_<sizeof(mlc::form::of< U >())>::template ret<
typename mlc::basic_< T >::ret, U > \
# define mlc_is_not_a_(T, U) \
-mlc::not_< mlc::is_a_< sizeof(mlc::form::of<U >())>::ret<
mlc::basic_<T>::ret, U >
+mlc::not_<
mlc::is_a_< sizeof(mlc::form::of< U >())>::ret< mlc::basic_< T
>::ret, U >
#endif // ! MLC_IS_A_HH
Index: mlc/case.hh
===================================================================
--- mlc/case.hh (révision 693)
+++ mlc/case.hh (révision 694)
@@ -215,8 +215,8 @@
struct handle_default_case_ < mlc::internal::a_get_case, context, data
> \
\
: private mlc::assert_< mlc::implies_< mlc::is_defined_<
NAMESPACE::default_case_<context, data> >, \
- mlc_is_not_a(mlc_comma_1(NAMESPACE::default_case_<context,
data>), \
- mlc::where_) >, \
+ mlc_is_not_a( mlc_comma_1( NAMESPACE::default_case_<context, data>
), \
+ mlc::where_ ) >, \
mlc::ERROR::A_default_case_STATEMENT_SHOULD_NOT_DERIVE_FROM_mlc_where_
> \
{ \
typedef NAMESPACE::default_case_<context, data> case_t; \
@@ -232,8 +232,8 @@
struct handle_default_case_ < mlc::internal::a_simple_case, context, data
> \
\
: private mlc::assert_< mlc::implies_< mlc::is_defined_<
NAMESPACE::default_case_<context, data> >, \
- mlc_is_not_a(mlc_comma_1(NAMESPACE::default_case_<context,
data>), \
- mlc::where_) >, \
+ mlc_is_not_a( mlc_comma_1( NAMESPACE::default_case_<context, data>
), \
+ mlc::where_ ) >, \
mlc::ERROR::A_default_case_STATEMENT_SHOULD_NOT_DERIVE_FROM_mlc_where_
> \
{ \
typedef NAMESPACE::default_case_<context, data> case_t; \
@@ -249,8 +249,8 @@
struct handle_default_case_ < mlc::internal::a_switch_case, context, data
> \
\
: private mlc::assert_< mlc::implies_< mlc::is_defined_<
NAMESPACE::default_case_<context, data> >, \
- mlc_is_not_a(mlc_comma_1(NAMESPACE::default_case_<context,
data>), \
- mlc::where_) >, \
+ mlc_is_not_a( mlc_comma_1( NAMESPACE::default_case_<context, data>
), \
+ mlc::where_ ) >, \
mlc::ERROR::A_default_case_STATEMENT_SHOULD_NOT_DERIVE_FROM_mlc_where_
>, \
\
private mlc::assert_< mlc::implies_< mlc::is_defined_<
NAMESPACE::default_case_<context, data> >, \
@@ -287,8 +287,8 @@
struct handle_case_ <use, context, data, i, 0, 0> \
\
: private mlc::assert_< mlc::implies_< mlc::is_defined_<
NAMESPACE::case_<context, data, i> >, \
- mlc_is_a(mlc_comma_2(NAMESPACE::case_<context, data, i>), \
- mlc::where_) >, \
+ mlc_is_a( mlc_comma_2( NAMESPACE::case_<context, data, i> ), \
+ mlc::where_ ) >, \
mlc::ERROR::A_case_STATEMENT_SHOULD_DERIVE_FROM_mlc_where_ >, \
\
private mlc::assert_< mlc::implies_< mlc::neq_< use, mlc::internal::a_get_case
>, \
@@ -308,10 +308,10 @@
typename context, typename data, unsigned i> \
struct handle_case_ <use, context, data, i, 1, 0> \
\
- : private mlc::assert_< mlc::or_<
mlc_is_a(mlc_comma_2(NAMESPACE::case_<context, data, i>), \
- mlc::where_), \
- mlc_is_a(mlc_comma_2(NAMESPACE::case_<context, data, i>), \
- mlc::undefined) >, \
+ : private mlc::assert_< mlc::or_< mlc_is_a( mlc_comma_2(
NAMESPACE::case_<context, data, i> ), \
+ mlc::where_ ), \
+ mlc_is_a( mlc_comma_2( NAMESPACE::case_<context, data, i> ), \
+ mlc::undefined ) >, \
mlc::ERROR::A_case_STATEMENT_SHOULD_DERIVE_FROM_mlc_where_ >, \
\
private mlc::assert_< mlc::implies_< mlc::and_< mlc::eq_<use,
mlc::internal::a_switch_case>, \
@@ -348,16 +348,16 @@
typename context, typename data, unsigned i> \
struct handle_case_ <use, context, data, i, 0, 1> \
\
- : private mlc::assert_< mlc::or_<
mlc_is_a(mlc_comma_2(NAMESPACE::case_<context, data, i>), \
- mlc::where_), \
- mlc_is_a(mlc_comma_2(NAMESPACE::case_<context, data, i>), \
- mlc::undefined) >, \
+ : private mlc::assert_< mlc::or_< mlc_is_a( mlc_comma_2(
NAMESPACE::case_<context, data, i> ), \
+ mlc::where_ ), \
+ mlc_is_a( mlc_comma_2( NAMESPACE::case_<context, data, i> ), \
+ mlc::undefined ) >, \
mlc::ERROR::A_case_STATEMENT_SHOULD_DERIVE_FROM_mlc_where_ > \
{ \
- typedef mlc_is_a(mlc_comma_2(NAMESPACE::case_<context, data,
i+1>), \
- mlc::case_selected) next_case_is_selected; \
- typedef mlc_is_a(mlc_comma_2(NAMESPACE::case_<context, data,
i+1>), \
- mlc::case_not_selected) next_case_is_not_selected; \
+ typedef mlc_is_a( mlc_comma_2( NAMESPACE::case_<context, data, i+1> )
, \
+ mlc::case_selected ) next_case_is_selected; \
+ typedef mlc_is_a( mlc_comma_2( NAMESPACE::case_<context, data, i+1> )
, \
+ mlc::case_not_selected ) next_case_is_not_selected; \
\
typedef handle_case_ < use, \
context, data, i+1, \
@@ -371,14 +371,14 @@
template <typename use, typename context, typename data> \
struct select_case_ \
\
- : private mlc::assert_< mlc::eq_<
mlc_ret(mlc_comma_2(NAMESPACE::case_<context, data, 0>)), \
+ : private mlc::assert_< mlc::eq_< mlc_ret( mlc_comma_2(
NAMESPACE::case_<context, data, 0> ) ), \
mlc::locked >, \
mlc::ERROR::A_case_STATEMENT_SHOULD_NOT_START_AT_INDEX_0_BUT_1 > \
{ \
- typedef mlc_is_a(mlc_comma_2(NAMESPACE::case_<context, data,
1>), \
- mlc::case_selected) first_case_is_selected; \
- typedef mlc_is_a(mlc_comma_2(NAMESPACE::case_<context, data,
1>), \
- mlc::case_not_selected) first_case_is_not_selected; \
+ typedef mlc_is_a( mlc_comma_2( NAMESPACE::case_<context, data, 1>
), \
+ mlc::case_selected ) first_case_is_selected; \
+ typedef mlc_is_a( mlc_comma_2( NAMESPACE::case_<context, data, 1>
), \
+ mlc::case_not_selected ) first_case_is_not_selected; \
typedef handle_case_ < use, \
context, data, 1, \
mlc_bool(first_case_is_selected),
mlc_bool(first_case_is_not_selected) \