ChangeLogTag: Fri Mar 25 15:32:09 UTC 2011 Adam Mitz <mitza@ociweb.com>

2 files changed, 6 insertions, 16 deletions

diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/AMIcallback.mpc b/TAO/DevGuideExamples/Messaging/AMIcallback/AMIcallback.mpc
index 519ebd794eb..ed176d4530e 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/AMIcallback.mpc
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/AMIcallback.mpc
@@ -8,21 +8,9 @@ project(*Server): messaging, taoexe, portableserver, ami {
 }
 
 project(*Client): messaging, taoexe, portableserver, ami {
+  after += *Server
   Source_Files {
     MessengerHandler.cpp
     MessengerClient.cpp
   }
-  verbatim(gnuace, local) {
-    ## Using the -g option causes an internal compiler error with g++ 2.96
-    ## on Linux Itanium when compiling MessengerHandler.cpp.
-    ifeq ($(CXX), g++)
-      ifeq ($(findstring 2.96, $(CXX_VERSION)), 2.96)
-        ifeq ($(shell uname -s), Linux)
-          ifeq ($(shell uname -m), ia64)
-            DCFLAGS = -O0
-	  endif
-	endif
-      endif
-    endif
-  }
 }
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp
index 25b9700c4a9..4bdf3fd51e1 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp
@@ -24,12 +24,14 @@ ServerIORInterceptor::establish_components (
 
   IOP::TaggedComponent myTag;
 
-  myTag.tag =  tagID;
-  myTag.component_data.length (ACE_OS::strlen(permission) + 1 );
+  myTag.tag = tagID;
+  const CORBA::ULong len =
+    static_cast<CORBA::ULong> (ACE_OS::strlen (permission));
+  myTag.component_data.length (len + 1);
 
   CORBA::Octet *buf = myTag.component_data.get_buffer();
 
-  ACE_OS::memcpy (buf, permission, ACE_OS::strlen(permission) + 1);
+  ACE_OS::memcpy (buf, permission, len + 1);
 
   // add tagged component
   info->add_ior_component (myTag);