make sequence typedefs public

[SVN r18538]
This commit is contained in:
Aleksey Gurtovoy
2003-05-26 06:45:39 +00:00
parent 312a42e658
commit bf4b55d66a

View File

@@ -1,9 +1,11 @@
//-----------------------------------------------------------------------------
// boost mpl/joint_view.hpp header file #ifndef BOOST_MPL_JOINT_VIEW_HPP_INCLUDED
// See http://www.boost.org for updates, documentation, and revision history. #define BOOST_MPL_JOINT_VIEW_HPP_INCLUDED
//-----------------------------------------------------------------------------
// // + file: boost/mpl/joint_view.hpp
// Copyright (c) 2000-02 // + last modified: 25/may/03
// Copyright (c) 2000-03
// Aleksey Gurtovoy // Aleksey Gurtovoy
// //
// Permission to use, copy, modify, distribute and sell this software // Permission to use, copy, modify, distribute and sell this software
@@ -13,34 +15,30 @@
// supporting documentation. No representations are made about the // supporting documentation. No representations are made about the
// suitability of this software for any purpose. It is provided "as is" // suitability of this software for any purpose. It is provided "as is"
// without express or implied warranty. // without express or implied warranty.
//
#ifndef BOOST_MPL_JOINT_VIEW_HPP_INCLUDED // See http://www.boost.org/libs/mpl for documentation.
#define BOOST_MPL_JOINT_VIEW_HPP_INCLUDED
#include "boost/mpl/aux_/joint_iter.hpp" #include "boost/mpl/aux_/joint_iter.hpp"
#include "boost/mpl/begin_end.hpp"
#include "boost/mpl/aux_/void_spec.hpp"
#include "boost/mpl/plus.hpp" #include "boost/mpl/plus.hpp"
#include "boost/mpl/size_fwd.hpp" #include "boost/mpl/size_fwd.hpp"
#include "boost/mpl/begin_end.hpp"
#include <boost/detail/workaround.hpp> #include "boost/mpl/aux_/void_spec.hpp"
namespace boost { namespace boost {
namespace mpl { namespace mpl {
namespace aux namespace aux {
{ struct joint_view_tag;
struct joint_view_tag;
} }
template <> template<>
struct size_traits< aux::joint_view_tag > struct size_traits< aux::joint_view_tag >
{ {
template < typename JointView > struct algorithm template < typename JointView > struct algorithm
: plus< : plus<
size<typename JointView::sequence1> size<typename JointView::sequence1_>
, size<typename JointView::sequence2> , size<typename JointView::sequence2_>
> >
{}; {};
}; };
@@ -50,23 +48,16 @@ template<
> >
struct joint_view struct joint_view
{ {
#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1200)
private:
friend struct size_traits< aux::joint_view_tag >;
# if BOOST_WORKAROUND(BOOST_MSVC, >= 1301)
template <typename JointView>
friend struct size_traits< aux::joint_view_tag >::algorithm;
# endif
#endif
typedef Sequence1_ sequence1;
typedef Sequence2_ sequence2;
typedef typename begin<Sequence1_>::type first1_; typedef typename begin<Sequence1_>::type first1_;
typedef typename end<Sequence1_>::type last1_; typedef typename end<Sequence1_>::type last1_;
typedef typename begin<Sequence2_>::type first2_; typedef typename begin<Sequence2_>::type first2_;
typedef typename end<Sequence2_>::type last2_; typedef typename end<Sequence2_>::type last2_;
public: public:
// agurt, 25/may/03: for the 'size_traits' implementation above
typedef Sequence1_ sequence1_;
typedef Sequence2_ sequence2_;
typedef aux::joint_view_tag tag; typedef aux::joint_view_tag tag;
typedef typename aux::joint_iter<first1_,last1_,first2_> begin; typedef typename aux::joint_iter<first1_,last1_,first2_> begin;
typedef typename aux::joint_iter<last1_,last1_,last2_> end; typedef typename aux::joint_iter<last1_,last1_,last2_> end;