X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Ffnetorderstream.h;h=fdce3eaa465a1d6aba4a1be2941f00df79ae37cc;hb=dca8d386ab6a4e33050b456cff4547d6adfdf249;hp=5e1336a21accf2d29ff4f80431543919c9f6ce64;hpb=c0f892798de8f89715266150f7d8e413f2cf29fe;p=ctsim.git diff --git a/include/fnetorderstream.h b/include/fnetorderstream.h index 5e1336a..fdce3ea 100644 --- a/include/fnetorderstream.h +++ b/include/fnetorderstream.h @@ -7,9 +7,7 @@ ** Date Started: Sep 2000 ** ** This is part of the CTSim program -** Copyright (c) 1983-2001 Kevin Rosenberg -** -** $Id: fnetorderstream.h,v 1.10 2002/05/28 18:43:16 kevin Exp $ +** Copyright (c) 1983-2009 Kevin Rosenberg ** ** 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 @@ -115,17 +113,11 @@ SwapBytes8IfLittleEndian (void* buffer) void ConvertNetworkOrder (void* buffer, size_t bytes); void ConvertReverseNetworkOrder (void* buffer, size_t bytes); -#define GPP3 1 using std::fstream; class fnetorderstream : public fstream { public: -#if GPP3 fnetorderstream (const char* filename, std::ios::openmode mode) - : fstream (filename, mode) {} -#else - fnetorderstream (const char* filename, int mode) - : fstream (filename, mode) {} -#endif + : fstream (filename, mode) {} ~fnetorderstream (void) {} @@ -134,7 +126,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); @@ -144,18 +136,14 @@ class fnetorderstream : public fstream { class frnetorderstream : public fnetorderstream { public: -#if GPP3 frnetorderstream (const char* filename, std::ios::openmode mode) : fnetorderstream (filename, mode) {} -#else - frnetorderstream (const char* filename, int mode) - : fnetorderstream (filename, mode) {} -#endif + 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);