ChangeLogTag: Mon Sep 9 00:24:44 UTC 2002 Craig Rodrigues <crodrigu@bbn.com>

32 files changed, 69 insertions, 155 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index e4d09c46401..9ff50092c48 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,39 @@
+Mon Sep  9 00:24:44 UTC 2002  Craig Rodrigues  <crodrigu@bbn.com>
+
+	* examples/Event_Comm/Makefile:
+	* examples/POA/TIE/Makefile:
+	* examples/Quoter/Makefile:
+	* examples/TypeCode_Creation/Makefile:
+	* orbsvcs/Makefile:
+	* orbsvcs/CosEvent_Service/Makefile:
+	* orbsvcs/Event_Service/Makefile:
+	* orbsvcs/examples/CosEC/Factory/Makefile:
+	* orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile:
+	* orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile:
+	* orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile:
+	* orbsvcs/examples/CosEC/Simple/Makefile:
+	* orbsvcs/examples/RtEC/MCast/Makefile:
+	* orbsvcs/examples/RtEC/Schedule/Makefile:
+	* orbsvcs/examples/RtEC/Simple/Makefile:
+	* orbsvcs/orbsvcs/Makefile:
+	* orbsvcs/orbsvcs/Makefile.CosEvent:
+	* orbsvcs/orbsvcs/Makefile.CosNotification:
+	* orbsvcs/orbsvcs/Makefile.RTEvent:
+	* orbsvcs/orbsvcs/Makefile.RTSched:
+	* orbsvcs/orbsvcs/Makefile.RTSchedEvent:
+	* orbsvcs/tests/Makefile:
+	* orbsvcs/tests/CosEvent/Basic/Makefile:
+	* orbsvcs/tests/EC_Mcast/Makefile:
+	* orbsvcs/tests/EC_Multiple/Makefile:
+	* orbsvcs/tests/EC_Throughput/Makefile:
+	* orbsvcs/tests/Event/Basic/Makefile:
+	* orbsvcs/tests/Event/Performance/Makefile:
+	* orbsvcs/tests/Trading/Makefile:
+	* tao/Makefile.dirs:
+	* tao/Makefile.tao:
+	  Remove references to obsolete ACE_HAS_GNUG_PRE_2_8 make 
+	  variable.
+
 Sun Sep  8 11:57:47 2002  Balachandran Natarajan  <bala@isis-server.vuse.vanderbilt.edu>
 
 	* tao/CDR_Encaps_Codec.cpp (decode): In methods decode () and
diff --git a/TAO/examples/Event_Comm/Makefile b/TAO/examples/Event_Comm/Makefile
index f4e280a4a0e..0b16f1f5200 100644
--- a/TAO/examples/Event_Comm/Makefile
+++ b/TAO/examples/Event_Comm/Makefile
@@ -65,16 +65,6 @@ endif # Naming
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-
-ifeq ($(ACE_HAS_GNUG_PRE_2_8),1)
-
-  # Since older g++ cannot handle nested classes properly, this sample
-  # will not build on g++ prior to 2.8.0.
-  all clean realclean:
-	@echo Event_Comm is not built with older versions of g++
-
-else # ! ACE_HAS_GNUG_PRE_2_8
-
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
@@ -103,8 +93,6 @@ notifier: $(addprefix $(VDIR),$(NOTIFIER_OBJS))
 realclean: clean
 	-$(RM) Event_CommS.* Event_CommC.* Event_CommS_T.*
 
-endif # ! ACE_HAS_GNUG_PRE_2_8
-
 #----------------------------------------------------------------------------
 #       Dependencies
 #----------------------------------------------------------------------------
