Update of /cvsroot/boost/boost/boost/wave/util
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26768/boost/wave/util
Modified Files:
cpp_iterator.hpp symbol_table.hpp
Log Message:
Wave: Fixed namespace detail ambiguity, fixed gcc compilation problems.
Index: cpp_iterator.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/wave/util/cpp_iterator.hpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- cpp_iterator.hpp 4 Jul 2007 21:56:55 -0000 1.64
+++ cpp_iterator.hpp 5 Jul 2007 14:42:02 -0000 1.65
@@ -1098,7 +1098,6 @@
token_sequence_type const& found_eoltokens)
{
using namespace cpplexer;
- using namespace boost::spirit;
typedef typename parse_tree_type::const_iterator const_child_iterator_t;
Index: symbol_table.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/wave/util/symbol_table.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- symbol_table.hpp 27 Jun 2007 01:23:20 -0000 1.8
+++ symbol_table.hpp 5 Jul 2007 14:42:02 -0000 1.9
@@ -42,6 +42,8 @@
: public std::map<StringT, boost::shared_ptr<MacroDefT> >
{
typedef std::map<StringT, boost::shared_ptr<MacroDefT> > base_type;
+ typedef typename base_type::iterator iterator_type;
+ typedef typename base_type::const_iterator const_iterator_type;
symbol_table(long uid_ = 0)
{}
@@ -65,13 +67,13 @@
// macros.
//
///////////////////////////////////////////////////////////////////////////
- template <typename StringT>
+ template <typename StringT1>
struct get_first
{
- typedef typename StringT const& result_type;
+ typedef StringT1 const& result_type;
template <typename First, typename Second>
- StringT const& operator() (std::pair<First, Second> const& p) const
+ StringT1 const& operator() (std::pair<First, Second> const& p) const
{
return p.first;
}
@@ -79,8 +81,10 @@
typedef get_first<StringT> unary_functor;
public:
- typedef transform_iterator<unary_functor, iterator> name_iterator;
- typedef transform_iterator<unary_functor, const_iterator>
const_name_iterator;
+ typedef transform_iterator<unary_functor, iterator_type>
+ name_iterator;
+ typedef transform_iterator<unary_functor, const_iterator_type>
+ const_name_iterator;
template <typename Iterator>
static
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
