X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Ffnetorderstream.h;h=876c6a350bb98253cb9b8a4807b93d612b5eacd7;hp=41be6cb8f0b95ba70c34058ac48c7eab2401b179;hb=1a050c98763fbbc0662731b0b76953acede6f5d7;hpb=9703ace3c451ce079967284bf191783736dbc77f

diff --git a/include/fnetorderstream.h b/include/fnetorderstream.h
index 41be6cb..876c6a3 100644
--- a/include/fnetorderstream.h
+++ b/include/fnetorderstream.h
@@ -1,3 +1,31 @@
+/*****************************************************************************
+** FILE IDENTIFICATION
+**
+**   Name:          fnetorderstream.h
+**   Purpose:       Network-order file stream header
+**   Programmer:    Kevin Rosenberg
+**   Date Started:  Sep 2000
+**
+**  This is part of the CTSim program
+**  Copyright (c) 1983-2001 Kevin Rosenberg
+**
+**  $Id$
+**
+**  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
+**  published by the Free Software Foundation.
+**
+**  This program is distributed in the hope that it will be useful,
+**  but WITHOUT ANY WARRANTY; without even the implied warranty of
+**  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**  GNU General Public License for more details.
+**
+**  You should have received a copy of the GNU General Public License
+**  along with this program; if not, write to the Free Software
+**  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+******************************************************************************/
+
+
 #ifndef NETORDER_H
 #define NETORDER_H
 
@@ -8,7 +36,6 @@
 #include <fstream>
 #include <iostream>
 #include <string>
-using namespace std;
 
 
 inline bool NativeBigEndian (void)
@@ -61,18 +88,38 @@ SwapBytes8 (void* buffer)
   p[4] = temp;
 }
 
+inline void
+SwapBytes2IfLittleEndian (void* buffer)
+{
+#ifndef WORDS_BIGENDIAN
+  SwapBytes2 (buffer);
+#endif
+}
+
+inline void
+SwapBytes4IfLittleEndian (void* buffer)
+{
+#ifndef WORDS_BIGENDIAN
+  SwapBytes4 (buffer);
+#endif
+}
+
+inline void
+SwapBytes8IfLittleEndian (void* buffer)
+{
+#ifndef WORDS_BIGENDIAN
+  SwapBytes8 (buffer);
+#endif
+}
 
 void ConvertNetworkOrder (void* buffer, size_t bytes);
 void ConvertReverseNetworkOrder (void* buffer, size_t bytes);
 
-
+using std::fstream;
 class fnetorderstream : public fstream {
  public:
-  fnetorderstream (const char* filename, int mode)
-    : fstream (filename, mode) {}
-
-  fnetorderstream (const int fd)
-    : fstream (fd) {}
+  fnetorderstream (const char* filename, std::ios::openmode mode)
+          : fstream (filename, mode) {}
 
   ~fnetorderstream (void)
       {}
@@ -81,7 +128,7 @@ class fnetorderstream : public fstream {
   virtual void writeInt32 (kuint32 n);
   virtual void  writeFloat32 (kfloat32 n);
   virtual void  writeFloat64 (kfloat64 n);
-  
+
   virtual void  readInt16 (kuint16& n);
   virtual void  readInt32 (kuint32& n);
   virtual void  readFloat32 (kfloat32& n);
@@ -91,17 +138,14 @@ class fnetorderstream : public fstream {
 
 class frnetorderstream : public fnetorderstream {
  public:
-  frnetorderstream (const char* filename, int mode)
+  frnetorderstream (const char* filename, std::ios::openmode mode)
     : fnetorderstream (filename, mode) {}
 
-  frnetorderstream (const int fd)
-    : fnetorderstream (fd) {}
-
   virtual void writeInt16 (kuint16 n);
   virtual void writeInt32 (kuint32 n);
   virtual void writeFloat32 (kfloat32 n);
   virtual void writeFloat64 (kfloat64 n);
-  
+
   virtual void readInt16 (kuint16& n);
   virtual void readInt32 (kuint32& n);
   virtual void readFloat32 (kfloat32& n);