Removed "using namespace std" statements.

Removed most of the "using namespace std" statements in DCMTK implementation files, since these are in general undesirable. This will probably break builds on a few platforms (such as VS 2008) that will be fixed with a follow-up commit.
prodrigmd · Mar 22, 2021 · 8f2df23 · 8f2df23
1 parent 58484a6
commit 8f2df23
Show file tree

Hide file tree

Showing 24 changed files with 54 additions and 41 deletions.
diff --git a/dcmimage/libsrc/diqtfs.cc b/dcmimage/libsrc/diqtfs.cc
@@ -23,9 +23,9 @@
 #include "dcmtk/config/osconfig.h"
 #include "dcmtk/dcmimage/diqtfs.h"
 #include "dcmtk/ofstd/ofstd.h"       /* for OFStandard::myrand_r */
+#include "dcmtk/ofstd/ofstdinc.h"
 #include <ctime>
 
-using namespace std;
 
 BEGIN_EXTERN_C
 #include <sys/types.h> // needed for time()

diff --git a/dcmimage/libsrc/diqtpbox.cc b/dcmimage/libsrc/diqtpbox.cc
@@ -23,10 +23,10 @@
 #include "dcmtk/config/osconfig.h"
 #include "dcmtk/ofstd/ofcast.h"
 #include "dcmtk/dcmimage/diqtpbox.h"   /* for DcmQuantPixelBoxArray */
+#include "dcmtk/ofstd/ofstdinc.h"
 
 // Solaris defines qsort() in namespace std, other compilers don't...
-namespace std { }
-using namespace std;
+using STD_NAMESPACE qsort;
 
 BEGIN_EXTERN_C
 static int sumcompare(const void *x1, const void *x2)

diff --git a/dcmjpeg/libsrc/dipijpeg.cc b/dcmjpeg/libsrc/dipijpeg.cc
@@ -24,7 +24,7 @@
 #include "dcmtk/dcmdata/dctypes.h"
 #include "dcmtk/dcmimgle/diimage.h"
 #include "dcmtk/dcmjpeg/dipijpeg.h"
-
+#include "dcmtk/ofstd/ofstdinc.h"
 #include <csetjmp>
 
 BEGIN_EXTERN_C
@@ -41,8 +41,8 @@ BEGIN_EXTERN_C
 #endif
 
 // Solaris defines longjmp() in namespace std, other compilers don't...
-namespace std { }
-using namespace std;
+using STD_NAMESPACE longjmp;
+using STD_NAMESPACE jmp_buf;
 
 // private error handler struct
 struct DIEIJG8ErrorStruct

diff --git a/dcmjpeg/libsrc/djdijg12.cc b/dcmjpeg/libsrc/djdijg12.cc
@@ -23,7 +23,7 @@
 #include "dcmtk/dcmjpeg/djdijg12.h"
 #include "dcmtk/dcmjpeg/djcparam.h"
 #include "dcmtk/dcmdata/dcerror.h"
-
+#include "dcmtk/ofstd/ofstdinc.h"
 #include <csetjmp>
 
 // These two macros are re-defined in the IJG header files.
@@ -48,8 +48,8 @@ BEGIN_EXTERN_C
 #endif
 
 // Solaris defines longjmp() in namespace std, other compilers don't...
-namespace std { }
-using namespace std;
+using STD_NAMESPACE longjmp;
+using STD_NAMESPACE jmp_buf;
 
 // private error handler struct
 struct DJDIJG12ErrorStruct

diff --git a/dcmjpeg/libsrc/djdijg16.cc b/dcmjpeg/libsrc/djdijg16.cc
@@ -23,7 +23,7 @@
 #include "dcmtk/dcmjpeg/djdijg16.h"
 #include "dcmtk/dcmjpeg/djcparam.h"
 #include "dcmtk/dcmdata/dcerror.h"
-
+#include "dcmtk/ofstd/ofstdinc.h"
 #include <csetjmp>
 
 // These two macros are re-defined in the IJG header files.
@@ -48,8 +48,8 @@ BEGIN_EXTERN_C
 #endif
 
 // Solaris defines longjmp() in namespace std, other compilers don't...
-namespace std { }
-using namespace std;
+using STD_NAMESPACE longjmp;
+using STD_NAMESPACE jmp_buf;
 
 // private error handler struct
 struct DJDIJG16ErrorStruct

diff --git a/dcmjpeg/libsrc/djdijg8.cc b/dcmjpeg/libsrc/djdijg8.cc
@@ -23,7 +23,7 @@
 #include "dcmtk/dcmjpeg/djdijg8.h"
 #include "dcmtk/dcmjpeg/djcparam.h"
 #include "dcmtk/dcmdata/dcerror.h"
-
+#include "dcmtk/ofstd/ofstdinc.h"
 #include <csetjmp>
 
 // These two macros are re-defined in the IJG header files.
@@ -48,8 +48,8 @@ BEGIN_EXTERN_C
 #endif
 
 // Solaris defines longjmp() in namespace std, other compilers don't...
-namespace std { }
-using namespace std;
+using STD_NAMESPACE longjmp;
+using STD_NAMESPACE jmp_buf;
 
 // private error handler struct
 struct DJDIJG8ErrorStruct

diff --git a/dcmjpeg/libsrc/djeijg12.cc b/dcmjpeg/libsrc/djeijg12.cc
@@ -23,7 +23,7 @@
 #include "dcmtk/dcmjpeg/djeijg12.h"
 #include "dcmtk/dcmjpeg/djcparam.h"
 #include "dcmtk/dcmdata/dcerror.h"
-
+#include "dcmtk/ofstd/ofstdinc.h"
 #include <csetjmp>
 
 // These two macros are re-defined in the IJG header files.
@@ -52,8 +52,8 @@ BEGIN_EXTERN_C
 #endif
 
 // Solaris defines longjmp() in namespace std, other compilers don't...
-namespace std { }
-using namespace std;
+using STD_NAMESPACE longjmp;
+using STD_NAMESPACE jmp_buf;
 
 // private error handler struct
 struct DJEIJG12ErrorStruct

diff --git a/dcmjpeg/libsrc/djeijg16.cc b/dcmjpeg/libsrc/djeijg16.cc
@@ -23,7 +23,7 @@
 #include "dcmtk/dcmjpeg/djeijg16.h"
 #include "dcmtk/dcmjpeg/djcparam.h"
 #include "dcmtk/dcmdata/dcerror.h"
-
+#include "dcmtk/ofstd/ofstdinc.h"
 #include <csetjmp>
 
 // These two macros are re-defined in the IJG header files.
@@ -52,8 +52,8 @@ BEGIN_EXTERN_C
 #endif
 
 // Solaris defines longjmp() in namespace std, other compilers don't...
-namespace std { }
-using namespace std;
+using STD_NAMESPACE longjmp;
+using STD_NAMESPACE jmp_buf;
 
 // private error handler struct
 struct DJEIJG16ErrorStruct

diff --git a/dcmjpeg/libsrc/djeijg8.cc b/dcmjpeg/libsrc/djeijg8.cc
@@ -23,7 +23,7 @@
 #include "dcmtk/dcmjpeg/djeijg8.h"
 #include "dcmtk/dcmjpeg/djcparam.h"
 #include "dcmtk/dcmdata/dcerror.h"
-
+#include "dcmtk/ofstd/ofstdinc.h"
 #include <csetjmp>
 
 // These two macros are re-defined in the IJG header files.
@@ -52,8 +52,8 @@ BEGIN_EXTERN_C
 #endif
 
 // Solaris defines longjmp() in namespace std, other compilers don't...
-namespace std { }
-using namespace std;
+using STD_NAMESPACE longjmp;
+using STD_NAMESPACE jmp_buf;
 
 // private error handler struct
 struct DJEIJG8ErrorStruct

diff --git a/dcmnet/apps/storescu.cc b/dcmnet/apps/storescu.cc
@@ -47,9 +47,9 @@ END_EXTERN_C
 #include "dcmtk/dcmdata/dcuid.h"     /* for dcmtk version name */
 #include "dcmtk/dcmdata/dcostrmz.h"  /* for dcmZlibCompressionLevel */
 #include "dcmtk/dcmtls/tlsopt.h"     /* for DcmTLSOptions */
+#include "dcmtk/ofstd/ofstdinc.h"
 #include <ctime>
 
-using namespace std;
 
 #ifdef ON_THE_FLY_COMPRESSION
 #include "dcmtk/dcmjpeg/djdecode.h"  /* for JPEG decoders */

