File libEMF-gcc3-fix.diff of Package libEMF

Overview Repositories Revisions Requests Users Attributes Meta

File libEMF-gcc3-fix.diff of Package libEMF (Revision 94dfc231335998f7ae791efd16709b6c)

Currently displaying revision 94dfc231335998f7ae791efd16709b6c , Show latest

diff -ru libEMF-1.0.orig/libemf/libemf.cpp libEMF-1.0/libemf/libemf.cpp
--- libEMF-1.0.orig/libemf/libemf.cpp	2002-01-29 04:37:54.000000000 +0100
+++ libEMF-1.0/libemf/libemf.cpp	2002-11-20 19:03:37.000000000 +0100
@@ -48,7 +48,7 @@
       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 @@
     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 @@
     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 @@
       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 @@
 	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 @@
     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 -ru libEMF-1.0.orig/libemf/libemf.h libEMF-1.0/libemf/libemf.h
--- libEMF-1.0.orig/libemf/libemf.h	2002-01-29 05:54:27.000000000 +0100
+++ libEMF-1.0/libemf/libemf.h	2002-11-20 19:08:00.000000000 +0100
@@ -21,10 +21,12 @@
 #ifndef _LIBEMF_H
 #define _LIBEMF_H 1
 
+#include <iostream>
 #include <cmath>
 #include <vector>
 #include <map>
 #include <functional>
+#include <backward/function.h>
 #include <algorithm>
 
 #include <config.h>

Places

File libEMF-gcc3-fix.diff of Package libEMF (Revision 94dfc231335998f7ae791efd16709b6c)

Places