r2088: *** empty log message ***

diff --git a/debian/changelog b/debian/changelog
index 75d9f9cd95088f15fc6fee908191458c923a9096..1b789df8ca01af5213cf1d8781acaa78f73bb2e3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
 ctsim (3.5.2-2) unstable; urgency=low
 
   * Split online help into ctsim-help package
 ctsim (3.5.2-2) unstable; urgency=low
 
   * Split online help into ctsim-help package

-  
+

   * Split pdf and html documentation into ctsim-doc package
 
   * Split pdf and html documentation into ctsim-doc package
 

+  * Removed definition of ostringstream class (Closes: #148379)
+

  -- Kevin Rosenberg <kevin@pal.med-info.com>  Tue, 28 May 2002 01:16:28 -0600
 
 ctsim (3.5.2-1) unstable; urgency=low
  -- Kevin Rosenberg <kevin@pal.med-info.com>  Tue, 28 May 2002 01:16:28 -0600
 
 ctsim (3.5.2-1) unstable; urgency=low

diff --git a/include/fnetorderstream.h b/include/fnetorderstream.h
index f58550b32923a76944141e1ae48af764ba93fced..5e1336a21accf2d29ff4f80431543919c9f6ce64 100644 (file)
--- a/include/fnetorderstream.h
+++ b/include/fnetorderstream.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **

-**  $Id: fnetorderstream.h,v 1.9 2001/03/13 04:44:25 kevin Exp $
+**  $Id: fnetorderstream.h,v 1.10 2002/05/28 18:43:16 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


@@ -115,11 +115,17 @@ SwapBytes8IfLittleEndian (void* buffer)
 void ConvertNetworkOrder (void* buffer, size_t bytes);
 void ConvertReverseNetworkOrder (void* buffer, size_t bytes);
 
 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:
 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) {}
   fnetorderstream (const char* filename, int mode)
          : fstream (filename, mode) {}

+#endif

 
   ~fnetorderstream (void)
       {}
 
   ~fnetorderstream (void)
       {}


