added -fno-implicit-templates

12 files changed, 14 insertions, 11 deletions

diff --git a/include/makeinclude/platform_chorus.GNU b/include/makeinclude/platform_chorus.GNU
index ffc9d5ddef1..bd62fbf385f 100644
--- a/include/makeinclude/platform_chorus.GNU
+++ b/include/makeinclude/platform_chorus.GNU
@@ -12,7 +12,8 @@ CC		= gcc
 CXX		= g++
 		
 CFLAGS		+= -w
-CCFLAGS		+= -w -fno-strict-prototypes     	\
+CCFLAGS		+= -w -fno-implicit-templates		\
+		   -fno-strict-prototypes     		\
 		   -D_POSIX_THREADS 			\
 		   -D_POSIX_THREAD_SAFE_FUNCTIONS
 
diff --git a/include/makeinclude/platform_hpux_gcc.GNU b/include/makeinclude/platform_hpux_gcc.GNU
index c08d58b4243..c5370ca8688 100644
--- a/include/makeinclude/platform_hpux_gcc.GNU
+++ b/include/makeinclude/platform_hpux_gcc.GNU
@@ -1,7 +1,7 @@
 CC		= gcc
 CXX		= g++
 CFLAGS		+= -w
-CCFLAGS		+= -w
+CCFLAGS		+= -w -fno-implicit-templates
 DLD		= $(CXX)
 LD		= $(CXX)
 PIC		= -fPIC
diff --git a/include/makeinclude/platform_irix5.2.GNU b/include/makeinclude/platform_irix5.2.GNU
index e6fb0f21e57..03c87631b62 100644
--- a/include/makeinclude/platform_irix5.2.GNU
+++ b/include/makeinclude/platform_irix5.2.GNU
@@ -2,6 +2,7 @@
 MAKE		= gmake
 CC		= gcc
 CXX		= g++
+CCFLAGS		= -fno-implicit-templates
 DLD		= $(CXX)
 LD		= $(CXX) 
 LDFLAGS		+=
diff --git a/include/makeinclude/platform_irix5.3_g++.GNU b/include/makeinclude/platform_irix5.3_g++.GNU
index 04253d32da0..0a97215baa9 100644
--- a/include/makeinclude/platform_irix5.3_g++.GNU
+++ b/include/makeinclude/platform_irix5.3_g++.GNU
@@ -2,6 +2,7 @@
 
 CC              = gcc
 CXX             = g++
+CCFLAGS		= -fno-implicit-templates
 DLD             = $(CXX)
 LD		= $(CXX) 
 LDFLAGS         += -L$(WRAPPER_ROOT)/ace
diff --git a/include/makeinclude/platform_m88k.GNU b/include/makeinclude/platform_m88k.GNU
index 86f6dcbdba0..319ba0d2533 100644
--- a/include/makeinclude/platform_m88k.GNU
+++ b/include/makeinclude/platform_m88k.GNU
@@ -3,7 +3,7 @@
 CC		= gcc
 CXX             = g++
 CFLAGS		+= -w
-CCFLAGS		+= $(CFLAGS) -D__m88k__ -fno-strict-prototypes    #### -frepo
+CCFLAGS		+= -w -D__m88k__ -fno-implicit-templates -fno-strict-prototypes
 DLD		= $(CXX) 
 LD		= $(CXX) 
 INCLDIRS	+= -I$(WRAPPER_ROOT) -I.
diff --git a/include/makeinclude/platform_osf1_4.0_g++.GNU b/include/makeinclude/platform_osf1_4.0_g++.GNU
index 651e7365d6c..b141157ebb5 100644
--- a/include/makeinclude/platform_osf1_4.0_g++.GNU
+++ b/include/makeinclude/platform_osf1_4.0_g++.GNU
@@ -4,7 +4,7 @@
 CC		= gcc
 CXX		= g++
 CFLAGS          += -D_REENTRANT
-CCFLAGS         += $(CFLAGS) -fno-strict-prototypes
+CCFLAGS         += -D_REENTRANT -fno-implicit-templates -fno-strict-prototypes
 LD		= $(CXX)
 DLD		= $(CXX)
 LIBS		+= -lpthread -lmach -lexc -ltli -lrt
diff --git a/include/makeinclude/platform_sco-nothread.GNU b/include/makeinclude/platform_sco-nothread.GNU
index d851b6e3831..6c3107ce20e 100644
--- a/include/makeinclude/platform_sco-nothread.GNU
+++ b/include/makeinclude/platform_sco-nothread.GNU
@@ -6,7 +6,7 @@ CC              = gcc
 # for no threads
 CXX		= g++
 CFLAGS		+= -w
