From 1bfd0f8c40d2cf01750b7f6bf539f4a58d10f746 Mon Sep 17 00:00:00 2001
From: Vesa Karvonen <vesa.karvonen@housemarque.fi>
Date: Wed, 23 Jan 2002 17:20:54 +0000
Subject: [PATCH] Minor optimizations

[SVN r12462]
---
 include/boost/preprocessor/enum.hpp                       | 2 +-
 include/boost/preprocessor/enum_params_with_a_default.hpp | 2 +-
 include/boost/preprocessor/enum_params_with_defaults.hpp  | 2 +-
 include/boost/preprocessor/enum_shifted.hpp               | 2 +-
 include/boost/preprocessor/if.hpp                         | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/boost/preprocessor/enum.hpp b/include/boost/preprocessor/enum.hpp
index 34ea3d6..2799159 100644
--- a/include/boost/preprocessor/enum.hpp
+++ b/include/boost/preprocessor/enum.hpp
@@ -34,6 +34,6 @@ NOTE: The implementation uses BOOST_PP_REPEAT().
 #define BOOST_PP_ENUM(N,F,P) BOOST_PP_REPEAT(N,BOOST_PP_ENUM_F,(F,P))
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-#define BOOST_PP_ENUM_F(I,FP) BOOST_PP_COMMA_IF(I) BOOST_PP_TUPLE_ELEM(2,0,FP)(I,BOOST_PP_TUPLE_ELEM(2,1,FP))
+#define BOOST_PP_ENUM_F(I,FP) BOOST_PP_COMMA_IF(I) BOOST_PP_TUPLE2_ELEM0 FP(I,BOOST_PP_TUPLE2_ELEM1 FP)
 #endif
 #endif
diff --git a/include/boost/preprocessor/enum_params_with_a_default.hpp b/include/boost/preprocessor/enum_params_with_a_default.hpp
index 17c9156..b9cacbb 100644
--- a/include/boost/preprocessor/enum_params_with_a_default.hpp
+++ b/include/boost/preprocessor/enum_params_with_a_default.hpp
@@ -33,7 +33,7 @@ NOTE: The implementation uses BOOST_PP_REPEAT().
 #define BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT(N,P,D) BOOST_PP_ENUM(N,BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT_F,(P,D))
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-#define BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT_F(I,PD) BOOST_PP_CAT(BOOST_PP_TUPLE_ELEM(2,0,PD),I)=BOOST_PP_TUPLE_ELEM(2,1,PD)
+#define BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT_F(I,PD) BOOST_PP_CAT(BOOST_PP_TUPLE2_ELEM0 PD,I)=BOOST_PP_TUPLE2_ELEM1 PD
 #endif
 
 //! Obsolete. Use BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT().
diff --git a/include/boost/preprocessor/enum_params_with_defaults.hpp b/include/boost/preprocessor/enum_params_with_defaults.hpp
index 1f4a356..e843fb3 100644
--- a/include/boost/preprocessor/enum_params_with_defaults.hpp
+++ b/include/boost/preprocessor/enum_params_with_defaults.hpp
@@ -33,7 +33,7 @@ NOTE: The implementation uses BOOST_PP_REPEAT().
 #define BOOST_PP_ENUM_PARAMS_WITH_DEFAULTS(N,P,D) BOOST_PP_ENUM(N,BOOST_PP_ENUM_PARAMS_WITH_DEFAULTS_F,(P,D))
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-#define BOOST_PP_ENUM_PARAMS_WITH_DEFAULTS_F(I,PD) BOOST_PP_CAT(BOOST_PP_TUPLE_ELEM(2,0,PD),I)=BOOST_PP_CAT(BOOST_PP_TUPLE_ELEM(2,1,PD),I)
+#define BOOST_PP_ENUM_PARAMS_WITH_DEFAULTS_F(I,PD) BOOST_PP_CAT(BOOST_PP_TUPLE2_ELEM0 PD,I)=BOOST_PP_CAT(BOOST_PP_TUPLE2_ELEM1 PD,I)
 #endif
 
 //! Obsolete. Use BOOST_PP_ENUM_PARAMS_WITH_DEFAULTS().
diff --git a/include/boost/preprocessor/enum_shifted.hpp b/include/boost/preprocessor/enum_shifted.hpp
index eb2c4bf..38a4d24 100644
--- a/include/boost/preprocessor/enum_shifted.hpp
+++ b/include/boost/preprocessor/enum_shifted.hpp
@@ -34,6 +34,6 @@ NOTE: The implementation uses BOOST_PP_REPEAT().
 #define BOOST_PP_ENUM_SHIFTED(N,F,P) BOOST_PP_ENUM(BOOST_PP_DEC(N),BOOST_PP_ENUM_SHIFTED_F,(F,P))
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-#define BOOST_PP_ENUM_SHIFTED_F(I,FP) BOOST_PP_TUPLE_ELEM(2,0,FP)(BOOST_PP_INC(I),BOOST_PP_TUPLE_ELEM(2,1,FP))
+#define BOOST_PP_ENUM_SHIFTED_F(I,FP) BOOST_PP_TUPLE2_ELEM0 FP(BOOST_PP_INC(I),BOOST_PP_TUPLE2_ELEM1 FP)
 #endif
 #endif
diff --git a/include/boost/preprocessor/if.hpp b/include/boost/preprocessor/if.hpp
index b765a35..737594b 100644
--- a/include/boost/preprocessor/if.hpp
+++ b/include/boost/preprocessor/if.hpp
@@ -25,11 +25,11 @@
 BOOST_PP_IF() enables convenient generation of lists using
 BOOST_PP_REPEAT().
 */
-#define BOOST_PP_IF(C,T,E) BOOST_PP_IF_BOOL(BOOST_PP_BOOL(C),T,E)
+#define BOOST_PP_IF(C,T,E) BOOST_PP_IF_BOOL(BOOST_PP_BOOL(C))(E,T)
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-#define BOOST_PP_IF_BOOL(C,T,E) BOOST_PP_IF_BOOL_DELAY(C,T,E)
-#define BOOST_PP_IF_BOOL_DELAY(C,T,E) BOOST_PP_TUPLE2_ELEM##C(E,T)
+#define BOOST_PP_IF_BOOL(C) BOOST_PP_IF_BOOL_DELAY(C)
+#define BOOST_PP_IF_BOOL_DELAY(C) BOOST_PP_TUPLE2_ELEM##C
 #endif
 
 //! Obsolete. Use BOOST_PP_IF().