merge from trunk

[SVN r42225]
This commit is contained in:
Joel de Guzman
2007-12-21 02:45:20 +00:00
parent d57e8cfe9e
commit 7bd2fd716d
19 changed files with 45 additions and 438 deletions

View File

@ -2,7 +2,7 @@
Copyright (c) 2001-2006 Joel de Guzman
Copyright (c) 2005-2006 Dan Marsden
Distributed under the Boost Software License, Version 1.0. (See accompanying
Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#if !defined(BOOST_FUSION_ADAPTED_30122005_1420)
@ -12,6 +12,6 @@
#include <boost/fusion/adapted/std_pair.hpp>
#include <boost/fusion/adapted/array.hpp>
#include <boost/fusion/adapted/mpl.hpp>
#include <boost/fusion/adapted/variant.hpp>
#include <boost/fusion/adapted/struct.hpp>
#endif