removed -D__ACE_INLINE__ even though it's commented, so it doesn't confuse people

14 files changed, 15 insertions, 15 deletions

diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU
index 500aa89b0a3..a01daf76ce7 100644
--- a/include/makeinclude/platform_linux.GNU
+++ b/include/makeinclude/platform_linux.GNU
@@ -2,7 +2,7 @@
 # should allow ACE to be built on Linux.
 
 CC              = gcc -w
-CXX		= g++ -w -I. -fno-strict-prototypes # -D__ACE_INLINE__
+CXX		= g++ -w -I. -fno-strict-prototypes 
 DLD             = $(CXX)
 LD		= $(CXX) 
 LIBS            = -lstdc++
diff --git a/include/makeinclude/platform_linux_lxpthread.GNU b/include/makeinclude/platform_linux_lxpthread.GNU
index 40bb60cb3b7..c119a803e43 100644
--- a/include/makeinclude/platform_linux_lxpthread.GNU
+++ b/include/makeinclude/platform_linux_lxpthread.GNU
@@ -7,7 +7,7 @@
 # Jan Rychter <jwr@icm.edu.pl>
 
 CC              = gcc -w
-CXX		= g++ -w -I. -fno-strict-prototypes -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT -O2 # -D__ACE_INLINE__ 
+CXX		= g++ -w -I. -fno-strict-prototypes -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT -O2
 DLD             = $(CXX)
 LD		= $(CXX) 
 LIBS            += -ldl -lpthread -lstdc++
diff --git a/include/makeinclude/platform_linux_lxpthreads.GNU b/include/makeinclude/platform_linux_lxpthreads.GNU
index 40bb60cb3b7..c119a803e43 100644
--- a/include/makeinclude/platform_linux_lxpthreads.GNU
+++ b/include/makeinclude/platform_linux_lxpthreads.GNU
@@ -7,7 +7,7 @@
 # Jan Rychter <jwr@icm.edu.pl>
 
 CC              = gcc -w
-CXX		= g++ -w -I. -fno-strict-prototypes -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT -O2 # -D__ACE_INLINE__ 
+CXX		= g++ -w -I. -fno-strict-prototypes -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT -O2
 DLD             = $(CXX)
 LD		= $(CXX) 
 LIBS            += -ldl -lpthread -lstdc++
diff --git a/include/makeinclude/platform_linux_pthread.GNU b/include/makeinclude/platform_linux_pthread.GNU
index 8910f7d92b6..cfa5be68a09 100644
--- a/include/makeinclude/platform_linux_pthread.GNU
+++ b/include/makeinclude/platform_linux_pthread.GNU
@@ -8,7 +8,7 @@
 # Jan Rychter <jwr@icm.edu.pl>
 
 CC              = gcc -w
-CXX		= g++ -w -I. -fno-strict-prototypes -D_MIT_POSIX_THREADS -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS # -D__ACE_INLINE__ 
+CXX		= g++ -w -I. -fno-strict-prototypes -D_MIT_POSIX_THREADS -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS
 DLD             = $(CXX)
 LD		= $(CXX) 
 LIBS            += -lpthreads -lstdc++
diff --git a/include/makeinclude/platform_m88k.GNU b/include/makeinclude/platform_m88k.GNU
index 9c8f74a829c..77aeb7d064e 100644
--- a/include/makeinclude/platform_m88k.GNU
+++ b/include/makeinclude/platform_m88k.GNU
@@ -1,8 +1,8 @@
 # SunOS 5.x (Solaris 2.x) with SunC++ 4.x
 # *not* using Orbix
 CC		= gcc -w
-#CXX		= g++ -w -frepo -I. -fno-strict-prototypes -D__INLINE__
-CXX             = g++ -w -I. -fno-strict-prototypes -D__INLINE__
+#CXX		= g++ -w -frepo -I. -fno-strict-prototypes
+CXX             = g++ -w -I. -fno-strict-prototypes
 CXX		+= -D__m88k__
 DLD		= $(CXX) 
 LD		= $(CXX) 
diff --git a/include/makeinclude/platform_osf1_4.0_g++.GNU b/include/makeinclude/platform_osf1_4.0_g++.GNU
index 044bf2e3a0b..5dba924add5 100644
--- a/include/makeinclude/platform_osf1_4.0_g++.GNU
+++ b/include/makeinclude/platform_osf1_4.0_g++.GNU
@@ -2,7 +2,7 @@
 # (OSF/1 4.0) and GCC in version 2.7.2.1 (or newer).
 
 CC		= gcc -g -D_REENTRANT
-CXX		= g++ -g -D_REENTRANT -fno-strict-prototypes # -D__ACE_INLINE__ 
+CXX		= g++ -g -D_REENTRANT -fno-strict-prototypes 
 LD		= $(CXX)
 DLD		= $(CXX)
 LIBS		+= -lpthread -lmach -lexc -ltli -lstdc++
diff --git a/include/makeinclude/platform_sco-nothread.GNU b/include/makeinclude/platform_sco-nothread.GNU
index f0d14578558..66539fd0534 100644
--- a/include/makeinclude/platform_sco-nothread.GNU
+++ b/include/makeinclude/platform_sco-nothread.GNU
@@ -4,7 +4,7 @@
 CC              = gcc -w
 # for threads
 # for no threads
-CXX		= g++ -fno-implicit-templates -w -I. -fno-strict-prototypes # -D__ACE_INLINE__
+CXX		= g++ -fno-implicit-templates -w -I. -fno-strict-prototypes
 DLD             = $(CXX)
 LD		= $(CXX)
 LIBS            = -lstdc++ -lsocket
diff --git a/include/makeinclude/platform_sunos4_g++.GNU b/include/makeinclude/platform_sunos4_g++.GNU
index b4aa576cbae..168597448e1 100644
--- a/include/makeinclude/platform_sunos4_g++.GNU
+++ b/include/makeinclude/platform_sunos4_g++.GNU
@@ -3,7 +3,7 @@
 # SOBUILD - compile into .so directly
 #
 CC	= gcc 
-CXX	= g++ -I. -fno-strict-prototypes # -D__ACE_INLINE__ # -frepo 
+CXX	= g++ -I. -fno-strict-prototypes   # -frepo 
 DLD	= /bin/ld
 LD	= $(CXX)
 #
diff --git a/include/makeinclude/platform_sunos5_g++.GNU b/include/makeinclude/platform_sunos5_g++.GNU
index 2c57a224933..fa9d4b0126d 100644
--- a/include/makeinclude/platform_sunos5_g++.GNU
+++ b/include/makeinclude/platform_sunos5_g++.GNU
@@ -2,7 +2,7 @@
 #
 # SOBUILD - compile into .so directly
 #
-CXX		= g++ -I. -Wall -Wpointer-arith # -D__ACE_INLINE__ # -O2 -Winline
+CXX		= g++ -I. -Wall -Wpointer-arith   # -O2 -Winline
 CC		= $(CXX)
 DLD		= $(CXX)
 LD		= $(CXX)
diff --git a/include/makeinclude/platform_sunos5_sunc++_4.1.GNU b/include/makeinclude/platform_sunos5_sunc++_4.1.GNU
index 8a0f97d0cc4..162d8cc74eb 100644
--- a/include/makeinclude/platform_sunos5_sunc++_4.1.GNU
+++ b/include/makeinclude/platform_sunos5_sunc++_4.1.GNU
@@ -16,7 +16,7 @@
 # There should be no other warnings from Sun C++ when building ACE.
 #
 CC              = cc
-CXX             = CC +w -mt -noex -pta # -D__ACE_INLINE__
+CXX             = CC +w -mt -noex -pta
 DLD             = $(CXX) 
 LD		= $(CXX)
 LDFLAGS         += -R $(WRAPPER_ROOT)/ace 
diff --git a/include/makeinclude/platform_sunos5_x86_g++.GNU b/include/makeinclude/platform_sunos5_x86_g++.GNU
index 69019f241c0..75415663339 100644
--- a/include/makeinclude/platform_sunos5_x86_g++.GNU
+++ b/include/makeinclude/platform_sunos5_x86_g++.GNU
@@ -3,7 +3,7 @@
 # SOBUILD - compile into .so directly
 #
 CC		= gcc 
-CXX		= g++ -I. -fno-strict-prototypes # -D__ACE_INLINE__ # -frepo 
+CXX		= g++ -I. -fno-strict-prototypes # -frepo 
 DLD		= $(CXX)
 LD		= $(CXX)
 LDFLAGS		+= -L $(WRAPPER_ROOT)/ace -L ./ # -z muldefs
diff --git a/include/makeinclude/platform_unixware_g++.GNU b/include/makeinclude/platform_unixware_g++.GNU
index d70b55cec6a..4bbe719b16a 100644
--- a/include/makeinclude/platform_unixware_g++.GNU
+++ b/include/makeinclude/platform_unixware_g++.GNU
@@ -3,7 +3,7 @@
 # SOBUILD - compile into .so directly
 #
 CC		= gcc -w
-CXX		= g++ -I. # -D__ACE_INLINE__      # -w -fno-strict-prototypes
+CXX		= g++ -I.      # -w -fno-strict-prototypes
 DLD		= $(CXX)
 LD		= $(CXX)
 LDFLAGS		+= -L$(WRAPPER_ROOT)/ace -L./ -L/usr/lib
diff --git a/include/makeinclude/platform_vxworks5.x_g++.GNU b/include/makeinclude/platform_vxworks5.x_g++.GNU
index a31750380a8..2f31a0c857e 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 # -D__ACE_INLINE__
+CCFLAGS		+= -B$(GCCLIB_DIR)/ -DCPU=PPC604 -DVXWORKS
 INCLDIRS	+= -I$(TARGET_DIR)/h
 LD		= $(BIN_DIR)/ldppc
 LDFLAGS		+= -r -L$(LIB_DIR) -L$(GCCLIB_DIR)
diff --git a/include/makeinclude/platform_vxworks5.x_ghs.GNU b/include/makeinclude/platform_vxworks5.x_ghs.GNU
index bf664f05935..b41de95d3ab 100644
--- a/include/makeinclude/platform_vxworks5.x_ghs.GNU
+++ b/include/makeinclude/platform_vxworks5.x_ghs.GNU
@@ -2,7 +2,7 @@
 # *not* using Orbix
 CC		= cxvxppc
 CXX		= $(CC)
-CCFLAGS		+= --no_rtti # -D__ACE_INLINE__
+CCFLAGS		+= --no_rtti
 DLD		= $(CXX) 
 LD		= $(CXX)
 LIBS            += /appl/newgreen/vxppc603/indlib.o