From 5423cde1f1137d7f546e81f733b7273135d01240 Mon Sep 17 00:00:00 2001
From: Joel de Guzman <djowel@gmail.com>
Date: Mon, 2 Apr 2007 03:52:41 +0000
Subject: [PATCH] updates

[SVN r37329]
---
 .../sequence/adapted/struct/extension.hpp     | 44 +++++++++++++++++++
 .../adapted/struct/struct_iterator.hpp        | 31 +------------
 2 files changed, 45 insertions(+), 30 deletions(-)
 create mode 100644 include/boost/fusion/sequence/adapted/struct/extension.hpp

diff --git a/include/boost/fusion/sequence/adapted/struct/extension.hpp b/include/boost/fusion/sequence/adapted/struct/extension.hpp
new file mode 100644
index 00000000..f0af1baa
--- /dev/null
+++ b/include/boost/fusion/sequence/adapted/struct/extension.hpp
@@ -0,0 +1,44 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+    Copyright (c) 2005-2006 Dan Marsden
+
+    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(FUSION_STRUCT_EXTENSION_APRIL_2_2007_1008AM)
+#define FUSION_STRUCT_EXTENSION_APRIL_2_2007_1008AM
+
+#include <boost/type_traits/add_const.hpp>
+
+namespace boost { namespace fusion { namespace extension
+{
+    template <typename Struct, int N>
+    struct struct_member;
+
+    template <typename Struct>
+    struct struct_size;
+
+    template <typename Struct, int N>
+    struct struct_member<Struct const, N>
+    {
+        typedef typename
+            add_const<typename struct_member<Struct, N>::type>::type
+        type;
+
+        static type&
+        call(Struct const& struct_)
+        {
+            return struct_member<Struct, N>::call(
+                const_cast<Struct&>(struct_));
+        }
+    };
+
+    template <typename Struct>
+    struct struct_size<Struct const>
+        : struct_size<Struct>
+    {};
+}}}
+
+#endif
+
+
diff --git a/include/boost/fusion/sequence/adapted/struct/struct_iterator.hpp b/include/boost/fusion/sequence/adapted/struct/struct_iterator.hpp
index 0684deaf..b00251bb 100644
--- a/include/boost/fusion/sequence/adapted/struct/struct_iterator.hpp
+++ b/include/boost/fusion/sequence/adapted/struct/struct_iterator.hpp
@@ -9,9 +9,9 @@
 #define FUSION_STRUCT_ITERATOR_APRIL_2_2007_1008AM
 
 #include <boost/fusion/iterator/iterator_facade.hpp>
+#include <boost/fusion/sequence/adapted/struct/extension.hpp>
 #include <boost/type_traits/is_const.hpp>
 #include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/add_const.hpp>
 #include <boost/mpl/assert.hpp>
 #include <boost/mpl/identity.hpp>
 #include <boost/mpl/if.hpp>
@@ -21,35 +21,6 @@
 
 namespace boost { namespace fusion
 {
-    namespace extension
-    {
-        template <typename Struct, int N>
-        struct struct_member;
-
-        template <typename Struct>
-        struct struct_size;
-
-        template <typename Struct, int N>
-        struct struct_member<Struct const, N>
-        {
-            typedef typename
-                add_const<typename struct_member<Struct, N>::type>::type
-            type;
-
-            static type&
-            call(Struct const& struct_)
-            {
-                return struct_member<Struct, N>::call(
-                    const_cast<Struct&>(struct_));
-            }
-        };
-
-        template <typename Struct>
-        struct struct_size<Struct const>
-            : struct_size<Struct>
-        {};
-    }
-
     struct random_access_traversal_tag;
 
     template <typename Struct, int N_>