diff --git a/TAO/examples/POA/TIE/Makefile b/TAO/examples/POA/TIE/Makefile
index 70dce788357..695b5471b2a 100644
--- a/TAO/examples/POA/TIE/Makefile
+++ b/TAO/examples/POA/TIE/Makefile
@@ -33,14 +33,6 @@ TAO_IDLFLAGS += -Ge 1
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 
-ifeq ($(ACE_HAS_GNUG_PRE_2_8),1)
-
-  # Because older g++ cannot handle nested classes properly, this test
-  # will not build on g++ prior to 2.8.0.
-  all clean realclean:
-	@echo POA/TIE is not built with older versions of g++
-
-else # ! ACE_HAS_GNUG_PRE_2_8
 ifeq (cxvx,$(findstring cxvx,$(CXX)))
 
   # Green Hills for VxWorks can't build this test.  It runs into
@@ -48,7 +40,7 @@ ifeq (cxvx,$(findstring cxvx,$(CXX)))
   all clean realclean:
 	@echo POA/TIE is not built with Green Hills $(CXX).
 
-else # ! ACE_HAS_GNUG_PRE_2_8  &&  ! ghs/VxWorks
+else # ! ghs/VxWorks
 ifeq (gcx,$(findstring gcx,$(CXX)))
 
   # Green Hills for Solaris can't build this test.  It runs into
@@ -56,7 +48,7 @@ ifeq (gcx,$(findstring gcx,$(CXX)))
   all clean realclean:
 	@echo POA/TIE is not built with Green Hills $(CXX).
 
-else # ! ACE_HAS_GNUG_PRE_2_8  &&  ! ghs
+else # ! ghs/VxWorks && ! ghs/Solaris
 
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
@@ -86,7 +78,6 @@ realclean: clean
 
 endif # ! ghs/Solaris
 endif # ! ghs/VxWorks
-endif # ! ACE_HAS_GNUG_PRE_2_8
 
 #----------------------------------------------------------------------------
 #       Dependencies
diff --git a/TAO/examples/Quoter/Makefile b/TAO/examples/Quoter/Makefile
index 02bf159a0bf..172479d322f 100644
--- a/TAO/examples/Quoter/Makefile
+++ b/TAO/examples/Quoter/Makefile
@@ -49,16 +49,6 @@ TAO_IDLFLAGS += -I$(TAO_ROOT)/orbsvcs/orbsvcs -Ge 1
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-
-ifeq ($(ACE_HAS_GNUG_PRE_2_8),1)
-
-  # Since older g++ cannot handle nested classes properly, this test
-  # will not build on g++ prior to 2.8.0.
-  all clean realclean:
-	@echo examples/Quoter is not built with older versions of g++
-
-else # ! ACE_HAS_GNUG_PRE_2_8
-
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
 
