Solving boost namespace ambiguity

Change-Id: I05631c79fc873d34e8e264c8ef3aeeeba49cc528
cawka · Apr 5, 2011 · 7e1d102 · 7e1d102
1 parent 40f5a79
commit 7e1d102
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/dumper/mrt2xml.cpp b/dumper/mrt2xml.cpp
@@ -88,10 +88,10 @@ namespace fs = boost::filesystem;
 #include <boost/scoped_array.hpp>
 
 #include <boost/iostreams/categories.hpp>
-namespace io = boost::iostreams;
 
 using namespace std;
 using namespace boost;
+using namespace boost::iostreams;
 
 //int dump_type = 0;   // 1: TABLE_DUMP1
 //                     // 2: TABLE_DUMP2
@@ -221,17 +221,17 @@ int main(int argc, char** argv)
 	if( regex_match(string(fileName), m, regex("^.*\\.(gz|bz2)$")) ) format=m[1];
 	////////////////////////////////////////////////////////////////////////////
 
-	io::filtering_stream<io::input> in;
+	filtering_stream<input> in;
 
 	if( format=="gz" )
 	{
 		LOG4CXX_DEBUG( _log, "Input file has GZIP format" );
-		in.push( io::gzip_decompressor() );
+		in.push( gzip_decompressor() );
 	}
 	else if( format=="bz2" )
 	{
 		LOG4CXX_DEBUG( _log, "Input file has BZIP2 format" );
-		in.push( io::bzip2_decompressor() );
+		in.push( bzip2_decompressor() );
 	}
 
 	ifstream input_file( fileName, ios_base::in | ios_base::binary );

diff --git a/dumper2/main.cpp b/dumper2/main.cpp
@@ -64,10 +64,10 @@ namespace po = boost::program_options;
 #include <boost/scoped_array.hpp>
 
 #include <boost/iostreams/categories.hpp>
-namespace io = boost::iostreams;
 
 using namespace std;
 using namespace boost;
+using namespace boost::iostreams;
 
 #ifdef LOG4CXX
 static LoggerPtr _log=Logger::getLogger( "bgpparser" );
@@ -151,17 +151,17 @@ int main(int argc, char** argv)
 	if( regex_match(filename, m, regex("^.*\\.(gz|bz2)$")) ) format=m[1];
 	////////////////////////////////////////////////////////////////////////////
 
-	io::filtering_stream<io::input> in;
+	filtering_stream<input> in;
 
 	if( format=="gz" )
 	{
 		LOG4CXX_DEBUG( _log, "Input file has GZIP format" );
-		in.push( io::gzip_decompressor() );
+		in.push( gzip_decompressor() );
 	}
 	else if( format=="bz2" )
 	{
 		LOG4CXX_DEBUG( _log, "Input file has BZIP2 format" );
-		in.push( io::bzip2_decompressor() );
+		in.push( bzip2_decompressor() );
 	}
 
 	ifstream input_file( filename.c_str(), ios_base::in | ios_base::binary );
@@ -230,8 +230,8 @@ int main(int argc, char** argv)
 		LOG4CXX_DEBUG( _log, "EOF" );
 		; //do nothing
 	}
-//	catch( io::gzip_error e )
-//	catch( io::bzip2_error e )
+//	catch( gzip_error e )
+//	catch( bzip2_error e )
 	catch( std::istream::failure e )
 	{
 		cerr << "ERROR: " << e.what() << endl;

diff --git a/examples/bgpparser.cpp b/examples/bgpparser.cpp
@@ -66,10 +66,10 @@ namespace po = boost::program_options;
 #include <boost/scoped_array.hpp>
 
 #include <boost/iostreams/categories.hpp>
-namespace io = boost::iostreams;
 
 using namespace std;
 using namespace boost;
+using namespace boost::iostreams;
 
 bool PrintCompact=false;
 
@@ -155,17 +155,17 @@ int main(int argc, char** argv)
 	if( regex_match(filename, m, regex("^.*\\.(gz|bz2)$")) ) format=m[1];
 	////////////////////////////////////////////////////////////////////////////
 
-	io::filtering_stream<io::input> in;
+	filtering_stream<input> in;
 
 	if( format=="gz" )
 	{
 		LOG4CXX_DEBUG( _log, "Input file has GZIP format" );
-		in.push( io::gzip_decompressor() );
+		in.push( gzip_decompressor() );
 	}
 	else if( format=="bz2" )
 	{
 		LOG4CXX_DEBUG( _log, "Input file has BZIP2 format" );
-		in.push( io::bzip2_decompressor() );
+		in.push( bzip2_decompressor() );
 	}
 
 	ifstream input_file( filename.c_str(), ios_base::in | ios_base::binary );
@@ -221,8 +221,8 @@ int main(int argc, char** argv)
 		LOG4CXX_DEBUG( _log, "EOF" );
 		; //do nothing
 	}
-//	catch( io::gzip_error e )
-//	catch( io::bzip2_error e )
+//	catch( gzip_error e )
+//	catch( bzip2_error e )
 	catch( std::istream::failure e )
 	{
 		cerr << "ERROR: " << e.what() << endl;