r271: Added logic for sstream inclusion

diff --git a/ChangeLog b/ChangeLog
index ab4b002a246db82280be6cfbb43354ccccb44e90..4922d939ce9b0728a55c83c1a49e4d2b812319ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2.1.0 - 12/17/00 
+2.1.0 - 12/18/00 
    Modifications for Microsoft Visual C++ compilation.
    First Microsoft Windows GUI version
    Improved sorting to find median in ImageFile::statistics

diff --git a/src/dialogs.cpp b/src/dialogs.cpp
index 830cc0073638558df749c9bd2185578ba7188df4..f2102d03931d146b127a43b7b5c2bcb85a873c01 100644 (file)
--- a/src/dialogs.cpp
+++ b/src/dialogs.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: dialogs.cpp,v 1.16 2000/12/17 19:07:46 kevin Exp $
+**  $Id: dialogs.cpp,v 1.17 2000/12/17 19:30: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
@@ -47,7 +47,6 @@
 #include "wx/statline.h"
 #include "wx/sizer.h"
 #include "dialogs.h"
-#include <sstream>
 #include "ctsupport.h"
 #include "ctsim.h"
 #include "scanner.h"
@@ -55,6 +54,12 @@
 #include "filter.h"
 #include "backprojectors.h"
 
+#if defined(MSVC) || HAVE_SSTREAM\r
+#include <sstream>\r
+#else\r
+#include <sstream_subst>\r
+#endif\r
+\r
 
 StringValueAndTitleListBox::StringValueAndTitleListBox (wxDialog* pParent, int nChoices, const char* aszTitle[], const char* aszValue[])
   : wxListBox ()

diff --git a/src/views.cpp b/src/views.cpp
index cd16c7c1d7f2588dc20732769c98571814e1872b..2ee032f8e7b67ad45f3c05bb1ef7298edd170153 100644 (file)
--- a/src/views.cpp
+++ b/src/views.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: views.cpp,v 1.25 2000/12/16 06:12:47 kevin Exp $
+**  $Id: views.cpp,v 1.26 2000/12/17 19:30: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
@@ -50,10 +50,16 @@
 #include "dialogs.h"
 #include "dlgprojections.h"
 #include "dlgreconstruct.h"
-#include <sstream>
 #include "backprojectors.h"
 #include "reconstruct.h"
 #include "timer.h"
+\r
+#if defined(MSVC) || HAVE_SSTREAM\r
+#include <sstream>\r
+#else\r
+#include <sstream_subst>\r
+#endif\r
+\r
 
 // ImageFileCanvas