diff -pur libEMF-1.0/libemf/libemf.cpp libEMF-1.0-gcc3/libemf/libemf.cpp --- libEMF-1.0/libemf/libemf.cpp 2002-01-29 04:37:54.000000000 +0100 +++ libEMF-1.0-gcc3/libemf/libemf.cpp 2005-07-28 14:27:11.000000000 +0200 @@ -48,7 +48,7 @@ namespace EMF { be32 = !be16; if ( be32 != be16 ) { - cerr << "endian-ness not consistent between short's and int's!" << endl; + std::cerr << "endian-ness not consistent between short's and int's!" << std::endl; ::abort(); } @@ -849,7 +849,7 @@ extern "C" { if ( dc->fp ) { std::for_each( dc->records.begin(), dc->records.end(), - std::bind2nd( std::mem_fun1( &EMF::METARECORD::serialize ), + std::bind2nd( mem_fun1( &EMF::METARECORD::serialize ), dc->ds ) ); fclose( dc->fp ); @@ -896,7 +896,7 @@ extern "C" { if ( dc->fp ) { std::for_each( dc->records.begin(), dc->records.end(), - std::bind2nd( std::mem_fun1( &EMF::METARECORD::serialize ), + std::bind2nd( mem_fun1( &EMF::METARECORD::serialize ), dc->ds ) ); } @@ -1032,7 +1032,7 @@ extern "C" { if ( feof( fp ) ) break; if ( emr.nSize == 0 ) { - cerr << "GetEnhMetaFileW error: record size == 0. cannot continue" << endl; + std::cerr << "GetEnhMetaFileW error: record size == 0. cannot continue" << std::endl; fclose( fp ); return 0; } @@ -1050,8 +1050,8 @@ extern "C" { dc->appendRecord( record ); } else - cerr << "GetEnhMetaFileW warning: read unknown record type " << emr.iType - << " of size " << emr.nSize << endl; + std::cerr << "GetEnhMetaFileW warning: read unknown record type " << emr.iType + << " of size " << emr.nSize << std::endl; // Regardless, position ourselves at the next record. fseek( fp, next_position, SEEK_SET ); @@ -1108,7 +1108,7 @@ extern "C" { if ( dc == 0 ) return; std::for_each( dc->records.begin(), dc->records.end(), - std::mem_fun( &EMF::METARECORD::edit ) ); + mem_fun( &EMF::METARECORD::edit ) ); #endif /* ENABLE_EDITING */ } diff -pur libEMF-1.0/libemf/libemf.h libEMF-1.0-gcc3/libemf/libemf.h --- libEMF-1.0/libemf/libemf.h 2002-01-29 05:54:27.000000000 +0100 +++ libEMF-1.0-gcc3/libemf/libemf.h 2005-07-28 14:27:49.000000000 +0200 @@ -21,10 +21,12 @@ #ifndef _LIBEMF_H #define _LIBEMF_H 1 +#include #include #include #include #include +#include #include #include