r242: *** empty log message ***

diff --git a/include/array2dfile.h b/include/array2dfile.h
index 0b3da841d43cf135380a14ee6533e40f14bc40f2..9af82a70d8c7949f8c7310d65e8cc5dc4fda7b86 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
 **
 **  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.8 2000/12/04 04:15:48 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
 **
 **  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,7 +28,7 @@
 #ifndef ARRAY2DFILE_H
 #define ARRAY2DFILE_H
 
 #ifndef ARRAY2DFILE_H
 #define ARRAY2DFILE_H
 

-#ifndef WIN32
+#ifndef MSVC

 #include <unistd.h>
 #endif
 
 #include <unistd.h>
 #endif
 

diff --git a/include/ct.h b/include/ct.h
index aa4cbb095bf4dbb79a690bbe68e7017ae87b58bf..ad04701926bbe9f4589d2c886bf197c78cbec345 100644 (file)
--- a/include/ct.h
+++ b/include/ct.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **

-**  $Id: ct.h,v 1.39 2000/12/04 03:09:00 kevin Exp $
+**  $Id: ct.h,v 1.40 2000/12/04 04:15:48 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
 **
 **  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


@@ -53,10 +53,7 @@
 #include <cstdlib>
 using namespace std;
 
 #include <cstdlib>
 using namespace std;
 

-#ifndef WIN32

 #include <sstream>
 #include <sstream>

-#endif
-

 #include <fstream>
 #include <iostream>
 #include <string>
 #include <fstream>
 #include <iostream>
 #include <string>

diff --git a/include/fnetorderstream.h b/include/fnetorderstream.h
index cf20869cf4f7222aff48fbd3d7f799b48313e6d6..b682105b9dfecb322a6f06163148193e5b67a7db 100644 (file)
--- a/include/fnetorderstream.h
+++ b/include/fnetorderstream.h
@@ -74,15 +74,15 @@ class fnetorderstream : public fstream {
   ~fnetorderstream (void)
       {}
 
   ~fnetorderstream (void)
       {}
 

-  virtual  writeInt16 (kuint16 n);
-  virtual  writeInt32 (kuint32 n);
-  virtual  writeFloat32 (kfloat32 n);
-  virtual  writeFloat64 (kfloat64 n);
+  virtual void writeInt16 (kuint16 n);
+  virtual void writeInt32 (kuint32 n);
+  virtual void  writeFloat32 (kfloat32 n);
+  virtual void  writeFloat64 (kfloat64 n);

   
   

-  virtual  readInt16 (kuint16& n);
-  virtual  readInt32 (kuint32& n);
-  virtual  readFloat32 (kfloat32& n);
-  virtual  readFloat64 (kfloat64& n);
+  virtual void  readInt16 (kuint16& n);
+  virtual void  readInt32 (kuint32& n);
+  virtual void  readFloat32 (kfloat32& n);
+  virtual void  readFloat64 (kfloat64& n);

 };
 
 
 };
 
 


@@ -91,15 +91,15 @@ class frnetorderstream : public fnetorderstream {
   frnetorderstream (const char* filename, int mode)
     : fnetorderstream (filename, mode) {}
 
   frnetorderstream (const char* filename, int mode)
     : fnetorderstream (filename, mode) {}
 

-  writeInt16 (kuint16 n);
-  writeInt32 (kuint32 n);
-  writeFloat32 (kfloat32 n);
-  writeFloat64 (kfloat64 n);
+  virtual void writeInt16 (kuint16 n);
+  virtual void writeInt32 (kuint32 n);
+  virtual void writeFloat32 (kfloat32 n);
+  virtual void writeFloat64 (kfloat64 n);

   
   

-  readInt16 (kuint16& n);
-  readInt32 (kuint32& n);
-  readFloat32 (kfloat32& n);
-  readFloat64 (kfloat64& n);
+  virtual void readInt16 (kuint16& n);
+  virtual void readInt32 (kuint32& n);
+  virtual void readFloat32 (kfloat32& n);
+  virtual void readFloat64 (kfloat64& n);

 };
 
 #endif
 };
 
 #endif

