[Boost-commit] svn:boost r64480 - in sandbox/SOC/2010/bit_masks/boost/integer: . bitfield_tuple/ext bitfield_tuple/ext/fusion

Subject: [Boost-commit] svn:boost r64480 - in sandbox/SOC/2010/bit_masks/boost/integer: . bitfield_tuple/ext bitfield_tuple/ext/fusion
From: bbartmanboost_at_[hidden]
Date: 2010-07-30 14:32:22

Author: bbartman
Date: 2010-07-30 14:32:22 EDT (Fri, 30 Jul 2010)
New Revision: 64480
URL: http://svn.boost.org/trac/boost/changeset/64480

Log:
working on resolving conflict
Added:
   sandbox/SOC/2010/bit_masks/boost/integer/bitfield_tuple/ext/
      - copied from r64385, /sandbox/SOC/2010/bit_masks/boost/integer/detail/bft/ext/
   sandbox/SOC/2010/bit_masks/boost/integer/bitfield_tuple/ext/bitfield_iterator.hpp
      - copied unchanged from r64390, /sandbox/SOC/2010/bit_masks/boost/integer/detail/bft/ext/bitfield_iterator.hpp
   sandbox/SOC/2010/bit_masks/boost/integer/bitfield_tuple/ext/fusion/at_impl.hpp
      - copied unchanged from r64390, /sandbox/SOC/2010/bit_masks/boost/integer/detail/bft/ext/fusion/at_impl.hpp
   sandbox/SOC/2010/bit_masks/boost/integer/bitfield_tuple/ext/fusion/begin_impl.hpp
      - copied unchanged from r64390, /sandbox/SOC/2010/bit_masks/boost/integer/detail/bft/ext/fusion/begin_impl.hpp
   sandbox/SOC/2010/bit_masks/boost/integer/bitfield_tuple/ext/fusion/end_impl.hpp
      - copied unchanged from r64390, /sandbox/SOC/2010/bit_masks/boost/integer/detail/bft/ext/fusion/end_impl.hpp
   sandbox/SOC/2010/bit_masks/boost/integer/bitfield_tuple/ext/tag_of.hpp
      - copied unchanged from r64390, /sandbox/SOC/2010/bit_masks/boost/integer/detail/bft/ext/tag_of.hpp
Text files modified: 
   sandbox/SOC/2010/bit_masks/boost/integer/bitfield_tuple.hpp |     2 +-                                      
   1 files changed, 1 insertions(+), 1 deletions(-)

Modified: sandbox/SOC/2010/bit_masks/boost/integer/bitfield_tuple.hpp
==============================================================================
--- sandbox/SOC/2010/bit_masks/boost/integer/bitfield_tuple.hpp	(original)
+++ sandbox/SOC/2010/bit_masks/boost/integer/bitfield_tuple.hpp	2010-07-30 14:32:22 EDT (Fri, 30 Jul 2010)
@@ -26,7 +26,7 @@
 #include <boost/type_traits/add_reference.hpp>
 #include <boost/integer/detail/bft/reference_builder.hpp>
 #include <boost/integer/bitfield_tuple/interface_metafunctions.hpp>
-#include <boost/integer/detail/bft/ext/bitfield_tuple_fusion_includes.hpp>
+#include <boost/integer/bitfield_tuple/ext/bitfield_tuple_fusion_includes.hpp>
 #include <boost/integer/detail/fusion_ext_includes.hpp>
 #include <boost/integer/detail/bft/make_bitfield_tuple.hpp>
 #include <boost/integer/detail/bft/proxy_reference_policy.hpp>