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 a workaround for a class that needs to initialize a base class with a member. The class template is in boost/utility/base_from_member.hpp -which is included in boost/utility.hpp. -The class template is forward declared in boost/utility_fwd.hpp.

+which is included in boost/utility.hpp.

There is test/example code in base_from_member_test.cpp.

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 // required for parameter defaults #include #include #include @@ -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 .) - -// See for the library's home page. - -#ifndef BOOST_UTILITY_FWD_HPP -#define BOOST_UTILITY_FWD_HPP - -namespace boost -{ - -// From -------------------------------// - -template < typename MemberType, int UniqueID = 0 > - class base_from_member; - -} // namespace boost - - -#endif // BOOST_UTILITY_FWD_HPP