@@ -101,8 +91,6 @@ Factory_Finder: $(addprefix $(VDIR),$(FACTORY_FINDER_OBJS))
 Generic_Factory: $(addprefix $(VDIR),$(GENERIC_FACTORY_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-endif # ! ACE_HAS_GNUG_PRE_2_8
-
 #----------------------------------------------------------------------------
 #       Dependencies
 #----------------------------------------------------------------------------
diff --git a/TAO/examples/TypeCode_Creation/Makefile b/TAO/examples/TypeCode_Creation/Makefile
index efce9848697..f395f5fe38e 100644
--- a/TAO/examples/TypeCode_Creation/Makefile
+++ b/TAO/examples/TypeCode_Creation/Makefile
@@ -32,9 +32,7 @@ include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
 
 ifeq ($(minimum_corba),0)
-  ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
-    BIN=$(BIN_UNCHECKED)
-  endif # ACE_HAS_GNUG_PRE_2_8
+  BIN=$(BIN_UNCHECKED)
 endif # minimum_corba
 
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
diff --git a/TAO/orbsvcs/CosEvent_Service/Makefile b/TAO/orbsvcs/CosEvent_Service/Makefile
index c5ebed517e7..4c65d18773d 100644
--- a/TAO/orbsvcs/CosEvent_Service/Makefile
+++ b/TAO/orbsvcs/CosEvent_Service/Makefile
@@ -26,9 +26,7 @@ include $(TAO_ROOT)/rules.tao.GNU
 #### don't try to build here.
 TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (CosEvent,$(findstring CosEvent,$(TAO_ORBSVCS)))
-  ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
-    BIN = $(BIN_UNCHECKED)
-  endif # ACE_HAS_GNUG_PRE_2_8
+  BIN = $(BIN_UNCHECKED)
 endif # CosEvent
 
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
diff --git a/TAO/orbsvcs/Event_Service/Makefile b/TAO/orbsvcs/Event_Service/Makefile
index 92a7e040002..199444c16b0 100644
--- a/TAO/orbsvcs/Event_Service/Makefile
+++ b/TAO/orbsvcs/Event_Service/Makefile
@@ -23,9 +23,7 @@ include $(TAO_ROOT)/rules.tao.GNU
 #### don't try to build here.
 TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (RTOLDEvent,$(findstring RTOLDEvent,$(TAO_ORBSVCS)))
-  ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
-    BIN = $(BIN2)
-  endif # ACE_HAS_GNUG_PRE_2_8
+  BIN = $(BIN2)
 endif # RTOLDEvent
 
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
diff --git a/TAO/orbsvcs/Makefile b/TAO/orbsvcs/Makefile
index 6b390a2089a..569016400a8 100644
--- a/TAO/orbsvcs/Makefile
+++ b/TAO/orbsvcs/Makefile
@@ -41,13 +41,11 @@ include $(TAO_ROOT)/rules.tao.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 
 ifeq ($(minimum_corba),0)
-  ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
     ifneq (Compilers 4.2,$(findstring Compilers 4.2,$(CC_VERSION)))
       ifeq ($(LYNXTARGET),)
         DIRS += IFR_Service
       endif # LYNXTARGET
     endif # findstring Compilers 4.2
-  endif # ACE_HAS_GNUG_PRE_2_8
 endif # minimum_corba
 
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/Makefile b/TAO/orbsvcs/examples/CosEC/Factory/Makefile
index 87b1e4d091c..02e1a64f934 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/Makefile
+++ b/TAO/orbsvcs/examples/CosEC/Factory/Makefile
@@ -53,9 +53,7 @@ include $(TAO_ROOT)/rules.tao.GNU
 TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (CosEvent,$(findstring CosEvent,$(TAO_ORBSVCS)))
   ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
-    ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
-      BIN = $(BIN2)
-    endif # ACE_HAS_GNUG_PRE_2_8
+    BIN = $(BIN2)
   endif # Naming
 endif # CosEvent
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile
index 69035aae55d..65a444da5e0 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile
@@ -27,9 +27,7 @@ include $(TAO_ROOT)/rules.tao.GNU
 TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (CosEvent,$(findstring CosEvent,$(TAO_ORBSVCS)))
   ifeq (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS)))
-    ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
-      BIN = $(BIN2)
-    endif # ACE_HAS_GNUG_PRE_2_8
+    BIN = $(BIN2)
   endif # RTEvent
 endif # CosEvent
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile
index f535b9f8edc..5f71c8a7d34 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile
@@ -28,9 +28,7 @@ include $(TAO_ROOT)/rules.tao.GNU
 #### don't try to build here.
 TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS)))
-  ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
-    BIN = $(BIN2)
-  endif # ACE_HAS_GNUG_PRE_2_8
+  BIN = $(BIN2)
 endif # RTEvent
 
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile
index 747d4082195..6cba3879b58 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile
@@ -43,9 +43,7 @@ include $(TAO_ROOT)/rules.tao.GNU
 #### don't try to build here.
 TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (CosEvent,$(findstring CosEvent,$(TAO_ORBSVCS)))
-  ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
-    BIN = $(BIN2)
-  endif # ACE_HAS_GNUG_PRE_2_8
+  BIN = $(BIN2)
 endif # CosEvent
 
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Makefile b/TAO/orbsvcs/examples/CosEC/Simple/Makefile
index 1c7d46e0aae..b59d7027aa5 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Makefile
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Makefile
@@ -33,9 +33,7 @@ include $(TAO_ROOT)/rules.tao.GNU
 #### try to build certain tests.
 TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (NativeCosEvent,$(findstring NativeCosEvent,$(TAO_ORBSVCS)))
