Merged revisions 81225,81227-81228 via svnmerge from

https://svn.dre.vanderbilt.edu/DOC/Middleware/trunk/ACE

........
  r81225 | johnnyw | 2008-04-03 02:06:15 -0500 (Thu, 03 Apr 2008) | 1 line
  
  Thu Apr  3 07:05:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
........
  r81227 | sma | 2008-04-03 04:45:49 -0500 (Thu, 03 Apr 2008) | 1 line
  
  ChangeLogTag: Thu Apr  3 09:40:00 UTC 2008  Simon Massey  <simon dot massey at prismtech dot com>
........
  r81228 | johnnyw | 2008-04-03 09:16:42 -0500 (Thu, 03 Apr 2008) | 1 line
  
  Thu Apr  3 14:13:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
........

6 files changed, 81 insertions, 34 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index c4a400f9965..669374d8824 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,24 @@
+Thu Apr  3 14:13:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/platform_vxworks5.5.x.GNU:
+        * include/makeinclude/platform_vxworks6.2.GNU:
+        * include/makeinclude/platform_vxworks6.3.GNU:
+          Changed the make variable from which we zap the -ansi and also support
+          this with the diab compiler
+
+Thu Apr  3 09:40:00 UTC 2008  Simon Massey  <simon dot massey at prismtech dot com>
+
+        * apps/JAWS/stress_testing/benchd.cpp:
+
+          Using "interface" as the descriptive name of a parameter seems to
+          cause VC8 (when building with MFC) to assume you mean a struct type
+          and it raises an incorrect systax error.
+
+Thu Apr  3 07:05:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/templates/gnu.mpd:
+          Generate link_groups also when staticflags are not set
+
 Wed Apr  2 21:40:00 UTC 2008  J.T. Conklin  <jtc@acorntoolworks.com>
 
         * configure.ac:
diff --git a/ACE/apps/JAWS/stress_testing/benchd.cpp b/ACE/apps/JAWS/stress_testing/benchd.cpp
index f2cf497f2e6..da657813e09 100644
--- a/ACE/apps/JAWS/stress_testing/benchd.cpp
+++ b/ACE/apps/JAWS/stress_testing/benchd.cpp
@@ -37,7 +37,7 @@ class Handle_Events : public ACE_Event_Handler
 public:
   Handle_Events (u_short udp_port,
 		 const char *ip_addr,
-		 const char *interface,
+		 const char *interface_,
 		 ACE_Reactor &reactor);
   ~Handle_Events (void);
 
@@ -115,7 +115,7 @@ Handle_Events::~Handle_Events (void)
 
 Handle_Events::Handle_Events (u_short udp_port,
 			      const char *ip_addr,
-			      const char *interface,
+			      const char *interface_,
 			      ACE_Reactor &reactor)
 {
   // Create multicast address to listen on.
@@ -124,7 +124,7 @@ Handle_Events::Handle_Events (u_short udp_port,
 
   // subscribe to multicast group.
 
-  if (this->mcast_.subscribe (sockmc_addr, 1, interface) == -1)
+  if (this->mcast_.subscribe (sockmc_addr, 1, interface_) == -1)
     ACE_OS::perror ("can't subscribe to multicast group"), ACE_OS::exit (1);
 
   // Disable loopbacks.
diff --git a/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/ACE/bin/MakeProjectCreator/templates/gnu.mpd
index f5335a84ad9..beb0821e514 100644
--- a/ACE/bin/MakeProjectCreator/templates/gnu.mpd
+++ b/ACE/bin/MakeProjectCreator/templates/gnu.mpd
@@ -450,9 +450,11 @@ ifeq ($(shared_libs),1)
   endif
 endif
 <%endif%>
-<%if(staticflags)%>
+<%if(staticflags || exename)%>
 ifeq ($(static_libs),1)
+<%if(staticflags)%>
   CPPFLAGS +=<%foreach(staticflags)%> -D<%staticflag%><%endfor%>
+<%endif%>
 <%if(exename)%>
   ifeq ($(link_groups), 1)
     LDLIBS := -Wl,--start-group $(LDLIBS) -Wl,--end-group
diff --git a/ACE/include/makeinclude/platform_vxworks5.5.x.GNU b/ACE/include/makeinclude/platform_vxworks5.5.x.GNU
index de35dabe87f..6aa3c3d38aa 100644
--- a/ACE/include/makeinclude/platform_vxworks5.5.x.GNU
+++ b/ACE/include/makeinclude/platform_vxworks5.5.x.GNU
@@ -156,6 +156,24 @@ include $(TARGET_DIR)/make/defs.$(WIND_HOST_TYPE)
 include $(TARGET_DIR)/make/defs.$(PRJ_TYPE)
 include $(TARGET_DIR)/tool/$(TOOL_FAMILY)/make.$(CPU)$(TOOL)
 
+no_cflags_ansi ?= 0
+ifeq ($(no_cflags_ansi), 1)
+  ifeq ("$(TOOL_FAMILY)","gnu")
+    CC_COMPILER := $(filter-out -ansi, $(CC_COMPILER))
+  else
+    CC_COMPILER := $(filter-out -Xansi, $(CC_COMPILER))
+  endif
+endif
+
+no_ccflags_ansi ?= 0
+ifeq ($(no_ccflags_ansi), 1)
+  ifeq ("$(TOOL_FAMILY)","gnu")
+    C++_COMPILER := $(filter-out -ansi, $(C++_COMPILER))
+  else
+    C++_COMPILER := $(filter-out -Xansi, $(C++_COMPILER))
+  endif
+endif
+
 ## make sure we don't use that stupid, crippled vxrm.bat script.
 override RM=rm -f
 
@@ -278,16 +296,6 @@ CCFLAGS         += $(C++FLAGS)
 
 PIC              =
 
-no_cflags_ansi ?= 0
-ifeq ($(no_cflags_ansi), 1)
-  CFLAGS := $(filter-out -ansi, $(CFLAGS))
-endif
-
-no_ccflags_ansi ?= 0
-ifeq ($(no_ccflags_ansi), 1)
-  CCFLAGS := $(filter-out -ansi, $(CCFLAGS))
-endif
-
 ifeq ($(VXWORKSLINK),1)
 
   ifdef repo
diff --git a/ACE/include/makeinclude/platform_vxworks6.2.GNU b/ACE/include/makeinclude/platform_vxworks6.2.GNU
index f0d9bd1be93..f5198739418 100644
--- a/ACE/include/makeinclude/platform_vxworks6.2.GNU
+++ b/ACE/include/makeinclude/platform_vxworks6.2.GNU
@@ -202,6 +202,24 @@ else
   include $(TGT_DIR)/h/tool/$(TOOL_FAMILY)/make.$(CPU)$(TOOL)
 endif
 
+no_cflags_ansi ?= 0
+ifeq ($(no_cflags_ansi), 1)
+  ifeq ("$(TOOL_FAMILY)","gnu")
+    CC_COMPILER := $(filter-out -ansi, $(CC_COMPILER))
+  else
+    CC_COMPILER := $(filter-out -Xansi, $(CC_COMPILER))
+  endif
+endif
+
+no_ccflags_ansi ?= 0
+ifeq ($(no_ccflags_ansi), 1)
+  ifeq ("$(TOOL_FAMILY)","gnu")
+    C++_COMPILER := $(filter-out -ansi, $(C++_COMPILER))
+  else
+    C++_COMPILER := $(filter-out -Xansi, $(C++_COMPILER))
+  endif
+endif
+
 ifeq ($(VXWORKSLINK),1)
   # prevent possible clash with static LIB rules
   # in VxWorks make includes and rules.lib.GNU
@@ -326,16 +344,6 @@ else
 endif
 endif
 
-no_cflags_ansi ?= 0
-ifeq ($(no_cflags_ansi), 1)
-  CFLAGS := $(filter-out -ansi, $(CFLAGS))
-endif
-
-no_ccflags_ansi ?= 0
-ifeq ($(no_ccflags_ansi), 1)
-  CCFLAGS := $(filter-out -ansi, $(CCFLAGS))
-endif
-
 ifeq ($(VXWORKSLINK),1)
 
   ifeq ($(repo),1)
diff --git a/ACE/include/makeinclude/platform_vxworks6.3.GNU b/ACE/include/makeinclude/platform_vxworks6.3.GNU
index 037445d6d2a..ad5dee27aeb 100644
--- a/ACE/include/makeinclude/platform_vxworks6.3.GNU
+++ b/ACE/include/makeinclude/platform_vxworks6.3.GNU
@@ -232,6 +232,24 @@ else
 endif
 endif
 
+no_cflags_ansi ?= 0
+ifeq ($(no_cflags_ansi), 1)
+  ifeq ("$(TOOL_FAMILY)","gnu")
+    CC_COMPILER := $(filter-out -ansi, $(CC_COMPILER))
+  else
+    CC_COMPILER := $(filter-out -Xansi, $(CC_COMPILER))
+  endif
+endif
+
+no_ccflags_ansi ?= 0
+ifeq ($(no_ccflags_ansi), 1)
+  ifeq ("$(TOOL_FAMILY)","gnu")
+    C++_COMPILER := $(filter-out -ansi, $(C++_COMPILER))
+  else
+    C++_COMPILER := $(filter-out -Xansi, $(C++_COMPILER))
+  endif
+endif
+
 ifeq ($(footprint),1)
   LD_PARTIALFLAGS += -Xlinker -M -Xlinker -Map -Xlinker $@.map
 endif
@@ -359,16 +377,6 @@ endif
 
 CCFLAGS         += $(C++FLAGS)
 
-no_cflags_ansi ?= 0
-ifeq ($(no_cflags_ansi), 1)
-  CFLAGS := $(filter-out -ansi, $(CFLAGS))
-endif
-
-no_ccflags_ansi ?= 0
-ifeq ($(no_ccflags_ansi), 1)
-  CCFLAGS := $(filter-out -ansi, $(CCFLAGS))
-endif
-
 ifeq ($(VXWORKSLINK), 1)
 
   ifeq ($(repo),1)