summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2011-11-20 19:23:59 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2011-11-20 19:23:59 +0000
commit1a6d67c62938ff8773fa644af29f8aa0050334fa (patch)
tree4b1b8f997883676fbd3b06651963e8338bd00dfb
parent33dc0f834302c639612931b78b23234530a0faea (diff)
downloadATCD-1a6d67c62938ff8773fa644af29f8aa0050334fa.tar.gz
Sun Nov 20 19:22:58 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/Abstract_Servant_Base.h: * tao/PortableServer/Operation_Table.h: * tao/ServerRequestInterceptor_Adapter.h: Fixed gcc warnings
-rw-r--r--TAO/ChangeLog7
-rw-r--r--TAO/tao/Abstract_Servant_Base.h2
-rw-r--r--TAO/tao/Messaging/AMH_Response_Handler.h2
-rw-r--r--TAO/tao/PortableServer/Operation_Table.h4
-rw-r--r--TAO/tao/ServerRequestInterceptor_Adapter.h2
5 files changed, 12 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 9553eb07a71..81701a057bc 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Sun Nov 20 19:22:58 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tao/Abstract_Servant_Base.h:
+ * tao/PortableServer/Operation_Table.h:
+ * tao/ServerRequestInterceptor_Adapter.h:
+ Fixed gcc warnings
+
Sun Nov 20 19:16:59 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/Skeleton_Inheritance/skel_inheritance.mpc:
diff --git a/TAO/tao/Abstract_Servant_Base.h b/TAO/tao/Abstract_Servant_Base.h
index 2b43c83a648..064a64844f0 100644
--- a/TAO/tao/Abstract_Servant_Base.h
+++ b/TAO/tao/Abstract_Servant_Base.h
@@ -55,7 +55,7 @@ namespace TAO
namespace Portable_Server
{
class Servant_Upcall;
- };
+ }
}
typedef void (*TAO_Skeleton)(
diff --git a/TAO/tao/Messaging/AMH_Response_Handler.h b/TAO/tao/Messaging/AMH_Response_Handler.h
index 416ab8f0962..df4fd4b836c 100644
--- a/TAO/tao/Messaging/AMH_Response_Handler.h
+++ b/TAO/tao/Messaging/AMH_Response_Handler.h
@@ -57,7 +57,7 @@ typedef ACE_Allocator TAO_AMH_BUFFER_ALLOCATOR;
*
* One RH is created for every client request and the RH can be used
* only once i.e., the asynchronous method can be called only once.
- * This class also encapsulates various initialisation and
+ * This class also encapsulates various initialization and
* response-sending functionality that is common to all RHs (generated
* by the IDL compiler). Thus the IDL-compiler has to generate less
* code which in turn reduces the overall code size for an
diff --git a/TAO/tao/PortableServer/Operation_Table.h b/TAO/tao/PortableServer/Operation_Table.h
index 1e60758646d..76047c9eb5e 100644
--- a/TAO/tao/PortableServer/Operation_Table.h
+++ b/TAO/tao/PortableServer/Operation_Table.h
@@ -34,8 +34,8 @@ namespace TAO
namespace Portable_Server
{
class Servant_Upcall;
- };
-};
+ }
+}
typedef void (*TAO_Skeleton)(
TAO_ServerRequest &,
diff --git a/TAO/tao/ServerRequestInterceptor_Adapter.h b/TAO/tao/ServerRequestInterceptor_Adapter.h
index a04fe3d7662..6b3577c198d 100644
--- a/TAO/tao/ServerRequestInterceptor_Adapter.h
+++ b/TAO/tao/ServerRequestInterceptor_Adapter.h
@@ -59,7 +59,7 @@ namespace TAO
namespace Portable_Server
{
class Servant_Upcall;
- };
+ }
/**
* @class ServerRequestInterceptor_Adapter