-  ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
-    BIN = $(BIN2)
-  endif # ACE_HAS_GNUG_PRE_2_8
+  BIN = $(BIN2)
 endif # NativeCosEvent
 
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Makefile b/TAO/orbsvcs/examples/RtEC/MCast/Makefile
index 13a5200b9b8..24f2d03322b 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Makefile
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Makefile
@@ -31,9 +31,7 @@ include $(TAO_ROOT)/rules.tao.GNU
 #### try to build certain tests.
 TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS)))
-  ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
-    BIN = $(BIN2)
-  endif # ACE_HAS_GNUG_PRE_2_8
+  BIN = $(BIN2)
 endif # RTEvent
 
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Makefile b/TAO/orbsvcs/examples/RtEC/Schedule/Makefile
index 7ef7a8eaa91..96e2d40b0c6 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Makefile
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Makefile
@@ -39,18 +39,11 @@ Service_OBJS=$(addsuffix .o, Service Supplier Consumer)
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-
-ifeq ($(ACE_HAS_GNUG_PRE_2_8),1)
-  # This example does not compile with g++ 2.7.2.3
-all clean realclean:
-	@echo orbsvcs/examples/RtEC/Schedule is not built with older versions of g++
-else # ! ACE_HAS_GNUG_PRE_2_8
-  include $(ACE_ROOT)/include/makeinclude/macros.GNU
-  include $(TAO_ROOT)/rules.tao.GNU
-  include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-  include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-  include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-endif # ! ACE_HAS_GNUG_PRE_2_8
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 # To build multiple executables in the same directory on AIX, it works
 # best to wipe out any previously-created tempinc directory.
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Makefile b/TAO/orbsvcs/examples/RtEC/Simple/Makefile
index ee711c4171b..bc1af478690 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Makefile
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Makefile
@@ -33,9 +33,7 @@ include $(TAO_ROOT)/rules.tao.GNU
 #### try to build certain tests.
 TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS)))
-  ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
-    BIN = $(BIN2)
-  endif # ACE_HAS_GNUG_PRE_2_8
+  BIN = $(BIN2)
 endif # RTEvent
 
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile
index 7274457bde3..a72809638bf 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile
+++ b/TAO/orbsvcs/orbsvcs/Makefile
@@ -41,13 +41,11 @@ ifndef TAO_ORBSVCS
 		AV
 
   ifeq ($(minimum_corba),0)
-    ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
       ifneq (Compilers 4.2,$(findstring Compilers 4.2,$(CC_VERSION)))
         ifeq ($(LYNXTARGET),)
 	  TAO_ORBSVCS += IFRService
 	endif # LYNXTARGET
       endif # findstring Compilers 4.2
-    endif # ACE_HAS_GNUG_PRE_2_8
   endif # minimum_corba
 
   ifeq ($(minimum_corba),0)
@@ -57,15 +55,13 @@ ifndef TAO_ORBSVCS
     # so don't build them either, with minimum CORBA.
     TAO_ORBSVCS +=
 
-    ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
-      TAO_ORBSVCS += LifeCycle
+    TAO_ORBSVCS += LifeCycle
 
     ifeq ($(corba_messaging),1)
       TAO_ORBSVCS += FaultTolerance
       TAO_ORBSVCS += FTORB
       TAO_ORBSVCS += RTCORBAEvent
     endif #corba_messaging
-    endif # ACE_HAS_GNUG_PRE_2_8
 
     # The Load Balancer requires POA ServantLocator support, which
     # Minimum CORBA disables.
@@ -81,9 +77,7 @@ ifndef TAO_ORBSVCS
     TAO_ORBSVCS += Security SSLIOP
   endif # ssl
 
