ChangeLogTag:Mon Jan 3 08:02:33 2005 Douglas C. Schmidt <schmidt@cs.wustl.edu>

12 files changed, 34 insertions, 34 deletions

diff --git a/protocols/ace/TMCast/Export.hpp b/protocols/ace/TMCast/Export.hpp
index f13a69ecefd..bf04f7ee114 100644
--- a/protocols/ace/TMCast/Export.hpp
+++ b/protocols/ace/TMCast/Export.hpp
@@ -2,7 +2,7 @@
 // -*- C++ -*-
 // $Id$
 // Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl TMCast
+// This file is generated automatically by generate_export_file.pl ACE_TMCast
 // ------------------------------
 #ifndef TMCAST_EXPORT_H
 #define TMCAST_EXPORT_H
@@ -19,16 +19,16 @@
 
 #if defined (TMCAST_HAS_DLL) && (TMCAST_HAS_DLL == 1)
 #  if defined (TMCAST_BUILD_DLL)
-#    define TMCast_Export ACE_Proper_Export_Flag
+#    define ACE_TMCast_Export ACE_Proper_Export_Flag
 #    define TMCAST_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
 #    define TMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  else /* TMCAST_BUILD_DLL */
-#    define TMCast_Export ACE_Proper_Import_Flag
+#    define ACE_TMCast_Export ACE_Proper_Import_Flag
 #    define TMCAST_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
 #    define TMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  endif /* TMCAST_BUILD_DLL */
 #else /* TMCAST_HAS_DLL == 1 */
-#  define TMCast_Export
+#  define ACE_TMCast_Export
 #  define TMCAST_SINGLETON_DECLARATION(T)
 #  define TMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #endif /* TMCAST_HAS_DLL == 1 */
diff --git a/protocols/ace/TMCast/FaultDetector.hpp b/protocols/ace/TMCast/FaultDetector.hpp
index ba476cbd367..c3de622806d 100644
--- a/protocols/ace/TMCast/FaultDetector.hpp
+++ b/protocols/ace/TMCast/FaultDetector.hpp
@@ -1,10 +1,10 @@
-// file      : TMCast/FaultDetector.hpp
+// file      : ACE_TMCast/FaultDetector.hpp
 // author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
 // cvs-id    : $Id$
 
 #include "Protocol.hpp"
 
