[Wavelet-commit] Wavelet/test benchmark.cc,1.2,1.3 coeffinfo.cc,1.1,1.2 colorimage.cc,1.2,1.3 filename.cc,1.3,1.4 histogram.cc,1.2,1.3 image.cc,1.3,1.4 imagearray.cc,1.2,1.3 imagefile.cc,1.2,1.3 imageinfo.cc,1.2,1.3 ntree.cc,1.4,1.5 position.cc,1.2,1.3 transform.cc,1.2,1.3 vectors.cc,1.2,1.3 videos.cc,1.7,1.8 wavelet.cc,1.2,1.3

[Herbert M. D. <he...@us...>]

Update of /cvsroot/wavelet/Wavelet/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24601/test

Modified Files:
	benchmark.cc coeffinfo.cc colorimage.cc filename.cc 
	histogram.cc image.cc imagearray.cc imagefile.cc imageinfo.cc 
	ntree.cc position.cc transform.cc vectors.cc videos.cc 
	wavelet.cc 
Log Message:
adapted namespace stuff for openwatcom

Index: transform.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/test/transform.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** transform.cc	18 Feb 2005 12:12:25 -0000	1.2
--- transform.cc	10 Aug 2005 09:35:23 -0000	1.3
***************
*** 22,26 ****
  #include <math.h>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 22,26 ----
  #include <math.h>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: imageinfo.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/test/imageinfo.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** imageinfo.cc	18 Feb 2005 12:12:25 -0000	1.2
--- imageinfo.cc	10 Aug 2005 09:35:23 -0000	1.3
***************
*** 20,24 ****
  #include <math.h>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 20,24 ----
  #include <math.h>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: wavelet.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/test/wavelet.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wavelet.cc	18 Feb 2005 12:12:25 -0000	1.2
--- wavelet.cc	10 Aug 2005 09:35:23 -0000	1.3
***************
*** 25,29 ****
  #include "Wave/Wavelet.hh"
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 25,29 ----
  #include "Wave/Wavelet.hh"
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: ntree.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/test/ntree.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ntree.cc	18 Feb 2005 14:35:50 -0000	1.4
--- ntree.cc	10 Aug 2005 09:35:23 -0000	1.5
***************
*** 16,20 ****
  #include "WImage/tools.h"
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 16,20 ----
  #include "WImage/tools.h"
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: imagefile.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/test/imagefile.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** imagefile.cc	18 Feb 2005 12:12:25 -0000	1.2
--- imagefile.cc	10 Aug 2005 09:35:23 -0000	1.3
***************
*** 34,38 ****
  #include "WImage/debug.h"
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 34,38 ----
  #include "WImage/debug.h"
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: benchmark.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/test/benchmark.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** benchmark.cc	18 Feb 2005 12:12:25 -0000	1.2
--- benchmark.cc	10 Aug 2005 09:35:23 -0000	1.3
***************
*** 12,16 ****
  #include <Wave.hh>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 12,16 ----
  #include <Wave.hh>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: videos.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/test/videos.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** videos.cc	18 Feb 2005 12:12:25 -0000	1.7
--- videos.cc	10 Aug 2005 09:35:23 -0000	1.8
***************
*** 26,30 ****
  #include "Wave/Filter.hh"
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 26,30 ----
  #include "Wave/Filter.hh"
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: position.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/test/position.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** position.cc	18 Feb 2005 12:12:25 -0000	1.2
--- position.cc	10 Aug 2005 09:35:23 -0000	1.3
***************
*** 16,20 ****
  #include <iostream>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 16,20 ----
  #include <iostream>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: image.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/test/image.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** image.cc	18 Feb 2005 12:12:25 -0000	1.3
--- image.cc	10 Aug 2005 09:35:23 -0000	1.4
***************
*** 19,23 ****
  #include "WImage/StillImage.hh"
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 19,23 ----
  #include "WImage/StillImage.hh"
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: imagearray.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/test/imagearray.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** imagearray.cc	18 Feb 2005 12:12:25 -0000	1.2
--- imagearray.cc	10 Aug 2005 09:35:23 -0000	1.3
***************
*** 22,26 ****
  #include "../ImageArray.cc"
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 22,26 ----
  #include "../ImageArray.cc"
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: colorimage.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/test/colorimage.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** colorimage.cc	18 Feb 2005 12:12:25 -0000	1.2
--- colorimage.cc	10 Aug 2005 09:35:23 -0000	1.3
***************
*** 15,19 ****
  #include "WImage/ColorImage.hh"
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 15,19 ----
  #include "WImage/ColorImage.hh"
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: coeffinfo.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/test/coeffinfo.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** coeffinfo.cc	18 Oct 2004 11:20:20 -0000	1.1
--- coeffinfo.cc	10 Aug 2005 09:35:23 -0000	1.2
***************
*** 15,19 ****
  #include <iostream>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 15,19 ----
  #include <iostream>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: filename.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/test/filename.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** filename.cc	18 Feb 2005 13:05:25 -0000	1.3
--- filename.cc	10 Aug 2005 09:35:23 -0000	1.4
***************
*** 16,20 ****
  #include <iostream>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 16,20 ----
  #include <iostream>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: histogram.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/test/histogram.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** histogram.cc	18 Feb 2005 12:12:25 -0000	1.2
--- histogram.cc	10 Aug 2005 09:35:23 -0000	1.3
***************
*** 18,22 ****
  #include <stdexcept>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 18,22 ----
  #include <stdexcept>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: vectors.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/test/vectors.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** vectors.cc	18 Feb 2005 12:12:25 -0000	1.2
--- vectors.cc	10 Aug 2005 09:35:23 -0000	1.3
***************
*** 24,28 ****
  #include "WImage/ColumnVector.hh"
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 24,28 ----
  #include "WImage/ColumnVector.hh"
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif