ENH: Remap borland __FUNC__ to the c9x __FUNCTION__

diff --git a/gdcmTestFUNCTION.cxx b/gdcmTestFUNCTION.cxx
index cf9ef0aece1209e3f5f1c72aa714dc2a61c6c912..51a42b98aa7069139721e8009929fdf3e8a6dd04 100644 (file)
--- a/gdcmTestFUNCTION.cxx
+++ b/gdcmTestFUNCTION.cxx
@@ -3,6 +3,11 @@
 
 int TestFUNCTION()
 {
+#ifdef __BORLANDC__
+  #ifndef __FUNCTION__
+    #define __FUNCTION__ __FUNCT__;
+  #endif
+#endif
   const char *f = __FUNCTION__;
   int r = strcmp( "TestFUNCTION", f);
   return r;

diff --git a/src/gdcmDebug.h b/src/gdcmDebug.h
index cdf1e47e886129861f930187a28bf6c833097ffc..7ad5767d34a2a8887fa45835dafcef10e3a98657 100644 (file)
--- a/src/gdcmDebug.h
+++ b/src/gdcmDebug.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDebug.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/08 23:14:05 $
-  Version:   $Revision: 1.18 $
+  Date:      $Date: 2005/01/11 17:54:10 $
+  Version:   $Revision: 1.19 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -63,6 +63,9 @@ public:
 #ifdef GDCM_COMPILER_HAS_FUNCTION
 // Handle particular case for GNU C++ which also defines __PRETTY_FUNCTION__
 // which is a lot nice in C++
+#ifdef __BORLANDC__
+#  define __FUNCTION__ __FUNC__
+#endif
 #ifdef __GNUC__
 #  define GDCM_FUNCTION __PRETTY_FUNCTION__
 #else