From 3125c15ff4c0e411f5baff4c538ab5282d1bbb9b Mon Sep 17 00:00:00 2001
From: "Damien Buhl (alias daminetreg)" <damien.buhl@lecbna.org>
Date: Tue, 23 Jun 2015 21:43:09 +0200
Subject: [PATCH] Fix BOOST_PP_EMPTY replacement with adapt_assoc_struct

---
 .../struct/detail/adapt_base_assoc_attr_filler.hpp     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/include/boost/fusion/adapted/struct/detail/adapt_base_assoc_attr_filler.hpp b/include/boost/fusion/adapted/struct/detail/adapt_base_assoc_attr_filler.hpp
index cbd9c011..373ec313 100644
--- a/include/boost/fusion/adapted/struct/detail/adapt_base_assoc_attr_filler.hpp
+++ b/include/boost/fusion/adapted/struct/detail/adapt_base_assoc_attr_filler.hpp
@@ -18,6 +18,7 @@
 #include <boost/preprocessor/control/if.hpp>
 #include <boost/preprocessor/arithmetic/sub.hpp>
 #include <boost/preprocessor/variadic/size.hpp>
+#include <boost/preprocessor/variadic/elem.hpp>
 
 #if BOOST_PP_VARIADICS
 
@@ -30,7 +31,14 @@
     BOOST_FUSION_ADAPT_ASSOC_STRUCT_FILLER_0
 
 #define BOOST_FUSION_ADAPT_ASSOC_STRUCT_WRAP_ATTR(...)                          \
-      ((BOOST_PP_VARIADIC_SIZE(__VA_ARGS__), (__VA_ARGS__)))
+  BOOST_PP_IF(                                                                  \
+      BOOST_MPL_PP_TOKEN_EQUAL(auto, BOOST_PP_VARIADIC_ELEM(0, __VA_ARGS__)),   \
+      ((2,                                                                      \
+          (BOOST_PP_VARIADIC_ELEM(1, __VA_ARGS__),                              \
+           BOOST_PP_VARIADIC_ELEM(2, __VA_ARGS__)))),                           \
+      ((BOOST_PP_VARIADIC_SIZE(__VA_ARGS__),                                    \
+          (__VA_ARGS__)))                                                       \
+    )
 
 #else // BOOST_PP_VARIADICS