removed unneeded BL_USE_SETBUF and BL_USE_NEW_HFILES

AMReX-Codes · Oct 17, 2001 · 130d9e9 · 130d9e9
1 parent 188cb4b
commit 130d9e9
Show file tree

Hide file tree

Showing 30 changed files with 33 additions and 177 deletions.
diff --git a/AmrData.cpp b/AmrData.cpp
@@ -1,6 +1,6 @@
 
 //
-// $Id: AmrData.cpp,v 1.58 2001-10-16 19:54:52 vince Exp $
+// $Id: AmrData.cpp,v 1.59 2001-10-17 17:53:33 lijewski Exp $
 //
 
 // ---------------------------------------------------------------
@@ -48,6 +48,13 @@ using std::max;
 using std::ios;
 using std::ifstream;
 
+//
+// This MUST be defined if don't have pubsetbuf() in I/O Streams Library.
+//
+#ifdef BL_USE_SETBUF
+#define pubsetbuf setbuf
+#endif
+
 #ifdef SHOWVAL
 #undef SHOWVAL
 #endif
@@ -159,15 +166,11 @@ bool AmrData::ReadData(const string &filename, FileType filetype) {
     File += "Header";
 #endif /*BL_PARALLEL_IO*/
 
-#ifdef BL_USE_SETBUF
     VisMF::IO_Buffer io_buffer(VisMF::IO_Buffer_Size);
-#endif
 
     ifstream isPltIn;
 
-#ifdef BL_USE_SETBUF
-    isPltIn.rdbuf()->setbuf(io_buffer.dataPtr(), io_buffer.size());
-#endif
+    isPltIn.rdbuf()->pubsetbuf(io_buffer.dataPtr(), io_buffer.size());
 
    if(verbose) {
      if(ParallelDescriptor::IOProcessor()) {

diff --git a/AmrPicture.H b/AmrPicture.H
@@ -1,6 +1,6 @@
 
 //
-// $Id: AmrPicture.H,v 1.40 2001-08-22 00:22:32 vince Exp $
+// $Id: AmrPicture.H,v 1.41 2001-10-17 17:53:33 lijewski Exp $
 //
 
 // ---------------------------------------------------------------
@@ -9,11 +9,7 @@
 #ifndef _AMRPICTURE_H
 #define _AMRPICTURE_H
 
-#ifdef BL_USE_NEW_HFILES
 #include <cstdio>
-#else
-#include <stdio.h>
-#endif
 
 #include "REAL.H"
 #include "Box.H"

diff --git a/AmrPicture.cpp b/AmrPicture.cpp
@@ -1,6 +1,6 @@
 
 //
-// $Id: AmrPicture.cpp,v 1.70 2001-08-22 01:05:50 vince Exp $
+// $Id: AmrPicture.cpp,v 1.71 2001-10-17 17:53:33 lijewski Exp $
 //
 
 // ---------------------------------------------------------------
@@ -18,11 +18,7 @@ using std::cerr;
 using std::endl;
 using std::max;
 
-#ifdef BL_USE_NEW_HFILES
 #include <ctime>
-#else
-#include <time.h>
-#endif
 
 #ifdef BL_USE_ARRAYVIEW
 #include "ArrayView.H"

diff --git a/AmrvisConstants.H b/AmrvisConstants.H
@@ -1,6 +1,6 @@
 
 //
-// $Id: AmrvisConstants.H,v 1.16 2001-08-23 20:10:47 vince Exp $
+// $Id: AmrvisConstants.H,v 1.17 2001-10-17 17:53:33 lijewski Exp $
 //
 
 // ---------------------------------------------------------------
@@ -10,11 +10,7 @@
 #define _AMRVISCONSTANTS_H
 
 #include <REAL.H>
-#ifdef BL_USE_NEW_HFILES
 #include <cfloat>
-#else
-#include <float.h>
-#endif
 
 #include <stdio.h>
 

diff --git a/DataServices.H b/DataServices.H
@@ -1,6 +1,6 @@
 
 //
-// $Id: DataServices.H,v 1.15 2001-09-28 23:57:20 vince Exp $
+// $Id: DataServices.H,v 1.16 2001-10-17 17:53:33 lijewski Exp $
 //
 
 // ---------------------------------------------------------------
@@ -12,13 +12,9 @@
 #include "Array.H"
 #include "AmrData.H"
 
-#ifdef BL_USE_NEW_HFILES
 #include <cstdarg>
 #include <string>
 using std::string;
-#else
-#include <stdarg.h>
-#endif
 
 class XYPlotDataList;
 

diff --git a/DataServices.cpp b/DataServices.cpp
@@ -1,6 +1,6 @@
 
 //
-// $Id: DataServices.cpp,v 1.31 2001-10-09 20:19:41 lijewski Exp $
+// $Id: DataServices.cpp,v 1.32 2001-10-17 17:53:33 lijewski Exp $
 //
 
 // ---------------------------------------------------------------
@@ -14,7 +14,6 @@
 # include "XYPlotDataList.H"
 #endif
 
-#ifdef BL_USE_NEW_HFILES
 #include <iostream>
 #include <fstream>
 #include <cstdio>
@@ -26,11 +25,6 @@ using std::endl;
 using std::min;
 using std::max;
 
-#else
-#include <iostream.h>
-#include <stdio.h>
-#endif
-
 Array<DataServices *> DataServices::dsArray;
 int DataServices::dsArrayIndexCounter = 0;
 int DataServices::dsFabOutSize = 0;

diff --git a/Dataset.cpp b/Dataset.cpp
@@ -1,6 +1,6 @@
 
 //
-// $Id: Dataset.cpp,v 1.39 2001-08-21 20:37:55 vince Exp $
+// $Id: Dataset.cpp,v 1.40 2001-10-17 17:53:33 lijewski Exp $
 //
 
 // ---------------------------------------------------------------
@@ -28,7 +28,6 @@ const int MAXINDEXCHARS   = 4;
 #include "AmrPicture.H"
 #include "DataServices.H"
 
-#ifdef BL_USE_NEW_HFILES
 #include <strstream>
 #include <cfloat>
 using std::ostrstream;
@@ -39,12 +38,6 @@ using std::endl;
 using std::min;
 using std::max;
 
-# else
-#include <strstream.h>
-#include <float.h>
-#endif
-
-
 // -------------------------------------------------------------------
 Dataset::Dataset(const Box &alignedRegion, AmrPicture *apptr,
 		 PltApp *pltappptr, PltAppState *pltappstateptr,

diff --git a/DatasetClient.cpp b/DatasetClient.cpp
@@ -1,22 +1,15 @@
 
 //
-// $Id: DatasetClient.cpp,v 1.5 2000-10-02 20:53:08 lijewski Exp $
+// $Id: DatasetClient.cpp,v 1.6 2001-10-17 17:53:33 lijewski Exp $
 //
 
 // ---------------------------------------------------------------
 // DatasetClient.cpp
 // ---------------------------------------------------------------
-#ifdef BL_USE_NEW_HFILES
 #include <climits>
 #include <cstring>
 #include <cstdlib>
 #include <cstdio>
-#else
-#include <limits.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#endif
 
 #include <sys/types.h>
 #include <sys/socket.h>

diff --git a/GNUmakefile b/GNUmakefile
@@ -44,8 +44,6 @@ INCLUDE_LOCATIONS += ../BoxLib
 #INCLUDE_LOCATIONS += ../BoxLib/std
 
 DEFINES += -DBL_PARALLEL_IO
-#DEFINES += -DBL_USE_SETBUF
-DEFINES += -DBL_USE_NEW_HFILES
 
 ifeq ($(MACHINE),OSF1)
   ifeq ($(COMP),KCC)
@@ -76,7 +74,6 @@ ifeq ($(MACHINE), AIX)
   #INCLUDE_LOCATIONS += /usr/include/X11/Xaw
   LIBRARIES += -lXm -lXt -lX11
   DEFINES += -D_ALL_SOURCE
-  DEFINES += -DBL_USE_NEW_HFILES
 endif
 
 ifeq ($(MACHINE), T3E)
@@ -131,9 +128,9 @@ ifeq ($(DIM),3)
     # VOLPACKDIR = ../../volpack/volpack_cpp
     # VOLPACKDIR = ../../volpack/volpack-1.0b3
     #VOLPACKDIR = $(PBOXLIB_HOME)/volpack
-    #VOLPACKDIR = ../volpack
+    VOLPACKDIR = ../volpack
     #VOLPACKDIR = ../../volpack.test
-    VOLPACKDIR = ../../volpack
+    #VOLPACKDIR = ../../volpack
     INCLUDE_LOCATIONS += $(VOLPACKDIR)
     LIBRARY_LOCATIONS += $(VOLPACKDIR)
     LIBRARIES += -lvolpack

diff --git a/GlobalUtilities.cpp b/GlobalUtilities.cpp
@@ -1,6 +1,6 @@
 
 //
-// $Id: GlobalUtilities.cpp,v 1.42 2001-08-23 20:10:47 vince Exp $
+// $Id: GlobalUtilities.cpp,v 1.43 2001-10-17 17:53:33 lijewski Exp $
 //
 
 // ---------------------------------------------------------------
@@ -9,7 +9,6 @@
 #include "GlobalUtilities.H"
 #include "FArrayBox.H"
 #include "FabConv.H"
-#ifdef BL_USE_NEW_HFILES
 #include <fstream>
 #include <iostream>
 using std::ifstream;
@@ -19,9 +18,6 @@ using std::cerr;
 using std::endl;
 using std::min;
 using std::max;
-#else
-#include <fstream.h>
-#endif
 
 #include "PltApp.H"
 #include "ParallelDescriptor.H"

diff --git a/GraphicsAttributes.H b/GraphicsAttributes.H
@@ -1,6 +1,6 @@
 
 //
-// $Id: GraphicsAttributes.H,v 1.16 2001-10-05 21:57:11 vince Exp $
+// $Id: GraphicsAttributes.H,v 1.17 2001-10-17 17:53:33 lijewski Exp $
 //
 
 // ---------------------------------------------------------------
@@ -11,12 +11,8 @@
 
 #include "AmrvisConstants.H"
 
-#ifdef BL_USE_NEW_HFILES
 #include <iostream>
 using std::ostream;
-#else
-#include <iostream.h>
-#endif
 
 #include <X11/X.h>
 #include <X11/Intrinsic.h>

diff --git a/GraphicsAttributes.cpp b/GraphicsAttributes.cpp
@@ -1,20 +1,16 @@
 
 //
-// $Id: GraphicsAttributes.cpp,v 1.14 2001-10-05 21:57:11 vince Exp $
+// $Id: GraphicsAttributes.cpp,v 1.15 2001-10-17 17:53:33 lijewski Exp $
 //
 
 // ---------------------------------------------------------------
 // GraphicsAttributes.cpp
 // ---------------------------------------------------------------
 #include <BoxLib.H>
 
-#ifdef BL_USE_NEW_HFILES
 #include <iostream>
 using std::cerr;
 using std::endl;
-#else
-#include <iostream.h>
-#endif
 
 #include "GraphicsAttributes.H"
 #include <X11/X.h>

diff --git a/GridPicture.cpp b/GridPicture.cpp
@@ -3,13 +3,8 @@
 // -------------------------------------------------------------------
 #include "GridPicture.H"
 #include "GlobalUtilities.H"
-#ifdef BL_USE_NEW_HFILES
 #include <climits>
 #include <cfloat>
-#else
-#include <limits.h>
-#include <float.h>
-#endif
 
 // -------------------------------------------------------------------
 GridPicture::GridPicture() {

diff --git a/Output.cpp b/Output.cpp
@@ -1,6 +1,6 @@
 
 //
-// $Id: Output.cpp,v 1.26 2001-08-22 00:22:32 vince Exp $
+// $Id: Output.cpp,v 1.27 2001-10-17 17:53:33 lijewski Exp $
 //
 
 // ---------------------------------------------------------------
@@ -14,7 +14,6 @@
 
 #include <fcntl.h>
 #include <unistd.h>
-#ifdef BL_USE_NEW_HFILES
 #include <fstream>
 #include <iomanip>
 #include <cmath>
@@ -30,14 +29,6 @@ using std::cerr;
 using std::endl;
 using std::min;
 using std::max;
-#else
-#include <fstream.h>
-#include <iomanip.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <strstream.h>
-#endif
 
 
 IMAGE *iopen(const char *file, unsigned int type, unsigned int dim,

diff --git a/Palette.cpp b/Palette.cpp
@@ -1,6 +1,6 @@
 
 //
-// $Id: Palette.cpp,v 1.39 2001-10-05 23:01:32 vince Exp $
+// $Id: Palette.cpp,v 1.40 2001-10-17 17:53:33 lijewski Exp $
 //
 
 // ---------------------------------------------------------------
@@ -13,18 +13,13 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#ifdef BL_USE_NEW_HFILES
 #include <cassert>
 #include <cstdio>
 using std::cout;
 using std::cerr;
 using std::endl;
 using std::min;
 using std::max;
-#else
-#include <stdio.h>
-#include <assert.h>
-#endif
 
 Colormap Palette::systemColmap;
 

diff --git a/PltApp.cpp b/PltApp.cpp
@@ -1,6 +1,6 @@
 
 //
-// $Id: PltApp.cpp,v 1.98 2001-08-23 20:10:47 vince Exp $
+// $Id: PltApp.cpp,v 1.99 2001-10-17 17:53:33 lijewski Exp $
 //
 
 // ---------------------------------------------------------------
@@ -41,7 +41,6 @@
 #include <PVolRender.H>
 #endif
 
-#ifdef BL_USE_NEW_HFILES
 #include <cctype>
 #include <strstream>
 using std::ostrstream;
@@ -52,11 +51,6 @@ using std::endl;
 using std::min;
 using std::max;
 
-#else
-#include <ctype.h>
-#include <strstream.h>
-#endif
-
 // Hack for window manager calls
 #ifndef FALSE
 #define FALSE false