summaryrefslogtreecommitdiff
path: root/boost/spirit/home/support/attributes.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'boost/spirit/home/support/attributes.hpp')
-rw-r--r--boost/spirit/home/support/attributes.hpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/boost/spirit/home/support/attributes.hpp b/boost/spirit/home/support/attributes.hpp
index 163f11cfe2..889e3a370b 100644
--- a/boost/spirit/home/support/attributes.hpp
+++ b/boost/spirit/home/support/attributes.hpp
@@ -1060,12 +1060,13 @@ namespace boost { namespace spirit { namespace traits
typedef T type;
};
+#if !defined(BOOST_FUSION_HAS_VARIADIC_VECTOR)
template <typename T>
struct strip_single_element_vector<fusion::vector1<T> >
{
typedef T type;
};
-
+#endif
template <typename T>
struct strip_single_element_vector<fusion::vector<T> >
{
@@ -1153,7 +1154,7 @@ namespace boost { namespace spirit { namespace traits
static void call(boost::optional<T>& val)
{
if (val)
- val = none_t(); // leave optional uninitialized
+ val = none; // leave optional uninitialized
}
};