diff --git a/dcmnet/libsrc/dstorscp.cc b/dcmnet/libsrc/dstorscp.cc
@@ -24,9 +24,9 @@
 
 #include "dcmtk/dcmnet/dstorscp.h"
 #include "dcmtk/dcmnet/diutil.h"
+#include "dcmtk/ofstd/ofstdinc.h"
 #include <ctime>
 
-using namespace std;
 
 // constant definitions
 

diff --git a/dcmnet/libsrc/dstorscu.cc b/dcmnet/libsrc/dstorscu.cc
@@ -28,9 +28,9 @@
 #include "dcmtk/dcmdata/dcdatutl.h"
 #include "dcmtk/dcmnet/dstorscu.h"
 #include "dcmtk/dcmnet/diutil.h"
+#include "dcmtk/ofstd/ofstdinc.h"
 #include <ctime>
 
-using namespace std;
 
 // these are private DIMSE status codes of the class "pending"
 #define STATUS_STORE_Pending_NoPresentationContext 0xffff

diff --git a/dcmnet/libsrc/dulfsm.cc b/dcmnet/libsrc/dulfsm.cc
@@ -100,6 +100,7 @@ END_EXTERN_C
 #endif
 
 #include "dcmtk/ofstd/ofstream.h"
+#include "dcmtk/ofstd/ofstdinc.h"
 #include "dcmtk/dcmnet/dicom.h"
 #include "dcmtk/dcmnet/lst.h"
 #include "dcmtk/dcmnet/cond.h"
@@ -116,7 +117,6 @@ END_EXTERN_C
 #include "dcmtk/ofstd/ofsockad.h" /* for class OFSockAddr */
 #include <ctime>
 
-using namespace std;
 
 /* At least Solaris doesn't define this */
 #ifndef INADDR_NONE

diff --git a/dcmqrdb/libsrc/dcmqrdbi.cc b/dcmqrdb/libsrc/dcmqrdbi.cc
@@ -40,14 +40,13 @@ END_EXTERN_C
 #include "dcmtk/dcmqrdb/dcmqrdbi.h"
 #include "dcmtk/dcmqrdb/dcmqrcnf.h"
 #include "dcmtk/dcmqrdb/dcmqropt.h"
-
+#include "dcmtk/ofstd/ofstdinc.h"
 #include "dcmtk/dcmqrdb/dcmqridx.h"
 #include "dcmtk/dcmnet/diutil.h"
 #include "dcmtk/dcmdata/dcfilefo.h"
 #include "dcmtk/dcmdata/dcmatch.h"
 #include <ctime>
 
-using namespace std;
 
 /* ========================= static data ========================= */
 

diff --git a/dcmqrdb/libsrc/dcmqrptb.cc b/dcmqrdb/libsrc/dcmqrptb.cc
@@ -22,9 +22,9 @@
 #include "dcmtk/config/osconfig.h"    /* make sure OS specific configuration is included first */
 #include "dcmtk/dcmqrdb/dcmqrptb.h"
 #include "dcmtk/dcmqrdb/dcmqropt.h"
+#include "dcmtk/ofstd/ofstdinc.h"
 #include <ctime>
 
-using namespace std;
 
 /** helper class that describes entries in the process slot table. Internal use only.
  */

diff --git a/dcmqrdb/libsrc/dcmqrtis.cc b/dcmqrdb/libsrc/dcmqrtis.cc
@@ -29,9 +29,9 @@
 #include "dcmtk/dcmqrdb/dcmqrdbs.h"
 #include "dcmtk/dcmdata/dcfilefo.h"
 #include "dcmtk/dcmqrdb/dcmqropt.h"
+#include "dcmtk/ofstd/ofstdinc.h"
 #include <ctime>
 
-using namespace std;
 
 BEGIN_EXTERN_C
 #ifdef HAVE_SYS_STAT_H

diff --git a/dcmwlm/libsrc/wlmactmg.cc b/dcmwlm/libsrc/wlmactmg.cc
@@ -43,9 +43,9 @@
 #include "dcmtk/dcmdata/dcdicent.h"  // needed by MSVC5 with STL
 #include "dcmtk/oflog/internal/env.h"
 #include "dcmtk/dcmwlm/wlmactmg.h"
+#include "dcmtk/ofstd/ofstdinc.h"
 #include <ctime>
 
