From 82016249598067292f4694aa5b896f9bbdaae85a Mon Sep 17 00:00:00 2001
From: Daryle Walker <dwalker07@yahoo.com>
Date: Sat, 28 Aug 2004 20:46:17 +0000
Subject: [PATCH] Moved a template argument default for base_from_member to
 primary header; removed forwarding header as it's not needed anymore

[SVN r24800]
---
 base_from_member.html                      |  3 +--
 include/boost/utility/base_from_member.hpp |  3 +--
 include/boost/utility_fwd.hpp              | 24 ----------------------
 3 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 include/boost/utility_fwd.hpp

diff --git a/base_from_member.html b/base_from_member.html
index 90048b0..59a1834 100644
--- a/base_from_member.html
+++ b/base_from_member.html
@@ -12,8 +12,7 @@ width="277" height="86">Base-from-Member Idiom</h1>
 a workaround for a class that needs to initialize a base class with a
 member.  The class template is in <cite><a
 href="../../boost/utility/base_from_member.hpp">boost/utility/base_from_member.hpp</a></cite>
-which is included in <i><a href="../../boost/utility.hpp">boost/utility.hpp</a></i>.
-The class template is forward declared in <i><a href="../../boost/utility_fwd.hpp">boost/utility_fwd.hpp</a></i>.</p>
+which is included in <i><a href="../../boost/utility.hpp">boost/utility.hpp</a></i>.</p>
 
 <p>There is test/example code in <cite><a
 href="base_from_member_test.cpp">base_from_member_test.cpp</a></cite>.</p>
diff --git a/include/boost/utility/base_from_member.hpp b/include/boost/utility/base_from_member.hpp
index 4a95521..607f0bf 100644
--- a/include/boost/utility/base_from_member.hpp
+++ b/include/boost/utility/base_from_member.hpp
@@ -9,7 +9,6 @@
 #ifndef BOOST_UTILITY_BASE_FROM_MEMBER_HPP
 #define BOOST_UTILITY_BASE_FROM_MEMBER_HPP
 
-#include <boost/utility_fwd.hpp>  // required for parameter defaults
 #include <boost/preprocessor/arithmetic/inc.hpp>
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>
 #include <boost/preprocessor/repetition/enum_params.hpp>
@@ -62,7 +61,7 @@ namespace boost
 
 // Contributed by Daryle Walker
 
-template < typename MemberType, int UniqueID >
+template < typename MemberType, int UniqueID = 0 >
 class base_from_member
 {
 protected:
diff --git a/include/boost/utility_fwd.hpp b/include/boost/utility_fwd.hpp
deleted file mode 100644
index ff301d4..0000000
--- a/include/boost/utility_fwd.hpp
+++ /dev/null
@@ -1,24 +0,0 @@
-//  Boost utility_fwd.hpp header file  ---------------------------------------//
-
-//  Copyright 2001, 2003 Beman Dawes and Daryle Walker.
-//  Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0.  (See accompanying file
-//  LICENSE_1_0.txt or a copy at <http://www.boost.org/LICENSE_1_0.txt>.)
-
-//  See <http://www.boost.org/libs/utility/> for the library's home page.
-
-#ifndef BOOST_UTILITY_FWD_HPP
-#define BOOST_UTILITY_FWD_HPP
-
-namespace boost
-{
-
-//  From <boost/utility/base_from_member.hpp>  -------------------------------//
-
-template < typename MemberType, int UniqueID = 0 >
-    class base_from_member;
-
-}  // namespace boost
-
-
-#endif  // BOOST_UTILITY_FWD_HPP