r261: Use explicit std:: namespace

[ctsim.git] / include / ct.h

diff --git a/include/ct.h b/include/ct.h
index 8750cab54e24cc192f5342d24e99c45fba7f704b..e920a562bcf4a1ad503779b89b6afa49856d79ce 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
 **
-**  $Id: ct.h,v 1.34 2000/11/28 14:54:07 kevin Exp $
+**  $Id: ct.h,v 1.45 2000/12/16 06:12:47 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
@@ -28,34 +28,72 @@
 #ifndef CT_H
 #define CT_H
 
-#ifdef _WIN32
-  extern "C" {int strcasecmp(const char*, const char*);}
+#ifdef MSVC
+ // extern "C" {int strcasecmp(const char*, const char*);}
   typedef long off_t;
-  #define HAVE_STRING_H 1
-  #include <fcntl.h>
-  #define strcasecmp stricmp
-  #define strncasecmp strnicmp
+  #define HAVE_STRING_H 1\r
+  #include <fcntl.h>\r
+  #define strdup _strdup
+  #define strcasecmp _stricmp
+  #define strncasecmp _strnicmp
 #endif
 
 #ifdef HAVE_CONFIG_H
   #include <config.h>
 #endif
-
-#include <cmath>
+\r
+#define HAVE_ANSI_CPP 1
+#ifdef HAVE_ANSI_CPP
 #include <complex>
+#include <cmath>
 #include <cstdio>
 #include <cctype>
+#include <cstring>
+#include <cstddef>
+#include <cstdarg>
+#include <cstdlib>
+\r
+#if defined(MSVC) || HAVE_SSTREAM\r
+#include <sstream>
+#else\r
+#include <sstream_subst>
+#endif\r
+\r
 #include <fstream>
 #include <iostream>
-#include <sstream>
-#include <string>
+#include <string>\r
 #include <iterator>
 #include <algorithm>
 #include <exception>
 #include <stdexcept>
 #include <memory>
 
-#define __MATH_H__ 1
+#else
+
+#ifdef HAVE_CTYPE_H
+#include <ctype.h>
+#endif
+#ifdef HAVE_MATH_H
+#include <math.h>
+#endif
+#ifdef HAVE_STDIO_H
+#include <stdio.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STDARG_H
+#include <stdarg.h>
+#endif
+
+#endif
+
 
 #ifdef HAVE_DMALLOC
 #include <dmalloc.h>
@@ -77,18 +115,7 @@ extern "C" {
 #endif
 #endif
 
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef HAVE_STDDEF_H
-#include <stddef.h>
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_STDARG_H
-#include <stdarg.h>
-#endif
+
 #ifdef  HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -124,25 +151,11 @@ extern "C" {
 #endif
 
 
-#if 0
-#ifdef HAVE_CTYPE_H
-#include <ctype.h>
-#endif
-#ifdef HAVE_MATH_H
-#include <math.h>
-#endif
-#ifdef HAVE_STDIO_H
-#include <stdio.h>
-#endif
-#endif
-
 #ifdef HAVE_FFTW
 #include <rfftw.h>
 #include <fftw.h>
 #endif
 
-using namespace std;
-
 #ifdef HAVE_MPI
 #include "mpi++.h"
 #include "mpiworld.h"