[PPL-devel] [GIT] ppl/ppl(ppl-0_11-branch): Avoid using the same macro name for different purposes.

[Enea Zaffanella]

Module: ppl/ppl
Branch: ppl-0_11-branch
Commit: 2eae52a87027ae94e59b3fb9736a4d29e93a1f10
URL:    http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2eae52a87027ae94e59b3fb9736a4d29e93a1f10

Author: Enea Zaffanella <zaffanella at cs.unipr.it>
Date:   Wed Feb 23 14:10:31 2011 +0100

Avoid using the same macro name for different purposes.
Doing it confuses both the reader and Doxygen.

---

 src/Checked_Number.defs.hh    |   34 +++++++++++++++++-----------------
 src/Checked_Number.inlines.hh |   36 ++++++++++++++++++------------------
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/Checked_Number.defs.hh b/src/Checked_Number.defs.hh
index 767ba41..de6875d 100644
--- a/src/Checked_Number.defs.hh
+++ b/src/Checked_Number.defs.hh
@@ -479,38 +479,38 @@ template <typename To, typename To_Policy>
 typename Enable_If<Is_Native_Or_Checked<To>::value, Result>::type
 assign_r(To& to, char* x, Rounding_Dir dir);
 
-#define FUNC1(name) \
+#define FUNC1_A(name) \
 template <typename To, typename From> \
 typename Enable_If<Is_Native_Or_Checked<To>::value \
                    && Is_Native_Or_Checked<From>::value, \
                    Result>::type \
 name(To& to, const From& x, Rounding_Dir dir);
 
-FUNC1(assign_r)
-FUNC1(floor_assign_r)
-FUNC1(ceil_assign_r)
-FUNC1(trunc_assign_r)
-FUNC1(neg_assign_r)
-FUNC1(abs_assign_r)
-FUNC1(sqrt_assign_r)
+FUNC1_A(assign_r)
+FUNC1_A(floor_assign_r)
+FUNC1_A(ceil_assign_r)
+FUNC1_A(trunc_assign_r)
+FUNC1_A(neg_assign_r)
+FUNC1_A(abs_assign_r)
+FUNC1_A(sqrt_assign_r)
 
-#undef FUNC1
+#undef FUNC1_A
 
-#define FUNC1(name) \
+#define FUNC1_B(name) \
 template <typename To, typename From> \
 typename Enable_If<Is_Native_Or_Checked<To>::value \
                    && Is_Native_Or_Checked<From>::value, \
                    Result>::type \
 name(To& to, const From& x, int exp, Rounding_Dir dir);
 
-FUNC1(add_2exp_assign_r)
-FUNC1(sub_2exp_assign_r)
-FUNC1(mul_2exp_assign_r)
-FUNC1(div_2exp_assign_r)
-FUNC1(smod_2exp_assign_r)
-FUNC1(umod_2exp_assign_r)
+FUNC1_B(add_2exp_assign_r)
+FUNC1_B(sub_2exp_assign_r)
+FUNC1_B(mul_2exp_assign_r)
+FUNC1_B(div_2exp_assign_r)
+FUNC1_B(smod_2exp_assign_r)
+FUNC1_B(umod_2exp_assign_r)
 
-#undef FUNC1
+#undef FUNC1_B
 
 #define FUNC2(name) \
 template <typename To, typename From1, typename From2> \
diff --git a/src/Checked_Number.inlines.hh b/src/Checked_Number.inlines.hh
index f27559b..b9a7b42 100644
--- a/src/Checked_Number.inlines.hh
+++ b/src/Checked_Number.inlines.hh
@@ -344,7 +344,7 @@ assign_r(To& to, const char* x, Rounding_Dir dir) {
 		      dir);
 }
 
-#define FUNC1(name, func) \
+#define FUNC1_A(name, func) \
 template <typename To, typename From>					\
 inline typename Enable_If<Is_Native_Or_Checked<To>::value               \
                           && Is_Native_Or_Checked<From>::value,         \
@@ -359,18 +359,18 @@ name(To& to, const From& x, Rounding_Dir dir) {				\
 			   rounding_dir(dir)), dir);			\
 }
 
-FUNC1(construct, construct_ext)
-FUNC1(assign_r, assign_ext)
-FUNC1(floor_assign_r, floor_ext)
-FUNC1(ceil_assign_r, ceil_ext)
-FUNC1(trunc_assign_r, trunc_ext)
-FUNC1(neg_assign_r, neg_ext)
-FUNC1(abs_assign_r, abs_ext)
-FUNC1(sqrt_assign_r, sqrt_ext)
+FUNC1_A(construct, construct_ext)
+FUNC1_A(assign_r, assign_ext)
+FUNC1_A(floor_assign_r, floor_ext)
+FUNC1_A(ceil_assign_r, ceil_ext)
+FUNC1_A(trunc_assign_r, trunc_ext)
+FUNC1_A(neg_assign_r, neg_ext)
+FUNC1_A(abs_assign_r, abs_ext)
+FUNC1_A(sqrt_assign_r, sqrt_ext)
 
-#undef FUNC1
+#undef FUNC1_A
 
-#define FUNC1(name, func) \
+#define FUNC1_B(name, func) \
 template <typename To, typename From>					\
 inline typename Enable_If<Is_Native_Or_Checked<To>::value		\
                           && Is_Native_Or_Checked<From>::value,         \
@@ -387,14 +387,14 @@ name(To& to, const From& x, int exp, Rounding_Dir dir) {		\
 		 dir);							\
 }
 
-FUNC1(add_2exp_assign_r, add_2exp_ext)
-FUNC1(sub_2exp_assign_r, sub_2exp_ext)
-FUNC1(mul_2exp_assign_r, mul_2exp_ext)
-FUNC1(div_2exp_assign_r, div_2exp_ext)
-FUNC1(smod_2exp_assign_r, smod_2exp_ext)
-FUNC1(umod_2exp_assign_r, umod_2exp_ext)
+FUNC1_B(add_2exp_assign_r, add_2exp_ext)
+FUNC1_B(sub_2exp_assign_r, sub_2exp_ext)
+FUNC1_B(mul_2exp_assign_r, mul_2exp_ext)
+FUNC1_B(div_2exp_assign_r, div_2exp_ext)
+FUNC1_B(smod_2exp_assign_r, smod_2exp_ext)
+FUNC1_B(umod_2exp_assign_r, umod_2exp_ext)
 
-#undef FUNC1
+#undef FUNC1_B
 
 #define FUNC2(name, func) \
 template <typename To, typename From1, typename From2>			\