-  ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
-    TAO_ORBSVCS += Notify
-  endif # ACE_HAS_GNUG_PRE_2_8
+  TAO_ORBSVCS += Notify
 
 endif # TAO_ORBSVCS
 
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosEvent b/TAO/orbsvcs/orbsvcs/Makefile.CosEvent
index 37a24ae9b6d..aedbb3cfe51 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.CosEvent
+++ b/TAO/orbsvcs/orbsvcs/Makefile.CosEvent
@@ -34,7 +34,7 @@ override TAO_IDLFLAGS += \
         -Wb,post_include=ace/post.h
 
 IDL_FILES += CosEventComm CosEventChannelAdmin
-ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
+
 CPP_SRCS += \
         CosEvent/CEC_ConsumerAdmin \
         CosEvent/CEC_ConsumerControl \
@@ -55,7 +55,6 @@ CPP_SRCS += \
         CosEvent/CEC_Reactive_Pulling_Strategy \
         CosEvent/CEC_Default_Factory \
         CosEvent/CEC_Event_Loader
-endif # ACE_HAS_GNUG_PRE_2_8
 
 IDL_SRC = \
         $(addsuffix S.cpp, $(IDL_FILES)) \
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosNotification b/TAO/orbsvcs/orbsvcs/Makefile.CosNotification
index 874d53d18c0..f2376a1399e 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.CosNotification
+++ b/TAO/orbsvcs/orbsvcs/Makefile.CosNotification
@@ -23,14 +23,6 @@ ACE_SHLIBS = -lTAO_Svc_Utils -lTAO_ETCL -lTAO_DynamicAny -lTAO_PortableServer -l
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
 
-ifeq ($(ACE_HAS_GNUG_PRE_2_8),1)
-  # Since older g++ cannot handle templates properly,
-  # Notify will not build on g++ prior to 2.8.0.
-all clean realclean:
-	@echo TAO Notification Service is not built with older versions of g++
-
-else # ACE_HAS_GNUG_PRE_2_8
-
 # On non-Windows environment, we should at least define
 # the export_include IDL flag.
 override TAO_IDLFLAGS += \
@@ -118,7 +110,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
 realclean: clean
 	-$(RM) $(foreach file, $(IDL_FILES), $(foreach ext, $(IDL_EXT), $(file)$(ext)))
 
-endif # ACE_HAS_GNUG_PRE_2_8
 #----------------------------------------------------------------------------
 #       Dependencies
 #----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.RTEvent b/TAO/orbsvcs/orbsvcs/Makefile.RTEvent
index 3d44ed28a55..07ee22381f0 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.RTEvent
+++ b/TAO/orbsvcs/orbsvcs/Makefile.RTEvent
@@ -39,7 +39,6 @@ IDL_FILES += \
     RtecEventChannelAdmin \
     RtecUDPAdmin
 
-ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
 CPP_SRCS += \
         Event/EC_Event_Channel \
         Event/EC_ConsumerAdmin \
@@ -80,7 +79,6 @@ CPP_SRCS += \
         Event/EC_Masked_Type_Filter \
         Event/EC_Prefix_Filter_Builder \
         Event/EC_And_Filter
-endif # ACE_HAS_GNUG_PRE_2_8
 
 CPP_SRCS += \
         Event_Utilities \
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.RTSched b/TAO/orbsvcs/orbsvcs/Makefile.RTSched
index 92c9016faef..64d399ca92e 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.RTSched
+++ b/TAO/orbsvcs/orbsvcs/Makefile.RTSched
@@ -35,7 +35,6 @@ override TAO_IDLFLAGS += \
 
 IDL_FILES += RtecScheduler
 
-ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
 CPP_SRCS += \
         Scheduler_Factory \
         Runtime_Scheduler \
@@ -48,7 +47,6 @@ CPP_SRCS += \
         Sched/Scheduler \
         Sched/Scheduler_Generic \
         Sched/Strategy_Scheduler
