From 6a7259a48df70c4485219f2d77d71fa09809a579 Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Mon, 17 Jun 2002 11:03:00 +0000 Subject: [PATCH] Committed fixes from Paul Mensonides [SVN r14161] --- include/boost/preprocessor/detail/cat.hpp | 29 +++++++++++++---------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/include/boost/preprocessor/detail/cat.hpp b/include/boost/preprocessor/detail/cat.hpp index 8ccad4e..78a3b65 100644 --- a/include/boost/preprocessor/detail/cat.hpp +++ b/include/boost/preprocessor/detail/cat.hpp @@ -2,24 +2,29 @@ #define BOOST_PREPROCESSOR_DETAIL_CAT_HPP /* Copyright (C) 2002 Vesa Karvonen - * - * Permission to copy, use, modify, sell and distribute this software is - * granted provided this copyright notice appears in all copies. This - * software is provided "as is" without express or implied warranty, and - * with no claim as to its suitability for any purpose. - * - * See http://www.boost.org for most recent version. - */ +* +* Permission to copy, use, modify, sell and distribute this software is +* granted provided this copyright notice appears in all copies. This +* software is provided "as is" without express or implied warranty, and +* with no claim as to its suitability for any purpose. +* +* See http://www.boost.org for most recent version. +*/ -#define BOOST_PP_DETAIL_CAT2(A,B) BOOST_PP_DETAIL_DO_CAT2(A,B) +#define BOOST_PP_DETAIL_CAT2(A,B) BOOST_PP_DETAIL_CAT2_DELAY(A,B) +#define BOOST_PP_DETAIL_CAT2_DELAY(A, B) BOOST_PP_DETAIL_DO_CAT2(A, B) #define BOOST_PP_DETAIL_DO_CAT2(A,B) A##B -#define BOOST_PP_DETAIL_CAT3(A,B,C) BOOST_PP_DETAIL_DO_CAT3(A,B,C) +#define BOOST_PP_DETAIL_CAT3(A,B,C) BOOST_PP_DETAIL_CAT3_DELAY(A,B,C) +#define BOOST_PP_DETAIL_CAT3_DELAY(A,B,C) BOOST_PP_DETAIL_DO_CAT3(A,B,C) #define BOOST_PP_DETAIL_DO_CAT3(A,B,C) A##B##C -#define BOOST_PP_DETAIL_CAT4(A,B,C,D) BOOST_PP_DETAIL_DO_CAT4(A,B,C,D) +#define BOOST_PP_DETAIL_CAT4(A,B,C,D) BOOST_PP_DETAIL_CAT4_DELAY(A,B,C,D) +#define BOOST_PP_DETAIL_CAT4_DELAY(A,B,C,D) BOOST_PP_DETAIL_DO_CAT4(A,B,C,D) #define BOOST_PP_DETAIL_DO_CAT4(A,B,C,D) A##B##C##D -#define BOOST_PP_DETAIL_CAT5(A,B,C,D,E) BOOST_PP_DETAIL_DO_CAT5(A,B,C,D,E) +#define BOOST_PP_DETAIL_CAT5(A,B,C,D,E) BOOST_PP_DETAIL_CAT5_DELAY(A,B,C,D,E) +#define BOOST_PP_DETAIL_CAT5_DELAY(A,B,C,D,E) BOOST_PP_DETAIL_DO_CAT5(A,B,C,D,E) #define BOOST_PP_DETAIL_DO_CAT5(A,B,C,D,E) A##B##C##D##E + #endif