ChangeLogTag: Mon Jul 28 09:33:23 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

4 files changed, 35 insertions, 10 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 49327114460..b9a383b18c9 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Mon Jul 28 09:33:23 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/RTScheduling/Current.cpp:
+        * tao/RTScheduling/Current.h:
+
+          Cosmetic changes.
+
+        * tao/RTScheduling/TAO_RTScheduler.dsp:
+
+          Fixed typos in export preprocessor flag.
+
 Mon Jul 28 09:14:34 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * orbsvcs/tests/Notify/lib/TAO_NotifyTests.dsp:
diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp
index d56dd6e2462..711b6635036 100644
--- a/TAO/tao/RTScheduling/Current.cpp
+++ b/TAO/tao/RTScheduling/Current.cpp
@@ -24,7 +24,7 @@ TAO_RTScheduler_Current::TAO_RTScheduler_Current (void)
 
 void
 TAO_RTScheduler_Current::init (TAO_ORB_Core* orb 
-			       ACE_ENV_ARG_DECL)
+			                         ACE_ENV_ARG_DECL)
 {
   this->orb_ = orb;
   
diff --git a/TAO/tao/RTScheduling/Current.h b/TAO/tao/RTScheduling/Current.h
index ba19075b3c7..ccdc7f4b199 100644
--- a/TAO/tao/RTScheduling/Current.h
+++ b/TAO/tao/RTScheduling/Current.h
@@ -39,18 +39,32 @@ public:
 };
 
 
-typedef ACE_Hash_Map_Manager_Ex<IdType, RTScheduling::DistributableThread_var, TAO_DTId_Hash, ACE_Equal_To<IdType>, TAO_SYNCH_MUTEX> DT_Hash_Map;
-typedef ACE_Hash_Map_Iterator_Ex<IdType, RTScheduling::DistributableThread_var, TAO_DTId_Hash, ACE_Equal_To<IdType>, TAO_SYNCH_MUTEX> DT_Hash_Map_Iterator;
-typedef ACE_Hash_Map_Entry <IdType,RTScheduling::DistributableThread_var> DT_Hash_Map_Entry;
+typedef ACE_Hash_Map_Manager_Ex<IdType, 
+                                RTScheduling::DistributableThread_var, 
+                                TAO_DTId_Hash, 
+                                ACE_Equal_To<IdType>, 
+                                TAO_SYNCH_MUTEX> 
+  DT_Hash_Map;
+
+typedef ACE_Hash_Map_Iterator_Ex<IdType, 
+                                 RTScheduling::DistributableThread_var, 
+                                 TAO_DTId_Hash, 
+                                 ACE_Equal_To<IdType>, 
+                                 TAO_SYNCH_MUTEX> 
+  DT_Hash_Map_Iterator;
+
+typedef ACE_Hash_Map_Entry<IdType,
+                           RTScheduling::DistributableThread_var> 
+  DT_Hash_Map_Entry;
 
 class TAO_RTScheduler_Current;
 class TAO_RTScheduler_Current_var;
 
 typedef TAO_RTScheduler_Current* TAO_RTScheduler_Current_ptr;
 
-class TAO_RTScheduler_Export TAO_RTScheduler_Current: 
-public RTScheduling::Current,
-  public TAO_Local_RefCounted_Object
+class TAO_RTScheduler_Export TAO_RTScheduler_Current
+  : public RTScheduling::Current,
+    public TAO_Local_RefCounted_Object
 {
  public:
   
diff --git a/TAO/tao/RTScheduling/TAO_RTScheduler.dsp b/TAO/tao/RTScheduling/TAO_RTScheduler.dsp
index 1f4804bdb18..1229f2ac2a5 100644
--- a/TAO/tao/RTScheduling/TAO_RTScheduler.dsp
+++ b/TAO/tao/RTScheduling/TAO_RTScheduler.dsp
@@ -45,7 +45,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "RTScheduler_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "TAO_RTScheduler_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "TAO_RTSCHEDULER_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

@@ -101,7 +101,7 @@ LINK32=link.exe
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_EVENT_BUILD_DLL" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D ACE_HAS_MFC=1 /D "TAO_RTScheduler_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D ACE_HAS_MFC=1 /D "TAO_RTSCHEDULER_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

@@ -130,7 +130,7 @@ LINK32=link.exe
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_EVENT_BUILD_DLL" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D ACE_HAS_MFC=1 /D "TAO_RTScheduler_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D ACE_HAS_MFC=1 /D "TAO_RTSCHEDULER_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32