diff --git a/include/imagefile.h b/include/imagefile.h
index a7600dcce5cc33b9c563e5ead21c0ee9103f0d99..6b6b4d530fac706ddf664dedb534ee74dc13df68 100644 (file)
--- a/include/imagefile.h
+++ b/include/imagefile.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **

-**  $Id: imagefile.h,v 1.18 2000/07/13 07:03:21 kevin Exp $
+**  $Id: imagefile.h,v 1.19 2000/12/04 04:15:48 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
 **
 **  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,9 +28,11 @@
 #ifndef IMAGEFILE_H
 #define IMAGEFILE_H
 
 #ifndef IMAGEFILE_H
 #define IMAGEFILE_H
 

+#ifndef MSVC\r
+#include <unistd.h>\r
+#endif\r

 #include <string>
 #include <sys/types.h>
 #include <string>
 #include <sys/types.h>

-#include <unistd.h>

 #include <fstream>
 #include <iostream>
 #include "ctsupport.h"
 #include <fstream>
 #include <iostream>
 #include "ctsupport.h"

diff --git a/include/sgp.h b/include/sgp.h
index fce79a67509b650629d45c3d1ad8cd6e4cdb0aac..4ee4638d346d84eda52d492c17fabe1418a8828c 100644 (file)
--- a/include/sgp.h
+++ b/include/sgp.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **

-**  $Id: sgp.h,v 1.18 2000/09/04 09:06:46 kevin Exp $
+**  $Id: sgp.h,v 1.19 2000/12/04 04:15:48 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
 **
 **  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


@@ -171,7 +171,7 @@ public:
       MARK_BSQUARE = 9,        // big open square 
       MARK_BDIAMOND = 10,      // big open diamond 
   };
       MARK_BSQUARE = 9,        // big open square 
       MARK_BDIAMOND = 10,      // big open diamond 
   };

-  static const int MARK_COUNT = 11;
+  enum  { MARK_COUNT = 11, };

   static const unsigned char MARKER_BITMAP[MARK_COUNT][5];
 
   SGP (const SGPDriver& driver);
   static const unsigned char MARKER_BITMAP[MARK_COUNT][5];
 
   SGP (const SGPDriver& driver);

diff --git a/include/sstream b/include/sstream
index 69d4ee2804672e0fda8b344d5038c1f2213dde94..c89ffdc3e36fa99868abe97f7391003001c06e3b 100644 (file)
--- a/include/sstream
+++ b/include/sstream
@@ -1,5 +1,7 @@
 #ifndef __CM_SSTREAM__
 #define __CM_SSTREAM__
 #ifndef __CM_SSTREAM__
 #define __CM_SSTREAM__

+\r
+#ifndef MSVC\r

 
 #include <string>
 #include <cstdio>
 
 #include <string>
 #include <cstdio>


@@ -105,6 +107,8 @@ inline istringstream & getline (istringstream & src_stream, string & str, char s
 }
 
 }   // End of namespace std
 }
 
 }   // End of namespace std

+\r
+#endif\r

 
 #endif
 
 
 #endif
 

diff --git a/libctsim/array2dfile.cpp b/libctsim/array2dfile.cpp
index 121f3c862a3bcad3b1940c07ef7303ad168591b4..f918471f54e7278a5789f5095efddaae9f091231 100644 (file)
--- a/libctsim/array2dfile.cpp
+++ b/libctsim/array2dfile.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **

-**  $Id: array2dfile.cpp,v 1.12 2000/12/04 03:42:00 kevin Exp $
+**  $Id: array2dfile.cpp,v 1.13 2000/12/04 04:15:48 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
 **
 **  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


@@ -27,9 +27,8 @@
 
 #include "array2dfile.h"
 #include <ctime>
 
 #include "array2dfile.h"
 #include <ctime>

-#ifndef WIN32

 #include <sstream>
 #include <sstream>

-#endif
+

 
 using namespace std;
 
 
 using namespace std;
 

diff --git a/libctsupport/fnetorderstream.cpp b/libctsupport/fnetorderstream.cpp
index 569984c22a5f293e754cf05e01743f0b0650b676..ffa26f0a6a5b6f7363a9dc267b9521340500d171 100644 (file)
--- a/libctsupport/fnetorderstream.cpp
+++ b/libctsupport/fnetorderstream.cpp
@@ -48,133 +48,133 @@ ConvertReverseNetworkOrder (void* buffer, size_t bytes)
 #endif    
 }
 
 #endif    
 }
 

