summaryrefslogtreecommitdiff
path: root/CIAO/ciao
diff options
context:
space:
mode:
authorWilliam R. Otte <wotte@dre.vanderbilt.edu>2009-02-11 19:37:45 +0000
committerWilliam R. Otte <wotte@dre.vanderbilt.edu>2009-02-11 19:37:45 +0000
commit84d2711827c1e023b9b564d58689e85983d8792b (patch)
tree794bf5cc64f5246bf3d67c997710fe534e137ef7 /CIAO/ciao
parent4062624b332ead4b9a9f932643c127cc39ea38df (diff)
downloadATCD-84d2711827c1e023b9b564d58689e85983d8792b.tar.gz
ChangeLogTag: Wed Feb 11 19:33:59 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu>
Diffstat (limited to 'CIAO/ciao')
-rw-r--r--CIAO/ciao/CIAO.mpc1
-rw-r--r--CIAO/ciao/ComponentServer/CIAO_ComponentServer.cpp2
-rw-r--r--CIAO/ciao/ComponentServer/CIAO_ComponentServer.h1
-rw-r--r--CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc1
-rw-r--r--CIAO/ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp1
-rw-r--r--CIAO/ciao/ComponentServer/CIAO_ComponentServer_Impl.h1
-rw-r--r--CIAO/ciao/ComponentServer/CIAO_Container_Impl.cpp1
-rw-r--r--CIAO/ciao/ComponentServer/CIAO_Container_Impl.h1
-rw-r--r--CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp1
-rw-r--r--CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.h1
-rw-r--r--CIAO/ciao/ComponentServer/Configurator_Factory.cpp2
-rw-r--r--CIAO/ciao/ComponentServer/Configurator_Factory.h1
-rw-r--r--CIAO/ciao/ComponentServer/Configurators/Config_Manager.cpp1
-rw-r--r--CIAO/ciao/ComponentServer/Configurators/Configurators.mpc1
-rw-r--r--CIAO/ciao/ComponentServer/Configurators/NoOp/NoOp_Configurator.mpc1
-rw-r--r--CIAO/ciao/Containers/Session/Session_Container.cpp4
-rw-r--r--CIAO/ciao/Logger/CIAOLoggerFactory.h1
-rw-r--r--CIAO/ciao/Logger/File_Logger_Backend.cpp2
-rw-r--r--CIAO/ciao/Logger/File_Logger_Backend.h1
-rw-r--r--CIAO/ciao/Logger/Log_Macros.h1
-rw-r--r--CIAO/ciao/Logger/Logger_Service.cpp2
-rw-r--r--CIAO/ciao/Logger/Logger_Service.h1
-rw-r--r--CIAO/ciao/Servants/Servants.mpc1
23 files changed, 24 insertions, 6 deletions
diff --git a/CIAO/ciao/CIAO.mpc b/CIAO/ciao/CIAO.mpc
index a9e25a92fb0..22e8f38c565 100644
--- a/CIAO/ciao/CIAO.mpc
+++ b/CIAO/ciao/CIAO.mpc
@@ -1,3 +1,4 @@
+// $Id$
project(CIAO_Exception_IDL) : taoidldefaults {
custom_only = 1
IDL_Files {
diff --git a/CIAO/ciao/ComponentServer/CIAO_ComponentServer.cpp b/CIAO/ciao/ComponentServer/CIAO_ComponentServer.cpp
index 2ae39ff1827..b4b26a71154 100644
--- a/CIAO/ciao/ComponentServer/CIAO_ComponentServer.cpp
+++ b/CIAO/ciao/ComponentServer/CIAO_ComponentServer.cpp
@@ -1,7 +1,7 @@
/**
* @file CIAO_ComponentServer.cpp
* @author William R. Otte
- *
+ * // $Id$
* Implementation and main for CIAO_ComponentServer.
*/
diff --git a/CIAO/ciao/ComponentServer/CIAO_ComponentServer.h b/CIAO/ciao/ComponentServer/CIAO_ComponentServer.h
index 20828f7f078..1b89ff461e0 100644
--- a/CIAO/ciao/ComponentServer/CIAO_ComponentServer.h
+++ b/CIAO/ciao/ComponentServer/CIAO_ComponentServer.h
@@ -1,3 +1,4 @@
+// $Id$
/**
* @file CIAO_ComponentServer.h
* @author William R. Otte
diff --git a/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc b/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc
index 24b9500d1bb..32bae2b5171 100644
--- a/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc
+++ b/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc
@@ -1,3 +1,4 @@
+// $Id$
project(CIAO_ComponentServer_IDL) : taoidldefaults, anytypecode {
idlflags += -Wb,stub_export_macro=CIAO_ComponentServer_stub_Export
idlflags += -Wb,stub_export_include=CIAO_ComponentServer_stub_export.h
diff --git a/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp b/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp
index 7521f828288..7b3d97a0449 100644
--- a/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp
+++ b/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp
@@ -1,3 +1,4 @@
+// $Id$
#include "CIAO_ComponentServer_Impl.h"
#include "ciao/CIAO_common.h"
diff --git a/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Impl.h b/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Impl.h
index bf08fbbc7bb..7ec3e81fa98 100644
--- a/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Impl.h
+++ b/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Impl.h
@@ -1,3 +1,4 @@
+// $Id$
/**
* @file CIAO_ComponentServer_Impl.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/ciao/ComponentServer/CIAO_Container_Impl.cpp b/CIAO/ciao/ComponentServer/CIAO_Container_Impl.cpp
index e555bac7337..9614d290841 100644
--- a/CIAO/ciao/ComponentServer/CIAO_Container_Impl.cpp
+++ b/CIAO/ciao/ComponentServer/CIAO_Container_Impl.cpp
@@ -1,3 +1,4 @@
+// $Id$
#include "CIAO_Container_Impl.h"
#include "ace/Log_Msg.h"
diff --git a/CIAO/ciao/ComponentServer/CIAO_Container_Impl.h b/CIAO/ciao/ComponentServer/CIAO_Container_Impl.h
index 3f85cc731ff..5ebf2994aa8 100644
--- a/CIAO/ciao/ComponentServer/CIAO_Container_Impl.h
+++ b/CIAO/ciao/ComponentServer/CIAO_Container_Impl.h
@@ -1,3 +1,4 @@
+// $Id$
/**
* @file CIAO_Container_Impl.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp b/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp
index 9496216eea7..884d7c24f88 100644
--- a/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp
+++ b/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp
@@ -1,3 +1,4 @@
+// $Id$
#include "CIAO_ServerActivator_Impl.h"
#include "ace/Log_Msg.h"
diff --git a/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.h b/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.h
index 8eb539e88cd..3c607093db1 100644
--- a/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.h
+++ b/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.h
@@ -1,3 +1,4 @@
+// $Id$
/**
* @file CIAO_ServerActivator_Impl.h
* @author William R. Otte
diff --git a/CIAO/ciao/ComponentServer/Configurator_Factory.cpp b/CIAO/ciao/ComponentServer/Configurator_Factory.cpp
index 9027da2559b..1bdc33a8558 100644
--- a/CIAO/ciao/ComponentServer/Configurator_Factory.cpp
+++ b/CIAO/ciao/ComponentServer/Configurator_Factory.cpp
@@ -1,5 +1,5 @@
#include "Configurator_Factory.h"
-
+// $Id$
#include "ace/Arg_Shifter.h"
#include "ciao/CIAO_common.h"
#include "Configurators/Server_Configurator.h"
diff --git a/CIAO/ciao/ComponentServer/Configurator_Factory.h b/CIAO/ciao/ComponentServer/Configurator_Factory.h
index 374bcb244e8..0e421fb1a9e 100644
--- a/CIAO/ciao/ComponentServer/Configurator_Factory.h
+++ b/CIAO/ciao/ComponentServer/Configurator_Factory.h
@@ -1,3 +1,4 @@
+// $Id$
/**
* @file Configurator_Factory.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/ciao/ComponentServer/Configurators/Config_Manager.cpp b/CIAO/ciao/ComponentServer/Configurators/Config_Manager.cpp
index 47ee45a81a4..bfab13b286d 100644
--- a/CIAO/ciao/ComponentServer/Configurators/Config_Manager.cpp
+++ b/CIAO/ciao/ComponentServer/Configurators/Config_Manager.cpp
@@ -1,3 +1,4 @@
+// $Id$
#include "Config_Manager.h"
namespace CIAO
diff --git a/CIAO/ciao/ComponentServer/Configurators/Configurators.mpc b/CIAO/ciao/ComponentServer/Configurators/Configurators.mpc
index 4fe1a9bddd6..de17a603bc6 100644
--- a/CIAO/ciao/ComponentServer/Configurators/Configurators.mpc
+++ b/CIAO/ciao/ComponentServer/Configurators/Configurators.mpc
@@ -1,3 +1,4 @@
+// $Id$
project(CIAO_Basic_Configurator) : ccm_stub, ciao_componentserver_stub, ciao_lib {
dynamicflags += COMPONENTSERVER_CONFIGURATOR_BUILD_DLL
Source_Files {
diff --git a/CIAO/ciao/ComponentServer/Configurators/NoOp/NoOp_Configurator.mpc b/CIAO/ciao/ComponentServer/Configurators/NoOp/NoOp_Configurator.mpc
index 9bd13b08b33..fd7e9c06285 100644
--- a/CIAO/ciao/ComponentServer/Configurators/NoOp/NoOp_Configurator.mpc
+++ b/CIAO/ciao/ComponentServer/Configurators/NoOp/NoOp_Configurator.mpc
@@ -1,3 +1,4 @@
+// $Id$
project(CIAO_NoOp_Configurator) : ccm_stub, ciao_componentserver_stub, ciao_lib {
after += CIAO_Basic_Configurator
libs += CIAO_Basic_Configurator
diff --git a/CIAO/ciao/Containers/Session/Session_Container.cpp b/CIAO/ciao/Containers/Session/Session_Container.cpp
index 70cf8cc9835..bdbf9ea0c5e 100644
--- a/CIAO/ciao/Containers/Session/Session_Container.cpp
+++ b/CIAO/ciao/Containers/Session/Session_Container.cpp
@@ -558,10 +558,10 @@ namespace CIAO
// standard forbids casting a pointer-to-object (including
// void*) directly to a pointer-to-function.
void *void_ptr = executor_dll.symbol (entry_point);
- ACE_DEBUG ((LM_EMERGENCY, "***** vp: %u\n", void_ptr));
+ ACE_DEBUG ((LM_EMERGENCY, "***** vp: %u\n", void_ptr));
ptrdiff_t tmp_ptr = reinterpret_cast<ptrdiff_t> (void_ptr);
ccreator = reinterpret_cast<ComponentFactory> (tmp_ptr);
- ACE_DEBUG ((LM_EMERGENCY, "***** cc: %u\n", ccreator));
+ ACE_DEBUG ((LM_EMERGENCY, "***** cc: %u\n", ccreator));
void_ptr = servant_dll.symbol (servant_entrypoint);
tmp_ptr = reinterpret_cast<ptrdiff_t> (void_ptr);
screator = reinterpret_cast<ComponentServantFactory> (tmp_ptr);
diff --git a/CIAO/ciao/Logger/CIAOLoggerFactory.h b/CIAO/ciao/Logger/CIAOLoggerFactory.h
index 0aadbc4091d..3abee97aaf1 100644
--- a/CIAO/ciao/Logger/CIAOLoggerFactory.h
+++ b/CIAO/ciao/Logger/CIAOLoggerFactory.h
@@ -1,3 +1,4 @@
+// $Id$
#ifndef LOGGERFACTORY_H_
#define LOGGERFACTORY_H_
diff --git a/CIAO/ciao/Logger/File_Logger_Backend.cpp b/CIAO/ciao/Logger/File_Logger_Backend.cpp
index 45c085748a0..192efcd3d0d 100644
--- a/CIAO/ciao/Logger/File_Logger_Backend.cpp
+++ b/CIAO/ciao/Logger/File_Logger_Backend.cpp
@@ -1,4 +1,4 @@
-
+// $Id$
#include "File_Logger_Backend.h"
#include "ace/OS.h"
#include "ace/Log_Record.h"
diff --git a/CIAO/ciao/Logger/File_Logger_Backend.h b/CIAO/ciao/Logger/File_Logger_Backend.h
index 217dbef8438..b8d0bb33985 100644
--- a/CIAO/ciao/Logger/File_Logger_Backend.h
+++ b/CIAO/ciao/Logger/File_Logger_Backend.h
@@ -1,3 +1,4 @@
+// $Id$
#ifndef FILE_LOGGER_BACKEND_H_
#define FILE_LOGGER_BACKEND_H_
diff --git a/CIAO/ciao/Logger/Log_Macros.h b/CIAO/ciao/Logger/Log_Macros.h
index eb3f68a7870..d6c7744e539 100644
--- a/CIAO/ciao/Logger/Log_Macros.h
+++ b/CIAO/ciao/Logger/Log_Macros.h
@@ -1,3 +1,4 @@
+// $Id$
/**
* @file Log_Macros.h
* @author William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/CIAO/ciao/Logger/Logger_Service.cpp b/CIAO/ciao/Logger/Logger_Service.cpp
index 8e295b3fc74..7df48024ddf 100644
--- a/CIAO/ciao/Logger/Logger_Service.cpp
+++ b/CIAO/ciao/Logger/Logger_Service.cpp
@@ -1,4 +1,4 @@
-
+// $Id$
#include "Logger_Service.h"
#include "Log_Macros.h"
#include "ace/Get_Opt.h"
diff --git a/CIAO/ciao/Logger/Logger_Service.h b/CIAO/ciao/Logger/Logger_Service.h
index 5b5134f893d..3e62b75f3df 100644
--- a/CIAO/ciao/Logger/Logger_Service.h
+++ b/CIAO/ciao/Logger/Logger_Service.h
@@ -1,3 +1,4 @@
+// $Id$
#ifndef CIAO_LOGGER_SERVICE_H_
#define CIAO_LOGGER_SERVICE_H_
diff --git a/CIAO/ciao/Servants/Servants.mpc b/CIAO/ciao/Servants/Servants.mpc
index 253fef4a4b8..60e81d8ce3e 100644
--- a/CIAO/ciao/Servants/Servants.mpc
+++ b/CIAO/ciao/Servants/Servants.mpc
@@ -1,3 +1,4 @@
+// $Id$
project(CIAO_Port_Activator_stub) : portableserver, taoidldefaults, ciao_lib {
dynamicflags = CIAO_PORT_ACTIVATOR_BUILD_DLL
idlflags += -Wb,stub_export_include=CIAO_Port_Activator_export.h