-endif # ACE_HAS_GNUG_PRE_2_8
 
 IDL_SRC = \
         $(addsuffix S.cpp, $(IDL_FILES)) \
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.RTSchedEvent b/TAO/orbsvcs/orbsvcs/Makefile.RTSchedEvent
index 34c4d0acb3d..af390523af0 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.RTSchedEvent
+++ b/TAO/orbsvcs/orbsvcs/Makefile.RTSchedEvent
@@ -29,14 +29,12 @@ override TAO_IDLFLAGS +=
 
 IDL_FILES +=
 
-ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
 CPP_SRCS += \
         Event/EC_Sched_Filter \
         Event/EC_Sched_Filter_Builder \
         Event/EC_Priority_Scheduling \
         Event/EC_Priority_Dispatching \
 	Event/EC_Sched_Factory
-endif # ACE_HAS_GNUG_PRE_2_8
 
 CPP_SRCS += \
         Event/EC_Gateway_Sched
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile
index 40f0a84a92d..281edb9b154 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile
@@ -39,9 +39,7 @@ include $(TAO_ROOT)/rules.tao.GNU
 #### try to build certain tests.
 TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (NativeCosEvent,$(findstring NativeCosEvent,$(TAO_ORBSVCS)))
-  ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
-    BIN = $(BIN2)
-  endif # ACE_HAS_GNUG_PRE_2_8
+  BIN = $(BIN2)
 endif # NativeCosEvent
 
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
diff --git a/TAO/orbsvcs/tests/EC_Mcast/Makefile b/TAO/orbsvcs/tests/EC_Mcast/Makefile
index 1c694e9c599..357b3809846 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/Makefile
+++ b/TAO/orbsvcs/tests/EC_Mcast/Makefile
@@ -26,9 +26,7 @@ include $(TAO_ROOT)/rules.tao.GNU
 #### don't try to build here.
 TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS)))
-  ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
-    BIN = $(BIN2)
-  endif # ACE_HAS_GNUG_PRE_2_8
+  BIN = $(BIN2)
 endif # RTEvent
 
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile b/TAO/orbsvcs/tests/EC_Multiple/Makefile
index be47bd0c283..12da6eab7ff 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/Makefile
+++ b/TAO/orbsvcs/tests/EC_Multiple/Makefile
@@ -26,19 +26,12 @@ PSRC=EC_Multiple.cpp
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-
-ifeq ($(ACE_HAS_GNUG_PRE_2_8),1)
-  # This test causes g++ 2.7.2.3 (the compiler) to core dump.
-  all clean realclean:
-	@echo orbsvcs/tests/EC_Multiple is not built with older versions of g++
-else # ! ACE_HAS_GNUG_PRE_2_8
-  include $(ACE_ROOT)/include/makeinclude/macros.GNU
-  include $(TAO_ROOT)/rules.tao.GNU
-  include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-  include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-  include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-  include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-endif # ! ACE_HAS_GNUG_PRE_2_8
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 
 #----------------------------------------------------------------------------
 #       Local targets (and local hacks)
diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile b/TAO/orbsvcs/tests/EC_Throughput/Makefile
index 52b590b363d..9b60764e868 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/Makefile
+++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile
@@ -32,9 +32,7 @@ include $(TAO_ROOT)/rules.tao.GNU
 TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (RTOLDEvent,$(findstring RTOLDEvent,$(TAO_ORBSVCS)))
   ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
-    ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
-      BIN = $(BIN2)
-    endif # ACE_HAS_GNUG_PRE_2_8
+    BIN = $(BIN2)
   endif # Naming
 endif # RTOLDEvent
 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Makefile b/TAO/orbsvcs/tests/Event/Basic/Makefile
index 5c48f47ec77..b10cb41ebab 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Makefile
+++ b/TAO/orbsvcs/tests/Event/Basic/Makefile
@@ -46,9 +46,7 @@ include $(TAO_ROOT)/rules.tao.GNU
 #### try to build certain tests.
 TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS)))
