summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2010-08-27 08:16:09 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2010-08-27 08:16:09 +0000
commitb0431823dda78fae96b771eecbd52e9c07d606ac (patch)
tree629c2fce013f1567805fd88d8c86ce89ba7a17c4 /TAO
parent202c30423c0ab99e910d34400f6e6369b373bb03 (diff)
downloadATCD-b0431823dda78fae96b771eecbd52e9c07d606ac.tar.gz
Fri Aug 27 08:16:20 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/tao.mpc: Removed zapped file * tests/Portable_Interceptors/Dynamic/client_interceptor.cpp: * tao/TransportCurrent/Current_Impl.cpp: Layout changes
Diffstat (limited to 'TAO')
-rw-r--r--TAO/ChangeLog9
-rw-r--r--TAO/tao/TransportCurrent/Current_Impl.cpp1
-rw-r--r--TAO/tao/tao.mpc1
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp7
4 files changed, 10 insertions, 8 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 15c33a74a4a..534769fb7f1 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Fri Aug 27 08:16:20 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tao/tao.mpc:
+ Removed zapped file
+
+ * tests/Portable_Interceptors/Dynamic/client_interceptor.cpp:
+ * tao/TransportCurrent/Current_Impl.cpp:
+ Layout changes
+
Fri Aug 27 06:57:04 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* etc/tao_anytypecode.doxygen:
diff --git a/TAO/tao/TransportCurrent/Current_Impl.cpp b/TAO/tao/TransportCurrent/Current_Impl.cpp
index 3a824224b9e..35ffd085246 100644
--- a/TAO/tao/TransportCurrent/Current_Impl.cpp
+++ b/TAO/tao/TransportCurrent/Current_Impl.cpp
@@ -19,7 +19,6 @@
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
namespace TAO
{
namespace Transport
diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc
index 93de90b1d0a..8d4e8d5c83a 100644
--- a/TAO/tao/tao.mpc
+++ b/TAO/tao/tao.mpc
@@ -318,7 +318,6 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, taoid
Array_VarOut_T.h
Asynch_Queued_Message.h
Asynch_Reply_Dispatcher_Base.h
- Auto_Functor.h
Base_Transport_Property.h
Basic_Arguments.h
Basic_Argument_T.h
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
index 082e29a7826..33fb5fbb16c 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
@@ -10,10 +10,6 @@
#include "ace/Log_Msg.h"
#include "ace/OS_NS_string.h"
-ACE_RCSID (Dynamic,
- client_interceptor,
- "$Id$")
-
Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor (void)
: myname_ ("Echo_Client_Interceptor")
{
@@ -36,8 +32,7 @@ Echo_Client_Request_Interceptor::destroy (void)
void
Echo_Client_Request_Interceptor::send_poll (
- PortableInterceptor::ClientRequestInfo_ptr
- )
+ PortableInterceptor::ClientRequestInfo_ptr)
{
// Do nothing
}