r259: MSVC modifications

[ctsim.git] / include / array2dfile.h

diff --git a/include/array2dfile.h b/include/array2dfile.h
index 0b3da841d43cf135380a14ee6533e40f14bc40f2..e5276e793f9a1f6ef2b6a5b5efe9286ec7368030 100644 (file)
--- a/include/array2dfile.h
+++ b/include/array2dfile.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: array2dfile.h,v 1.7 2000/12/04 03:09:00 kevin Exp $
+**  $Id: array2dfile.h,v 1.11 2000/12/16 03:29:02 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -28,15 +28,17 @@
 #ifndef ARRAY2DFILE_H
 #define ARRAY2DFILE_H
 
-#ifndef WIN32
+#ifndef MSVC
 #include <unistd.h>
 #endif
 
 #include <sys/types.h>
-#include <string.h>
-#include <string>
-#include <fstream>
-#include <iostream>
+#include <cstring>
+#include <string>\r
+#include <iosfwd>
+#include <iomanip>\r
+#include <fstream>\r
+#include <iostream>\r
 #include <vector>
 #include "ctsupport.h"
 #include "fnetorderstream.h"
@@ -88,7 +90,7 @@ public:
 
     const string& getDateString () const;
 
-    void print (ostream& os) const;
+    void print (std::ostream& os) const;
 
     Array2dFileLabel (const Array2dFileLabel& rhs);
 
@@ -180,7 +182,7 @@ public:
   const string& getFilename (void) const 
       {  return m_filename; }
 
-  void printLabels (ostream& os) const;
+  void printLabels (std::ostream& os) const;
 
   typedef vector<Array2dFileLabel*>::iterator labelIterator;
   typedef vector<Array2dFileLabel*>::const_iterator constLabelIterator;