-namespace TMCast
+namespace ACE_TMCast
 {
   class FaultDetector
   {
diff --git a/protocols/ace/TMCast/Group.cpp b/protocols/ace/TMCast/Group.cpp
index 75598fd2fd3..ac4484f4c67 100644
--- a/protocols/ace/TMCast/Group.cpp
+++ b/protocols/ace/TMCast/Group.cpp
@@ -1,4 +1,4 @@
-// file      : TMCast/Group.cpp
+// file      : ACE_TMCast/Group.cpp
 // author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
 // cvs-id    : $Id$
 
@@ -22,7 +22,7 @@
 #include "FaultDetector.hpp"
 #include "TransactionController.hpp"
 
-namespace TMCast
+namespace ACE_TMCast
 {
   bool
   operator== (std::type_info const* pa, std::type_info const& b)
@@ -380,7 +380,7 @@ namespace TMCast
 
           std::type_info const* exp = &typeid (*m);
 
-          if (exp == typeid (TMCast::Aborted))
+          if (exp == typeid (ACE_TMCast::Aborted))
           {
             throw Group::Aborted ();
           }
diff --git a/protocols/ace/TMCast/Group.hpp b/protocols/ace/TMCast/Group.hpp
index 416cea0a17d..13c49f210bb 100644
--- a/protocols/ace/TMCast/Group.hpp
+++ b/protocols/ace/TMCast/Group.hpp
@@ -1,4 +1,4 @@
-// file      : TMCast/Group.hpp
+// file      : ACE_TMCast/Group.hpp
 // author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
 // cvs-id    : $Id$
 
@@ -10,9 +10,9 @@
 
 #include "Export.hpp"
 
-namespace TMCast
+namespace ACE_TMCast
 {
-  class TMCast_Export Group
+  class ACE_TMCast_Export Group
   {
   public:
     class Aborted {};
diff --git a/protocols/ace/TMCast/GroupFwd.hpp b/protocols/ace/TMCast/GroupFwd.hpp
index beba06df79d..b4ed7304ff7 100644
--- a/protocols/ace/TMCast/GroupFwd.hpp
+++ b/protocols/ace/TMCast/GroupFwd.hpp
@@ -1,4 +1,4 @@
-// file      : TMCast/GroupFwd.hpp
+// file      : ACE_TMCast/GroupFwd.hpp
 // author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
 // cvs-id    : $Id$
 
@@ -7,9 +7,9 @@
 
 #include "Export.hpp"
 
-namespace TMCast
+namespace ACE_TMCast
 {
-  class TMCast_Export Group;
+  class ACE_TMCast_Export Group;
 }
 
 #endif // TMCAST_GROUP_FWD_HPP
diff --git a/protocols/ace/TMCast/LinkListener.hpp b/protocols/ace/TMCast/LinkListener.hpp
index b74c676e6c2..adff941a229 100644
--- a/protocols/ace/TMCast/LinkListener.hpp
+++ b/protocols/ace/TMCast/LinkListener.hpp
@@ -1,4 +1,4 @@
-// file      : TMCast/LinkListener.hpp
+// file      : ACE_TMCast/LinkListener.hpp
 // author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
 // cvs-id    : $Id$
 
@@ -12,7 +12,7 @@
 #include "Messaging.hpp"
 #include "Protocol.hpp"
 
-namespace TMCast
+namespace ACE_TMCast
 {
   //
   //
diff --git a/protocols/ace/TMCast/MTQueue.cpp b/protocols/ace/TMCast/MTQueue.cpp
index fd1aa830e96..32d10eb23b7 100644
--- a/protocols/ace/TMCast/MTQueue.cpp
+++ b/protocols/ace/TMCast/MTQueue.cpp
@@ -1,4 +1,4 @@
-// file      : TMCast/MTQueue.cpp
+// file      : ACE_TMCast/MTQueue.cpp
 // author    : Steve Huston  <shuston@riverace.com>
 // cvs-id    : $Id$
 
@@ -6,17 +6,17 @@
 #include "MTQueue.hpp"
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Node<ACE_Refcounted_Auto_Ptr<TMCast::Message,ACE_Null_Mutex> >;
-template class ACE_Unbounded_Queue<ACE_Refcounted_Auto_Ptr<TMCast::Message,ACE_Null_Mutex> >;
-template class ACE_Unbounded_Queue_Iterator<ACE_Refcounted_Auto_Ptr<TMCast::Message,ACE_Null_Mutex> >;
+template class ACE_Node<ACE_Refcounted_Auto_Ptr<ACE_TMCast::Message,ACE_Null_Mutex> >;
+template class ACE_Unbounded_Queue<ACE_Refcounted_Auto_Ptr<ACE_TMCast::Message,ACE_Null_Mutex> >;
+template class ACE_Unbounded_Queue_Iterator<ACE_Refcounted_Auto_Ptr<ACE_TMCast::Message,ACE_Null_Mutex> >;
 template class ACE_Node<ACE_Condition<ACE_Thread_Mutex>* >;
 template class ACE_Unbounded_Set<ACE_Condition<ACE_Thread_Mutex>* >;
 template class ACE_Unbounded_Set_Iterator<ACE_Condition<ACE_Thread_Mutex> *>;
 template class ACE_Unbounded_Set_Const_Iterator<ACE_Condition<ACE_Thread_Mutex> *>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Node<ACE_Refcounted_Auto_Ptr<TMCast::Message,ACE_Null_Mutex> >
-#pragma instantiate ACE_Unbounded_Queue<ACE_Refcounted_Auto_Ptr<TMCast::Message,ACE_Null_Mutex> >
-#pragma instantiate ACE_Unbounded_Queue_Iterator<ACE_Refcounted_Auto_Ptr<TMCast::Message,ACE_Null_Mutex> >
+#pragma instantiate ACE_Node<ACE_Refcounted_Auto_Ptr<ACE_TMCast::Message,ACE_Null_Mutex> >
+#pragma instantiate ACE_Unbounded_Queue<ACE_Refcounted_Auto_Ptr<ACE_TMCast::Message,ACE_Null_Mutex> >
+#pragma instantiate ACE_Unbounded_Queue_Iterator<ACE_Refcounted_Auto_Ptr<ACE_TMCast::Message,ACE_Null_Mutex> >
 #pragma instantiate ACE_Node<ACE_Condition<ACE_Thread_Mutex> *>
 #pragma instantiate ACE_Unbounded_Set<ACE_Condition<ACE_Thread_Mutex> *>
 #pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Condition<ACE_Thread_Mutex> *>
diff --git a/protocols/ace/TMCast/MTQueue.hpp b/protocols/ace/TMCast/MTQueue.hpp
index 429a73d45ba..47fafa943c1 100644
--- a/protocols/ace/TMCast/MTQueue.hpp
+++ b/protocols/ace/TMCast/MTQueue.hpp
@@ -1,4 +1,4 @@
-// file      : TMCast/MTQueue.hpp
+// file      : ACE_TMCast/MTQueue.hpp
 // author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
 // cvs-id    : $Id$
 
@@ -10,7 +10,7 @@
 #include "ace/Unbounded_Queue.h"
 #include "ace/os_include/sys/os_types.h"
 
-namespace TMCast
+namespace ACE_TMCast
 {
   template <typename T,
             typename M,
diff --git a/protocols/ace/TMCast/Messaging.hpp b/protocols/ace/TMCast/Messaging.hpp
index 6a1000c3265..886745d1120 100644
--- a/protocols/ace/TMCast/Messaging.hpp
+++ b/protocols/ace/TMCast/Messaging.hpp
@@ -1,4 +1,4 @@
-// file      : TMCast/Messaging.hpp
+// file      : ACE_TMCast/Messaging.hpp
 // author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
 // cvs-id    : $Id$
 
@@ -10,7 +10,7 @@
 
 #include "MTQueue.hpp"
 
-namespace TMCast
+namespace ACE_TMCast
 {
   class Message
   {
diff --git a/protocols/ace/TMCast/Protocol.cpp b/protocols/ace/TMCast/Protocol.cpp
index 9d57a97f221..ea4c6b39020 100644
--- a/protocols/ace/TMCast/Protocol.cpp
+++ b/protocols/ace/TMCast/Protocol.cpp
@@ -1,10 +1,10 @@
-// file      : TMCast/Protocol.cpp
+// file      : ACE_TMCast/Protocol.cpp
 // author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
 // cvs-id    : $Id$
 
 #include "Protocol.hpp"
 
-namespace TMCast
+namespace ACE_TMCast
 {
   namespace Protocol
   {
diff --git a/protocols/ace/TMCast/Protocol.hpp b/protocols/ace/TMCast/Protocol.hpp
index d5ae6a50cd6..6cdf374f4f9 100644
--- a/protocols/ace/TMCast/Protocol.hpp
+++ b/protocols/ace/TMCast/Protocol.hpp
@@ -1,11 +1,11 @@
-// file      : TMCast/Protocol.hpp
+// file      : ACE_TMCast/Protocol.hpp
 // author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
 // cvs-id    : $Id$
 
 #ifndef TMCAST_PROTOCOL_HPP
 #define TMCAST_PROTOCOL_HPP
 
-namespace TMCast
+namespace ACE_TMCast
 {
   namespace Protocol
   {
diff --git a/protocols/ace/TMCast/TransactionController.hpp b/protocols/ace/TMCast/TransactionController.hpp
index f1108963ffa..cbeb0f5a7c9 100644
--- a/protocols/ace/TMCast/TransactionController.hpp
+++ b/protocols/ace/TMCast/TransactionController.hpp
@@ -1,4 +1,4 @@
-// file      : TMCast/TransactionController.hpp
+// file      : ACE_TMCast/TransactionController.hpp
 // author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
 // cvs-id    : $Id$
 
@@ -11,7 +11,7 @@
 
 #include <typeinfo>
 
-namespace TMCast
+namespace ACE_TMCast
 {
 
   // Messages