@@ -138,9 +144,13 @@ class fnetorderstream : public fstream {
 
 class frnetorderstream : public fnetorderstream {
  public:
 
 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) {}
   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 writeInt16 (kuint16 n);
   virtual void writeInt32 (kuint32 n);
   virtual void writeFloat32 (kfloat32 n);

diff --git a/include/sstream_subst b/include/sstream_subst
index c89ffdc3e36fa99868abe97f7391003001c06e3b..bb9080a72a246b2a5692ad1e04523e8f746335f2 100644 (file)
--- a/include/sstream_subst
+++ b/include/sstream_subst
@@ -1,7 +1,8 @@
 #ifndef __CM_SSTREAM__
 #define __CM_SSTREAM__
 \r
 #ifndef __CM_SSTREAM__
 #define __CM_SSTREAM__
 \r

-#ifndef MSVC\r
+#if 0
+//#ifndef MSVC\r

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

diff --git a/libctgraphics/ezplot.cpp b/libctgraphics/ezplot.cpp
index cfab1d8ecc4ba6496554597b5de5fd814716fc1a..cf98ba47d4249deef3c4b89424d4841c6a807bb6 100644 (file)
--- a/libctgraphics/ezplot.cpp
+++ b/libctgraphics/ezplot.cpp
@@ -6,7 +6,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **

-**  $Id: ezplot.cpp,v 1.33 2001/03/11 15:27:30 kevin Exp $
+**  $Id: ezplot.cpp,v 1.34 2002/05/28 18:43:16 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


@@ -1234,7 +1234,7 @@ loop:
 */
 
 static inline double 
 */
 
 static inline double 

-trunc (double x)
+my_trunc (double x)

 {
   double integer;
   
 {
   double integer;
   


@@ -1265,7 +1265,7 @@ EZPlot::make_numfmt (char *fmtstr, int *fldwid, int *nfrac, double minval, doubl
     
     if (*nfrac < 0) {          // calculate frac 
       delta /= pow (10., floor(logt)); // scale delta 
     
     if (*nfrac < 0) {          // calculate frac 
       delta /= pow (10., floor(logt)); // scale delta 

-      frac = static_cast<int>(fabs(trunc(log10(delta)))) + 1;
+      frac = static_cast<int>(fabs(my_trunc(log10(delta)))) + 1;

       if (frac < 1)
         frac = 1;              // to be safe, add decimal pt 
     } else                     // use users' frac 
       if (frac < 1)
         frac = 1;              // to be safe, add decimal pt 
     } else                     // use users' frac 


@@ -1276,7 +1276,7 @@ EZPlot::make_numfmt (char *fmtstr, int *fldwid, int *nfrac, double minval, doubl
       ++wid;
     sprintf (fmtstr, "%s%d%s%d%s", "%", wid, ".", frac, "g");
   } else {                     // use fixed format 
       ++wid;
     sprintf (fmtstr, "%s%d%s%d%s", "%", wid, ".", frac, "g");
   } else {                     // use fixed format 

-    wid = static_cast<int>(trunc(logt)) + 1;
+    wid = static_cast<int>(my_trunc(logt)) + 1;

     if (wid < 1)
       wid = 1;
     if (minval < 0. || maxval < 0.)
     if (wid < 1)
       wid = 1;
     if (minval < 0. || maxval < 0.)


@@ -1286,7 +1286,7 @@ EZPlot::make_numfmt (char *fmtstr, int *fldwid, int *nfrac, double minval, doubl
       if (delta >= 0.999999)
         frac = 1;              // add a decimal pt to be safe 
       else
       if (delta >= 0.999999)
         frac = 1;              // add a decimal pt to be safe 
       else

-        frac = static_cast<int>(fabs(trunc(log10(delta)))) + 1;
+        frac = static_cast<int>(fabs(my_trunc(log10(delta)))) + 1;

     } else                     // use users' frac 
       frac = *nfrac;
     
     } else                     // use users' frac 
       frac = *nfrac;
     

diff --git a/libctsim/array2dfile.cpp b/libctsim/array2dfile.cpp
index bda792565100e5057cf91924008bc9f81d48953c..88e11e16c236a7a7a68e228978e7f7094a4c82ca 100644 (file)
--- a/libctsim/array2dfile.cpp
+++ b/libctsim/array2dfile.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **

-**  $Id: array2dfile.cpp,v 1.28 2001/01/27 21:02:20 kevin Exp $
+**  $Id: array2dfile.cpp,v 1.29 2002/05/28 18:43:16 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


@@ -358,11 +358,8 @@ Array2dFile::fileRead (const char* const filename)
 {
   m_filename = filename;
   
 {
   m_filename = filename;
   

-#ifdef MSVC

   frnetorderstream fs (m_filename.c_str(), std::ios::out | std::ios::in | std::ios::binary);
   frnetorderstream fs (m_filename.c_str(), std::ios::out | std::ios::in | std::ios::binary);

-#else
-  frnetorderstream fs (m_filename.c_str(), std::ios::out | std::ios::in | std::ios::binary | std::ios::nocreate);
-#endif
+

   if (fs.fail()) {
     sys_error (ERR_WARNING, "Unable to open file %s [fileRead]", m_filename.c_str());
     return false;
   if (fs.fail()) {
     sys_error (ERR_WARNING, "Unable to open file %s [fileRead]", m_filename.c_str());
     return false;

diff --git a/libctsim/phantom.cpp b/libctsim/phantom.cpp
index 4d2cc28fbbc03896eaed2f6bfbcb72e331640dc8..8d02d1115865e206c90e49e28f58f4ab8d518b33 100644 (file)
--- a/libctsim/phantom.cpp
+++ b/libctsim/phantom.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **

-**  $Id: phantom.cpp,v 1.31 2001/03/24 05:28:28 kevin Exp $
+**  $Id: phantom.cpp,v 1.32 2002/05/28 18:43:16 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


@@ -217,7 +217,7 @@ Phantom::createFromFile (const char* const fname)
 bool
 Phantom::fileWrite (const char* const fname)
 {
 bool
 Phantom::fileWrite (const char* const fname)
 {

-  fstream file (fname, ios::out);
+  fstream file (fname, std::ios::out);

   
   if (! file.fail())
     printDefinitions (file);
   
   if (! file.fail())
     printDefinitions (file);

diff --git a/libctsim/projections.cpp b/libctsim/projections.cpp
index b2d3c4aabc39cfcc37cc1eea20887322a5c9eebf..2ca1ce38e12af9fbf708595028df1f9dc9c3fbc8 100644 (file)
--- a/libctsim/projections.cpp
+++ b/libctsim/projections.cpp
@@ -8,7 +8,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **

-**  $Id: projections.cpp,v 1.76 2001/09/24 11:29:41 kevin Exp $
+**  $Id: projections.cpp,v 1.77 2002/05/28 18:43:16 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


@@ -650,7 +650,7 @@ Projections::read (const char* filename)
 #ifdef MSVC
   frnetorderstream fileRead (m_filename.c_str(), std::ios::in | std::ios::binary);
 #else
 #ifdef MSVC
   frnetorderstream fileRead (m_filename.c_str(), std::ios::in | std::ios::binary);
 #else

-  frnetorderstream fileRead (m_filename.c_str(), std::ios::in | std::ios::binary | std::ios::nocreate);
+  frnetorderstream fileRead (m_filename.c_str(), std::ios::in | std::ios::binary); // | std::ios::nocreate);

 #endif
   
   if (fileRead.fail())
 #endif
   
   if (fileRead.fail())

diff --git a/libctsupport/plotfile.cpp b/libctsupport/plotfile.cpp
index a99bf1d80cf356cc3af8be2f05ed363838b2554e..fb3759da0df91c125994dac94707667d742257c1 100644 (file)
--- a/libctsupport/plotfile.cpp
+++ b/libctsupport/plotfile.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **

-**  $Id: plotfile.cpp,v 1.13 2001/03/10 23:14:16 kevin Exp $
+**  $Id: plotfile.cpp,v 1.14 2002/05/28 18:43:16 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


@@ -191,7 +191,7 @@ PlotFile::fileRead (const char* const filename)
 #ifdef MSVC
   fstream fs (m_strFilename.c_str(), std::ios::in);
 #else
 #ifdef MSVC
   fstream fs (m_strFilename.c_str(), std::ios::in);
 #else

-  fstream fs (m_strFilename.c_str(), std::ios::in | std::ios::nocreate);
+  fstream fs (m_strFilename.c_str(), std::ios::in); // | std::ios::nocreate);

 #endif
   
   if (fs.fail()) {
 #endif
   
   if (fs.fail()) {

diff --git a/src/docs.h b/src/docs.h
index e2c7d1f0accc1c729259adf20e38b947667d2d2d..966cdddece2ea65592bad0f17b20452588fad1ef 100644 (file)
--- a/src/docs.h
+++ b/src/docs.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **

-**  $Id: docs.h,v 1.30 2001/03/11 18:52:03 kevin Exp $
+**  $Id: docs.h,v 1.31 2002/05/28 18:43:16 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


@@ -252,7 +252,7 @@ typedef GLfloat glTripleFloat[3];
 
 class Graph3dFileDocument: public wxDocument
 {
 
 class Graph3dFileDocument: public wxDocument
 {

-  friend Graph3dFileView;
+  friend class Graph3dFileView;

 
  private:
   DECLARE_DYNAMIC_CLASS(Graph3dFileDocument)
 
  private:
   DECLARE_DYNAMIC_CLASS(Graph3dFileDocument)

diff --git a/src/graph3dview.h b/src/graph3dview.h
index 7933f17b5853eae97a10b334092de0eceffcc012..90b6d44191f1df25788af53b65c1e2f666a8997e 100644 (file)
--- a/src/graph3dview.h
+++ b/src/graph3dview.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **

-**  $Id: graph3dview.h,v 1.8 2001/03/21 21:45:31 kevin Exp $
+**  $Id: graph3dview.h,v 1.9 2002/05/28 18:43:16 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


@@ -39,7 +39,7 @@
 class Graph3dFileCanvas;
 class Graph3dFileView : public wxView 
 {
 class Graph3dFileCanvas;
 class Graph3dFileView : public wxView 
 {

-  friend Graph3dFileCanvas;
+  friend class Graph3dFileCanvas;

 
 private:
   DECLARE_DYNAMIC_CLASS(Graph3dFileView)   
 
 private:
   DECLARE_DYNAMIC_CLASS(Graph3dFileView)