-  ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
-    BIN = $(BIN2)
-  endif # ACE_HAS_GNUG_PRE_2_8
+  BIN = $(BIN2)
 endif # RTEvent
 
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
diff --git a/TAO/orbsvcs/tests/Event/Performance/Makefile b/TAO/orbsvcs/tests/Event/Performance/Makefile
index 1297109ee4a..805cae6a8d1 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Makefile
+++ b/TAO/orbsvcs/tests/Event/Performance/Makefile
@@ -37,9 +37,7 @@ include $(TAO_ROOT)/rules.tao.GNU
 #### try to build certain tests.
 TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
 ifeq (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS)))
-  ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
-    BIN = $(BIN2)
-  endif # ACE_HAS_GNUG_PRE_2_8
+  BIN = $(BIN2)
 endif # RTEvent
 
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
diff --git a/TAO/orbsvcs/tests/Makefile b/TAO/orbsvcs/tests/Makefile
index 1806882bce5..0bcc92e479b 100644
--- a/TAO/orbsvcs/tests/Makefile
+++ b/TAO/orbsvcs/tests/Makefile
@@ -45,13 +45,11 @@ include $(TAO_ROOT)/rules.tao.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 
 ifeq ($(minimum_corba),0)
-  ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
     ifneq (Compilers 4.2,$(findstring Compilers 4.2,$(CC_VERSION)))
       ifeq ($(LYNXTARGET),)
         DIRS += InterfaceRepo
       endif # LYNXTARGET
     endif # findstring Compilers 4.2
-  endif # ACE_HAS_GNUG_PRE_2_8
 endif # minimum_corba
 
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
diff --git a/TAO/orbsvcs/tests/Trading/Makefile b/TAO/orbsvcs/tests/Trading/Makefile
index 1d195e4c975..b9423e8c881 100644
--- a/TAO/orbsvcs/tests/Trading/Makefile
+++ b/TAO/orbsvcs/tests/Trading/Makefile
@@ -47,16 +47,6 @@ TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-
-ifeq ($(ACE_HAS_GNUG_PRE_2_8),1)
-
-  # Since older g++ cannot handle nested classes properly, this test
-  # will not build on g++ prior to 2.8.0.
-  all clean realclean:
-	@echo Trading tests is not built with older versions of g++
-
-else # ! ACE_HAS_GNUG_PRE_2_8
-
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
 
@@ -95,8 +85,6 @@ endif # BIN
 realclean: clean
 	-$(RM) $(foreach file, $(IDL_FILES), $(foreach ext, $(IDL_EXT), $(file)$(ext)))
 
-endif # ! ACE_HAS_GNUG_PRE_2_8
-
 #----------------------------------------------------------------------------
 #       Dependencies
 #----------------------------------------------------------------------------
diff --git a/TAO/tao/Makefile.dirs b/TAO/tao/Makefile.dirs
index 42ada3672a6..791fef423c1 100644
--- a/TAO/tao/Makefile.dirs
+++ b/TAO/tao/Makefile.dirs
@@ -39,9 +39,7 @@ endif # rt_corba
 
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 
-ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
-  DIRS += IFR_Client Domain TypeCodeFactory
-endif # ACE_HAS_GNUG_PRE_2_8
+DIRS += IFR_Client Domain TypeCodeFactory
 
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
diff --git a/TAO/tao/Makefile.tao b/TAO/tao/Makefile.tao
index 562e84486a6..c6072d607f5 100644
--- a/TAO/tao/Makefile.tao
+++ b/TAO/tao/Makefile.tao
@@ -346,12 +346,7 @@ ifndef TAO_COMPONENTS
     ORB_Core \
     Dynamic_Any \
     Ft_Corba \
-
-  ifeq (1,$(ACE_HAS_GNUG_PRE_2_8))
-  else
-    TAO_COMPONENTS += \
-      Interface_repo
-  endif # ! ACE_HAS_GNUG_PRE_2_8
+    Interface_repo
 endif # TAO_COMPONENTS
 
 ####