only use the null versions of the ACE_DES_FREE_TEMPLATE* macros with LynxOS 3.0.0

1 files changed, 12 insertions, 11 deletions

diff --git a/ace/OS.h b/ace/OS.h
index f54271335de..f0e9b2de4cc 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -5380,18 +5380,19 @@ private:
    do { POINTER->CLASS::~CLASS (); DEALLOCATOR (POINTER); } while (0)
 #define ACE_DES_NOFREE_TEMPLATE (POINTER,T_CLASS,T_PARAMETER) \
      POINTER-> T_CLASS T_PARAMETER ::~ T_CLASS ()
-#if defined (__Lynx__)
-#define ACE_DES_FREE_TEMPLATE(POINTER,DEALLOCATOR,T_CLASS,T_PARAMETER)
-#define ACE_DES_FREE_TEMPLATE2(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2)
+#if defined (__Lynx__) && __LYNXOS_SDK_VERSION == 199701L
+  // LynxOS 3.0.0's g++ has trouble with the real versions of these.
+# define ACE_DES_FREE_TEMPLATE(POINTER,DEALLOCATOR,T_CLASS,T_PARAMETER)
+# define ACE_DES_FREE_TEMPLATE2(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2)
 #else
-#define ACE_DES_FREE_TEMPLATE(POINTER,DEALLOCATOR,T_CLASS,T_PARAMETER) \
-   do { POINTER-> T_CLASS T_PARAMETER ::~ T_CLASS (); \
-        DEALLOCATOR (POINTER); \
-      } while (0)
-#define ACE_DES_FREE_TEMPLATE2(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2) \
-   do { POINTER-> T_CLASS <T_PARAM1, T_PARAM2> ::~ T_CLASS (); \
-        DEALLOCATOR (POINTER); \
-      } while (0)
+# define ACE_DES_FREE_TEMPLATE(POINTER,DEALLOCATOR,T_CLASS,T_PARAMETER) \
+    do { POINTER-> T_CLASS T_PARAMETER ::~ T_CLASS (); \
+         DEALLOCATOR (POINTER); \
+       } while (0)
+# define ACE_DES_FREE_TEMPLATE2(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2) \
+    do { POINTER-> T_CLASS <T_PARAM1, T_PARAM2> ::~ T_CLASS (); \
+         DEALLOCATOR (POINTER); \
+       } while (0)
 #endif
 
 #if defined (ACE_HAS_SIGNAL_SAFE_OS_CALLS)