ChangeLogTag: Fri Mar 15 00:16:06 2002 Craig Rodrigues <crodrigu@bbn.com>

5 files changed, 91 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 9f3bb4eab81..fae59e0c832 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Mar 15 00:16:06 2002  Craig Rodrigues  <crodrigu@bbn.com>
+
+	* include/makeinclude/platform_freebsd.GNU:
+	* include/makeinclude/platform_netbsd.GNU:
+	  Make -fno-implicit-templates conditional, instead of default.
+	  Thanks to Denis Otchenashko <oko@bank.gov.ua> for motivating
+	  me to look into this and fix this.
+
 Thu Mar 14 12:50:00 2002  Si Mong Park  <spark@ociweb.com>
 
         * ace/OS_String.h:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 9f3bb4eab81..fae59e0c832 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,11 @@
+Fri Mar 15 00:16:06 2002  Craig Rodrigues  <crodrigu@bbn.com>
+
+	* include/makeinclude/platform_freebsd.GNU:
+	* include/makeinclude/platform_netbsd.GNU:
+	  Make -fno-implicit-templates conditional, instead of default.
+	  Thanks to Denis Otchenashko <oko@bank.gov.ua> for motivating
+	  me to look into this and fix this.
+
 Thu Mar 14 12:50:00 2002  Si Mong Park  <spark@ociweb.com>
 
         * ace/OS_String.h:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 9f3bb4eab81..fae59e0c832 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,11 @@
+Fri Mar 15 00:16:06 2002  Craig Rodrigues  <crodrigu@bbn.com>
+
+	* include/makeinclude/platform_freebsd.GNU:
+	* include/makeinclude/platform_netbsd.GNU:
+	  Make -fno-implicit-templates conditional, instead of default.
+	  Thanks to Denis Otchenashko <oko@bank.gov.ua> for motivating
+	  me to look into this and fix this.
+
 Thu Mar 14 12:50:00 2002  Si Mong Park  <spark@ociweb.com>
 
         * ace/OS_String.h:
diff --git a/include/makeinclude/platform_freebsd.GNU b/include/makeinclude/platform_freebsd.GNU
index 631ad555c72..ec19e671667 100644
--- a/include/makeinclude/platform_freebsd.GNU
+++ b/include/makeinclude/platform_freebsd.GNU
@@ -13,8 +13,41 @@ debug = 1
 
 CC              = gcc
 CXX             = g++
+
+CXX_VERSION := $(shell $(CXX) -dumpversion)
+ 
+# If no option has been specified, try to enable implicit_templates based
+# on the version of the compiler.
+#
+ifeq ($(implicit_templates),)
+  ifeq (2.95,$(findstring 2.95,$(CXX_VERSION)))
+    implicit_templates = 1
+  else
+    ifeq (3.,$(findstring 3.,$(CXX_VERSION)))
+      implicit_templates = 1
+    endif
+    ifeq (2.96,$(findstring 2.96,$(CXX_VERSION)))
+      implicit_templates = 1
+    endif
+  endif
+endif
+ 
+# User didn't specify and we couldn't guess if this version of the compiler
+# works fine with implicit template instantiation. Turn if off. This could
+# as well go into the previous check but GNU Make conditionals are lame.
+#
+ifeq ($(implicit_templates),)
+  implicit_templates = 0
+endif
+ 
+ifeq ($(implicit_templates),0)
+  ifeq ($(IMPLICIT_TEMPLATES_FLAG),) # Turn on flags if none is speficied.
+    IMPLICIT_TEMPLATES_FLAG=-fno-implicit-templates
+  endif
+endif
+
 CFLAGS          += -W -Wall -Wpointer-arith -pipe
-CCFLAGS         += $(CFLAGS) -fno-implicit-templates
+CCFLAGS         += $(CFLAGS) $(IMPLICIT_TEMPLATES_FLAG)
 DCFLAGS         += -g
 ifneq ($(VERSION),3)
   LDFLAGS       += -Wl,-rpath $(ACE_ROOT)/ace
diff --git a/include/makeinclude/platform_netbsd.GNU b/include/makeinclude/platform_netbsd.GNU
index d9e08b01139..9616ce54193 100644
--- a/include/makeinclude/platform_netbsd.GNU
+++ b/include/makeinclude/platform_netbsd.GNU
@@ -11,6 +11,39 @@ versioned_so = 1
 
 CC              = gcc
 CXX		= g++
+
+CXX_VERSION := $(shell $(CXX) -dumpversion)
+ 
+# If no option has been specified, try to enable implicit_templates based
+# on the version of the compiler.
+#
+ifeq ($(implicit_templates),)
+  ifeq (2.95,$(findstring 2.95,$(CXX_VERSION)))
+    implicit_templates = 1
+  else
+    ifeq (3.,$(findstring 3.,$(CXX_VERSION)))
+      implicit_templates = 1
+    endif
+    ifeq (2.96,$(findstring 2.96,$(CXX_VERSION)))
+      implicit_templates = 1
+    endif
+  endif
+endif
+ 
+# User didn't specify and we couldn't guess if this version of the compiler
+# works fine with implicit template instantiation. Turn if off. This could
+# as well go into the previous check but GNU Make conditionals are lame.
+#
+ifeq ($(implicit_templates),)
+  implicit_templates = 0
+endif
+ 
+ifeq ($(implicit_templates),0)
+  ifeq ($(IMPLICIT_TEMPLATES_FLAG),) # Turn on flags if none is speficied.
+    IMPLICIT_TEMPLATES_FLAG=-fno-implicit-templates
+  endif
+endif
+
 CFLAGS          += -w -fno-strict-prototypes
 CCFLAGS         += $(CFLAGS) -fno-implicit-templates
 DCFLAGS         += -g