[med-svn] r2797 - trunk/packages/dicom3tools/debian/patches

[tille at alioth.debian.org]

Author: tille
Date: 2008-12-15 20:51:41 +0000 (Mon, 15 Dec 2008)
New Revision: 2797

Modified:
   trunk/packages/dicom3tools/debian/patches/20_gcc4.3.patch
Log:
More removals of '.h'


Modified: trunk/packages/dicom3tools/debian/patches/20_gcc4.3.patch
===================================================================
--- trunk/packages/dicom3tools/debian/patches/20_gcc4.3.patch	2008-12-15 20:26:48 UTC (rev 2796)
+++ trunk/packages/dicom3tools/debian/patches/20_gcc4.3.patch	2008-12-15 20:51:41 UTC (rev 2797)
@@ -81,3 +81,112 @@
  
  class ErrorsInClass {
  private:
+--- dicom3tools-1.0~20081122.orig/libsrc/src/dcdisp/rdimage.cc
++++ dicom3tools-1.0~20081122/libsrc/src/dcdisp/rdimage.cc
+@@ -1,5 +1,5 @@
+-#include <iostream.h>
+-#include <iomanip.h>
++#include <iostream>
++#include <iomanip>
+ 
+ #include "basetype.h"
+ #include "srcsink.h"
+--- dicom3tools-1.0~20081122.orig/libsrc/src/dcdisp/usegray.cc
++++ dicom3tools-1.0~20081122/libsrc/src/dcdisp/usegray.cc
+@@ -1,5 +1,5 @@
+-#include <iostream.h>	// only for debugging
+-#include <iomanip.h>	// only for debugging
++#include <iostream>	// only for debugging
++#include <iomanip>	// only for debugging
+ 
+ #include "basetype.h"
+ #include "usegray.h"
+--- dicom3tools-1.0~20081122.orig/libsrc/src/dctool/binval.cc
++++ dicom3tools-1.0~20081122/libsrc/src/dctool/binval.cc
+@@ -1,4 +1,4 @@
+-#include <iomanip.h>
++#include <iomanip>
+ 
+ #include "basetype.h"
+ #include "binvalc.h"
+--- dicom3tools-1.0~20081122.orig/libsrc/src/dctool/charset.cc
++++ dicom3tools-1.0~20081122/libsrc/src/dctool/charset.cc
+@@ -1,6 +1,6 @@
+-#include <string.h>
+-//#include <iostream.h>	// for cerr
+-//#include <iomanip.h>	// for cerr
++#include <string>
++//#include <iostream>	// for cerr
++//#include <iomanip>	// for cerr
+ 
+ #include "charset.h"
+ #include "attr.h"
+--- dicom3tools-1.0~20081122.orig/libsrc/src/dctool/uidgen.cc
++++ dicom3tools-1.0~20081122/libsrc/src/dctool/uidgen.cc
+@@ -1,18 +1,18 @@
+-#include <iomanip.h>
++#include <iomanip>
+ 
+ #ifdef CRAP
+-#include <time.h>
++#include <time>
+ 
+ #ifdef __MWERKS__
+-#include <time.h>
++#include <time>
+ #else /* __MWERKS__ */
+ #ifdef __SC__
+-#include <types.h>
+-#include <time.h>
++#include <types>
++#include <time>
+ #else /* __SC__ */
+-#include <sys/types.h>
+-#include <sys/time.h>
+-#include <unistd.h>
++#include <sys/types>
++#include <sys/time>
++#include <unistd>
+ //long gethostid(void);
+ #endif /* __SC__ */
+ #endif /* __MWERKS__ */
+--- dicom3tools-1.0~20081122.orig/libsrc/src/dctool/tagval.cc
++++ dicom3tools-1.0~20081122/libsrc/src/dctool/tagval.cc
+@@ -1,4 +1,4 @@
+-#include <iomanip.h>
++#include <iomanip>
+ 
+ #include "basetype.h"
+ #include "tagvalc.h"
+--- dicom3tools-1.0~20081122.orig/libsrc/src/generic/getoptns.cc
++++ dicom3tools-1.0~20081122/libsrc/src/generic/getoptns.cc
+@@ -1,6 +1,6 @@
+-#include <iomanip.h>
+-#include <ctype.h>
+-#include <string.h>
++#include <iomanip>
++#include <ctype>
++#include <string>
+ 
+ #include "basetype.h"
+ #include "getoptns.h"
+--- dicom3tools-1.0~20081122.orig/libsrc/src/locale/mesgtext.cc
++++ dicom3tools-1.0~20081122/libsrc/src/locale/mesgtext.cc
+@@ -1,5 +1,5 @@
+-#include <string.h>
+-#include <iomanip.h>
++#include <string>
++#include <iomanip>
+ 
+ #include "basetype.h"
+ #include "mesgtext.h"
+--- dicom3tools-1.0~20081122.orig/libsrc/src/ourdisp/ourdisp.cc
++++ dicom3tools-1.0~20081122/libsrc/src/ourdisp/ourdisp.cc
+@@ -1,5 +1,5 @@
+-#include <iostream.h>
+-#include <iomanip.h>
++#include <iostream>
++#include <iomanip>
+ 
+ #include "basetype.h"
+ #include "errclass.h"