From 59d0884ed43a119a1c57fca65689ea9ee55ccfa8 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sun, 17 Dec 2000 19:30:02 +0000 Subject: [PATCH] r271: Added logic for sstream inclusion --- ChangeLog | 2 +- src/dialogs.cpp | 9 +++++++-- src/views.cpp | 10 ++++++++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index ab4b002..4922d93 100644 --- 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 830cc00..f2102d0 100644 --- 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 #include "ctsupport.h" #include "ctsim.h" #include "scanner.h" @@ -55,6 +54,12 @@ #include "filter.h" #include "backprojectors.h" +#if defined(MSVC) || HAVE_SSTREAM +#include +#else +#include +#endif + StringValueAndTitleListBox::StringValueAndTitleListBox (wxDialog* pParent, int nChoices, const char* aszTitle[], const char* aszValue[]) : wxListBox () diff --git a/src/views.cpp b/src/views.cpp index cd16c7c..2ee032f 100644 --- 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 #include "backprojectors.h" #include "reconstruct.h" #include "timer.h" + +#if defined(MSVC) || HAVE_SSTREAM +#include +#else +#include +#endif + // ImageFileCanvas -- 2.34.1