-CCFLAGS		+= $(CFLAGS) -fno-implicit-templates -fno-strict-prototypes
+CCFLAGS		+= -w -fno-implicit-templates -fno-strict-prototypes
 DLD             = $(CXX)
 LD		= $(CXX)
 LIBS            = -lsocket
diff --git a/include/makeinclude/platform_sunos4_g++.GNU b/include/makeinclude/platform_sunos4_g++.GNU
index 335d710608a..aa007a87bbc 100644
--- a/include/makeinclude/platform_sunos4_g++.GNU
+++ b/include/makeinclude/platform_sunos4_g++.GNU
@@ -4,8 +4,8 @@
 #
 CC	= gcc 
 CXX	= g++
-CFLAGS  +=  -fno-strict-prototypes
-CCFLAGS += $(CFLAGS)      # -frepo
+CFLAGS  += -fno-strict-prototypes
+CCFLAGS += -fno-strict-prototypes -fno-implicit-templates
 DLD	= /bin/ld
 LD	= $(CXX)
 #
diff --git a/include/makeinclude/platform_sunos5_g++.GNU b/include/makeinclude/platform_sunos5_g++.GNU
index 0b29d3f2832..d03d09453cd 100644
--- a/include/makeinclude/platform_sunos5_g++.GNU
+++ b/include/makeinclude/platform_sunos5_g++.GNU
@@ -5,7 +5,7 @@
 CC              = gcc
 CXX		= g++
 CFLAGS          += -Wall -Wpointer-arith  #### -O2 -Winline
-CCFLAGS         += -Wall -Wpointer-arith  #### -O2 -fno-implicit-templates -Winline
+CCFLAGS         += -Wall -Wpointer-arith -fno-implicit-templates #### -O2 -Winline
 DLD		= $(CXX)
 LD		= $(CXX)
 LDFLAGS		+=     # -z muldefs
diff --git a/include/makeinclude/platform_sunos5_x86_g++.GNU b/include/makeinclude/platform_sunos5_x86_g++.GNU
index af086268ce2..4872b3dfefd 100644
--- a/include/makeinclude/platform_sunos5_x86_g++.GNU
+++ b/include/makeinclude/platform_sunos5_x86_g++.GNU
@@ -5,7 +5,7 @@
 CC		= gcc 
 CXX		= g++
 CFLAGS          +=
-CCFLAGS         += $(CFLAGS) -fno-strict-prototypes # -frepo 
+CCFLAGS         += -fno-implicit-templates -fno-strict-prototypes
 DLD		= $(CXX)
 LD		= $(CXX)
 LDFLAGS		+=     # -z muldefs
diff --git a/include/makeinclude/platform_unixware_g++.GNU b/include/makeinclude/platform_unixware_g++.GNU
index a5582bbaca0..6bb3fb8e6ba 100644
--- a/include/makeinclude/platform_unixware_g++.GNU
+++ b/include/makeinclude/platform_unixware_g++.GNU
@@ -5,7 +5,7 @@
 CC		= gcc
 CXX		= g++
 CFLAGS          += -w
-CCFLAGS         += $(CFLAGS)      # -w -fno-strict-prototypes
+CCFLAGS         += -w -fno-implicit-templates       # -fno-strict-prototypes
 DLD		= $(CXX)
 LD		= $(CXX)
 LDFLAGS		+= -L/usr/lib
diff --git a/include/makeinclude/platform_vxworks5.x_g++.GNU b/include/makeinclude/platform_vxworks5.x_g++.GNU
index ddaa29bc352..14668f5e1fc 100644
--- a/include/makeinclude/platform_vxworks5.x_g++.GNU
+++ b/include/makeinclude/platform_vxworks5.x_g++.GNU
@@ -10,7 +10,7 @@ GCCLIB_DIR	= $(HOST_DIR)/lib/gcc-lib/powerpc-wrs-vxworks/cygnus-2.7.2-960126
 
 CC		= $(BIN_DIR)/g++ppc
 CXX		= $(CC)
-CCFLAGS		+= -B$(GCCLIB_DIR)/ -DCPU=PPC604 -DVXWORKS
+CCFLAGS		+= -B$(GCCLIB_DIR)/ -DCPU=PPC604 -DVXWORKS -fno-implicit-templates
 INCLDIRS	+= -I$(TARGET_DIR)/h
 LD		= $(BIN_DIR)/ldppc
 LDFLAGS		+= -r -L$(LIB_DIR) -L$(GCCLIB_DIR)