From c4bf80ee1daf7a17d2f400af4e8317152c599e66 Mon Sep 17 00:00:00 2001
From: Edward Diener <eldiener@tropicsoft.com>
Date: Sun, 22 Jun 2014 21:32:47 -0400
Subject: [PATCH] Cleaner inclusion if is_single_return functionality.

---
 include/boost/preprocessor/seq/detail/binary_transform.hpp  | 2 --
 .../boost/preprocessor/tuple/detail/is_single_return.hpp    | 6 +++---
 include/boost/preprocessor/tuple/elem.hpp                   | 3 ---
 .../boost/preprocessor/variadic/detail/is_single_return.hpp | 6 +++---
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/include/boost/preprocessor/seq/detail/binary_transform.hpp b/include/boost/preprocessor/seq/detail/binary_transform.hpp
index 1c381a7..70897b0 100644
--- a/include/boost/preprocessor/seq/detail/binary_transform.hpp
+++ b/include/boost/preprocessor/seq/detail/binary_transform.hpp
@@ -16,9 +16,7 @@
 # include <boost/preprocessor/config/config.hpp>
 # include <boost/preprocessor/tuple/eat.hpp>
 # include <boost/preprocessor/tuple/rem.hpp>
-# if BOOST_PP_VARIADICS && BOOST_PP_VARIADICS_MSVC
 # include <boost/preprocessor/variadic/detail/is_single_return.hpp>
-# endif
 #
 # /* BOOST_PP_SEQ_BINARY_TRANSFORM */
 #
diff --git a/include/boost/preprocessor/tuple/detail/is_single_return.hpp b/include/boost/preprocessor/tuple/detail/is_single_return.hpp
index 9ffa3cc..02a4fb2 100644
--- a/include/boost/preprocessor/tuple/detail/is_single_return.hpp
+++ b/include/boost/preprocessor/tuple/detail/is_single_return.hpp
@@ -13,13 +13,13 @@
 # define BOOST_PREPROCESSOR_TUPLE_DETAIL_IS_SINGLE_RETURN_HPP
 #
 # include <boost/preprocessor/config/config.hpp>
-# include <boost/preprocessor/control/iif.hpp>
-# include <boost/preprocessor/facilities/is_1.hpp>
-# include <boost/preprocessor/tuple/size.hpp>
 #
 # /* BOOST_PP_TUPLE_IS_SINGLE_RETURN */
 #
 # if BOOST_PP_VARIADICS && BOOST_PP_VARIADICS_MSVC
+# include <boost/preprocessor/control/iif.hpp>
+# include <boost/preprocessor/facilities/is_1.hpp>
+# include <boost/preprocessor/tuple/size.hpp>
 # define BOOST_PP_TUPLE_IS_SINGLE_RETURN(sr,nsr,tuple)	\
 	BOOST_PP_IIF(BOOST_PP_IS_1(BOOST_PP_TUPLE_SIZE(tuple)),sr,nsr) \
 	/**/
diff --git a/include/boost/preprocessor/tuple/elem.hpp b/include/boost/preprocessor/tuple/elem.hpp
index ee8f0bd..99d0d45 100644
--- a/include/boost/preprocessor/tuple/elem.hpp
+++ b/include/boost/preprocessor/tuple/elem.hpp
@@ -20,10 +20,7 @@
 # include <boost/preprocessor/facilities/overload.hpp>
 # include <boost/preprocessor/tuple/rem.hpp>
 # include <boost/preprocessor/variadic/elem.hpp>
-#
-# if BOOST_PP_VARIADICS && BOOST_PP_VARIADICS_MSVC
 # include <boost/preprocessor/tuple/detail/is_single_return.hpp>
-# endif
 #
 # if BOOST_PP_VARIADICS
 #    if BOOST_PP_VARIADICS_MSVC
diff --git a/include/boost/preprocessor/variadic/detail/is_single_return.hpp b/include/boost/preprocessor/variadic/detail/is_single_return.hpp
index 491e06b..5c95029 100644
--- a/include/boost/preprocessor/variadic/detail/is_single_return.hpp
+++ b/include/boost/preprocessor/variadic/detail/is_single_return.hpp
@@ -13,13 +13,13 @@
 # define BOOST_PREPROCESSOR_VARIADIC_DETAIL_IS_SINGLE_RETURN_HPP
 #
 # include <boost/preprocessor/config/config.hpp>
-# include <boost/preprocessor/control/iif.hpp>
-# include <boost/preprocessor/facilities/is_1.hpp>
-# include <boost/preprocessor/variadic/size.hpp>
 #
 # /* BOOST_PP_VARIADIC_IS_SINGLE_RETURN */
 #
 # if BOOST_PP_VARIADICS && BOOST_PP_VARIADICS_MSVC
+# include <boost/preprocessor/control/iif.hpp>
+# include <boost/preprocessor/facilities/is_1.hpp>
+# include <boost/preprocessor/variadic/size.hpp>
 # define BOOST_PP_VARIADIC_IS_SINGLE_RETURN(sr,nsr,...)	\
 	BOOST_PP_IIF(BOOST_PP_IS_1(BOOST_PP_VARIADIC_SIZE(__VA_ARGS__)),sr,nsr) \
 	/**/