-using namespace std;
 
 
 // ----------------------------------------------------------------------------

diff --git a/ofstd/libsrc/ofdate.cc b/ofstd/libsrc/ofdate.cc
@@ -22,9 +22,9 @@
 
 #include "dcmtk/config/osconfig.h"
 #include "dcmtk/ofstd/ofdate.h"
+#include "dcmtk/ofstd/ofstdinc.h"
 #include <ctime>
 
-using namespace std;
 
 /*------------------*
  *  implementation  *

diff --git a/ofstd/libsrc/ofdatime.cc b/ofstd/libsrc/ofdatime.cc
@@ -29,9 +29,9 @@ END_EXTERN_C
 #endif
 
 #include "dcmtk/ofstd/ofdatime.h"
+#include "dcmtk/ofstd/ofstdinc.h"
 #include <ctime>
 
-using namespace std;
 
 /*------------------*
  *  implementation  *

diff --git a/ofstd/libsrc/offname.cc b/ofstd/libsrc/offname.cc
@@ -24,10 +24,10 @@
 #include "dcmtk/ofstd/offname.h"
 #include "dcmtk/ofstd/ofcast.h"
 #include "dcmtk/ofstd/ofstd.h"        /* for OFString::myrand_r */
+#include "dcmtk/ofstd/ofstdinc.h"
 #include <cerrno>
 #include <ctime>
 
-using namespace std;
 
 BEGIN_EXTERN_C
 #ifdef HAVE_SYS_TYPES_H

diff --git a/ofstd/libsrc/ofrand.cc b/ofstd/libsrc/ofrand.cc
@@ -24,9 +24,9 @@
 #include "dcmtk/ofstd/ofrand.h"
 #include "dcmtk/ofstd/ofcast.h"
 #include "dcmtk/ofstd/ofstd.h"
+#include "dcmtk/ofstd/ofstdinc.h"
 #include <ctime>
 
-using namespace std;
 
 BEGIN_EXTERN_C
 #ifdef HAVE_SYS_TIME_H

diff --git a/ofstd/libsrc/oftempf.cc b/ofstd/libsrc/oftempf.cc
@@ -24,9 +24,9 @@
 #include "dcmtk/ofstd/oftempf.h"
 #include "dcmtk/ofstd/offname.h"
 #include "dcmtk/ofstd/ofstd.h"
+#include "dcmtk/ofstd/ofstdinc.h"
 #include <ctime>
 
-using namespace std;
 
 BEGIN_EXTERN_C
 #ifdef HAVE_IO_H

diff --git a/ofstd/libsrc/oftime.cc b/ofstd/libsrc/oftime.cc
@@ -21,10 +21,9 @@
 
 
 #include "dcmtk/config/osconfig.h"
-
+#include "dcmtk/ofstd/ofstdinc.h"
 #include <ctime>
 
-using namespace std;
 
 BEGIN_EXTERN_C
 #ifdef HAVE_SYS_TIME_H

diff --git a/ofstd/libsrc/ofxml.cc b/ofstd/libsrc/ofxml.cc
@@ -104,6 +104,7 @@
 #endif
 // DCMTK: we need this header file at the beginning of each file
 #include "dcmtk/config/osconfig.h"
+#include "dcmtk/ofstd/ofstdinc.h"
 
 // DCMTK: we need the correct header file (was "xmlParser.h")
 #include "dcmtk/ofstd/ofxml.h"
@@ -120,9 +121,23 @@
 #include <cstdio>
 #include <cstring>
 #include <cassert>
+#include <cstdlib>
 #include "dcmtk/ofstd/ofstdinc.h"
 
-using namespace std;
+using STD_NAMESPACE free;
+using STD_NAMESPACE malloc;
+using STD_NAMESPACE FILE;
+using STD_NAMESPACE fopen;
+using STD_NAMESPACE atoi;
+using STD_NAMESPACE fread;
+using STD_NAMESPACE atof;
+using STD_NAMESPACE fclose;
+using STD_NAMESPACE fprintf;
+using STD_NAMESPACE realloc;
+using STD_NAMESPACE atol;
+using STD_NAMESPACE fwrite;
+using STD_NAMESPACE fseek;
+using STD_NAMESPACE ftell;
 
 #ifdef HAVE_STRINGS_H
 BEGIN_EXTERN_C