-fnetorderstream& fnetorderstream::writeInt16 (kuint16 n) {
+void\r
+fnetorderstream::writeInt16 (kuint16 n) {

 #ifndef WORDS_BIGENDIAN
   SwapBytes2 (&n);
 #endif
   write (reinterpret_cast<const char*>(&n), 2);
 #ifndef WORDS_BIGENDIAN
   SwapBytes2 (&n);
 #endif
   write (reinterpret_cast<const char*>(&n), 2);

-  return (*this);

 }
 
 }
 

-fnetorderstream& fnetorderstream::writeInt32 (kuint32 n) {
+void\r
+fnetorderstream::writeInt32 (kuint32 n) {

 #ifndef WORDS_BIGENDIAN
   SwapBytes4(&n);
 #endif
   write (reinterpret_cast<const char*>(&n), 4);
 #ifndef WORDS_BIGENDIAN
   SwapBytes4(&n);
 #endif
   write (reinterpret_cast<const char*>(&n), 4);

-  return (*this);

 }
 
 }
 

-fnetorderstream& fnetorderstream::writeFloat32 (kfloat32 n) {
+void\r
+fnetorderstream::writeFloat32 (kfloat32 n) {

 #ifndef WORDS_BIGENDIAN
   SwapBytes4 (&n);
 #endif
   write (reinterpret_cast<const char*>(&n), 4);
 #ifndef WORDS_BIGENDIAN
   SwapBytes4 (&n);
 #endif
   write (reinterpret_cast<const char*>(&n), 4);

-  return (*this);

 }
 
 }
 

-fnetorderstream& fnetorderstream::writeFloat64 (kfloat64 n) {
+void\r
+fnetorderstream::writeFloat64 (kfloat64 n) {

 #ifndef WORDS_BIGENDIAN
   SwapBytes8 (&n);
 #endif
   write (reinterpret_cast<const char*>(&n), 8);
 #ifndef WORDS_BIGENDIAN
   SwapBytes8 (&n);
 #endif
   write (reinterpret_cast<const char*>(&n), 8);

-  return (*this);

 }
 
 }
 

-fnetorderstream& fnetorderstream::readInt16 (kuint16& n) {
+void\r
+fnetorderstream::readInt16 (kuint16& n) {

   read (reinterpret_cast<char*>(&n), 2);
 #ifndef WORDS_BIGENDIAN
   SwapBytes2 (&n);
 #endif
   read (reinterpret_cast<char*>(&n), 2);
 #ifndef WORDS_BIGENDIAN
   SwapBytes2 (&n);
 #endif

-  return (*this);

 }
 
 }
 

-fnetorderstream& fnetorderstream::readInt32 (kuint32& n) {
+void\r
+fnetorderstream::readInt32 (kuint32& n) {

   read (reinterpret_cast<char*>(&n), 4);
 #ifndef WORDS_BIGENDIAN
   SwapBytes4 (&n);
 #endif
   read (reinterpret_cast<char*>(&n), 4);
 #ifndef WORDS_BIGENDIAN
   SwapBytes4 (&n);
 #endif

-  return (*this);

 }
 
 }
 

-fnetorderstream& fnetorderstream::readFloat32 (kfloat32& n) {
+void\r
+fnetorderstream::readFloat32 (kfloat32& n) {

   read (reinterpret_cast<char*>(&n), 4);
 #ifndef WORDS_BIGENDIAN
   SwapBytes4 (&n);
 #endif
   read (reinterpret_cast<char*>(&n), 4);
 #ifndef WORDS_BIGENDIAN
   SwapBytes4 (&n);
 #endif

-  return (*this);

 }
 
 }
 

-fnetorderstream& fnetorderstream::readFloat64 (kfloat64& n) {
+void\r
+fnetorderstream::readFloat64 (kfloat64& n) {

   read (reinterpret_cast<char*>(&n), 8);
 #ifndef WORDS_BIGENDIAN
   SwapBytes8 (&n);
 #endif
   read (reinterpret_cast<char*>(&n), 8);
 #ifndef WORDS_BIGENDIAN
   SwapBytes8 (&n);
 #endif

-  return (*this);

 }
 
 
 
 }
 
 
 

-frnetorderstream& frnetorderstream::writeInt16 (kuint16 n) {
+void\r
+frnetorderstream::writeInt16 (kuint16 n) {

 #ifdef WORDS_BIGENDIAN
   SwapBytes2 (&n);
 #endif
   write (reinterpret_cast<char*>(&n), 2);
 #ifdef WORDS_BIGENDIAN
   SwapBytes2 (&n);
 #endif
   write (reinterpret_cast<char*>(&n), 2);

-  return (*this);

 }
 
 }
 

-frnetorderstream& frnetorderstream::writeInt32 (kuint32 n) {
+void\r
+frnetorderstream::writeInt32 (kuint32 n) {

 #ifdef WORDS_BIGENDIAN
   SwapBytes4(&n);
 #endif
   write (reinterpret_cast<char*>(&n), 4);
 #ifdef WORDS_BIGENDIAN
   SwapBytes4(&n);
 #endif
   write (reinterpret_cast<char*>(&n), 4);

-  return (*this);

 }
 
 }
 

-frnetorderstream& frnetorderstream::writeFloat32 (kfloat32 n) {
+void \r
+frnetorderstream::writeFloat32 (kfloat32 n) {

 #ifdef WORDS_BIGENDIAN
   SwapBytes4 (&n);
 #endif
   write (reinterpret_cast<char*>(&n), 4);
 #ifdef WORDS_BIGENDIAN
   SwapBytes4 (&n);
 #endif
   write (reinterpret_cast<char*>(&n), 4);

-  return (*this);

 }
 
 }
 

-frnetorderstream& frnetorderstream::writeFloat64 (kfloat64 n) {
+void \r
+frnetorderstream::writeFloat64 (kfloat64 n) {

 #ifdef WORDS_BIGENDIAN
   SwapBytes8 (&n);
 #endif
   write (reinterpret_cast<char*>(&n), 8);
 #ifdef WORDS_BIGENDIAN
   SwapBytes8 (&n);
 #endif
   write (reinterpret_cast<char*>(&n), 8);

-  return (*this);

 }
 
 }
 

-frnetorderstream& frnetorderstream::readInt16 (kuint16& n) {
+void \r
+frnetorderstream::readInt16 (kuint16& n) {

   read (reinterpret_cast<char*>(&n), 2);
 #ifdef WORDS_BIGENDIAN
   SwapBytes2 (&n);
 #endif
   read (reinterpret_cast<char*>(&n), 2);
 #ifdef WORDS_BIGENDIAN
   SwapBytes2 (&n);
 #endif

-  return (*this);

 }
 
 }
 

-frnetorderstream& frnetorderstream::readInt32 (kuint32& n) {
+void \r
+frnetorderstream::readInt32 (kuint32& n) {

   read (reinterpret_cast<char*>(&n), 4);
 #ifdef WORDS_BIGENDIAN
   SwapBytes4 (&n);
 #endif
   read (reinterpret_cast<char*>(&n), 4);
 #ifdef WORDS_BIGENDIAN
   SwapBytes4 (&n);
 #endif

-  return (*this);

 }
 
 }
 

-frnetorderstream& frnetorderstream::readFloat32 (kfloat32& n) {
+void\r
+frnetorderstream::readFloat32 (kfloat32& n) {

   read (reinterpret_cast<char*>(&n), 4);
 #ifdef WORDS_BIGENDIAN
   SwapBytes4 (&n);
 #endif
   read (reinterpret_cast<char*>(&n), 4);
 #ifdef WORDS_BIGENDIAN
   SwapBytes4 (&n);
 #endif

-  return (*this);

 }
 
 }
 

-frnetorderstream& frnetorderstream::readFloat64 (kfloat64& n) {
+void\r
+frnetorderstream::readFloat64 (kfloat64& n) {

   read (reinterpret_cast<char*>(&n), 8);
 #ifdef WORDS_BIGENDIAN
   SwapBytes8 (&n);
 #endif
   read (reinterpret_cast<char*>(&n), 8);
 #ifdef WORDS_BIGENDIAN
   SwapBytes8 (&n);
 #endif

-  return (*this);

 }
 
 }