ChangeLogTag:Sun Mar 5 18:36:34 2000 Darrell Brunsch <brunsch@uci.edu>

9 files changed, 333 insertions, 24 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 06d6d51a45a..c88641b9d23 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,19 @@
+Sun Mar  5 18:36:34 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h:
+        * orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.h:
+        * orbsvcs/orbsvcs/Notify/Notify_PushConsumer.h:
+        * orbsvcs/orbsvcs/Notify/Notify_PushSupplier.h:
+        * orbsvcs/orbsvcs/Notify/Notify_StructuredPushConsumer.h:
+        * orbsvcs/orbsvcs/Notify/Notify_StructuredPushSupplier.h:
+
+          Disabled the inheritance by dominance warnings in MSVC.
+             
+        * orbsvcs/orbsvcs/orbsvcs.dsp:
+        * orbsvcs/orbsvcs/orbsvcs_static.dsp:
+
+          Added the new notification files to the projects.
+
 Sun Mar  5 16:36:25 2000  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
 
 	* orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp:
@@ -30,29 +46,29 @@ Sun Mar  5 12:45:50 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 Sat Mar  4 18:11:28 2000  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
 
 	* Modified the following files:
- 	* orbscvs/Notify/Notify_Constraint_Interpreter.h:
-	* orbscvs/Notify/Notify_FilterAdmin_i.{h,cpp}:
-	* orbscvs/Notify/Notify_FilterFactory_i.h:
- 	* orbscvs/Notify/Notify_Filter_i.{h,cpp}:
-	* orbscvs/Notify/Notify_QoSAdmin_i.h :
+ 	* orbsvcs/Notify/Notify_Constraint_Interpreter.h:
+	* orbsvcs/Notify/Notify_FilterAdmin_i.{h,cpp}:
+	* orbsvcs/Notify/Notify_FilterFactory_i.h:
+ 	* orbsvcs/Notify/Notify_Filter_i.{h,cpp}:
+	* orbsvcs/Notify/Notify_QoSAdmin_i.h :
 	  minor changes to header file inclusions.
-	* orbscvs/Notify/Notify_ConsumerAdmin_i.{h,cpp}:
-	* orbscvs/Notify/Notify_SupplierAdmin_i.{h,cpp}:
-	* orbscvs/Notify/Notify_EventChannelFactory_i.{h,cpp}:
-	* orbscvs/Notify/Notify_EventChannel_i.{h,cpp}:
+	* orbsvcs/Notify/Notify_ConsumerAdmin_i.{h,cpp}:
+	* orbsvcs/Notify/Notify_SupplierAdmin_i.{h,cpp}:
+	* orbsvcs/Notify/Notify_EventChannelFactory_i.{h,cpp}:
+	* orbsvcs/Notify/Notify_EventChannel_i.{h,cpp}:
 	  Changed the design for looking up children objects from being
 	  ACE_Hash_Map_Manager based to the POA.Each Object factory in Notify
 	  creates a child POA to activate created objects in.This cleanly
 	  decouples object lookup functionality from the working of the
 	  Event Channel.The unique ID's generated for each object created is
 	  converted to Object Id's for activation and reference lookup.
- 	* orbscvs/Notify/Notify_ProxyPushConsumer_i.{h,cpp}:
- 	* orbscvs/Notify/Notify_ProxyPushSupplier_i.{h,cpp}:
-	* orbscvs/Notify/Notify_StructuredProxyPushConsumer_i.{h,cpp}:
- 	* orbscvs/Notify/Notify_StructuredProxyPushSupplier_i.{h,cpp}:
+ 	* orbsvcs/Notify/Notify_ProxyPushConsumer_i.{h,cpp}:
+ 	* orbsvcs/Notify/Notify_ProxyPushSupplier_i.{h,cpp}:
+	* orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.{h,cpp}:
+ 	* orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.{h,cpp}:
 	  Added 'push' implementations.
- 	* orbscvs/Notify/Notify_StructuredPushConsumer.{h,cpp}:
- 	* orbscvs/Notify/Notify_StructuredPushSupplier.{h,cpp}:
+ 	* orbsvcs/Notify/Notify_StructuredPushConsumer.{h,cpp}:
+ 	* orbsvcs/Notify/Notify_StructuredPushSupplier.{h,cpp}:
           Removed <open> and close methods from helper classes.
         * orbsvcs/orbsvcs/Makefile:
 	  Added new files to Notify, updated dependencies.
@@ -62,29 +78,29 @@ Sat Mar  4 18:11:28 2000  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
 	  Changed to use the new TAO_Notify_StructuredPushConsumer methods.
 
 	  New files:
- 	* orbscvs/Notify/Notify_Event_Manager.{h,cpp}:
+ 	* orbsvcs/Notify/Notify_Event_Manager.{h,cpp}:
 	  The <TAO_Notify_Event_Manager> class controls all aspects of event
 	  propogation from suppliers to consumers, provides methods to handle
 	  subscription and publication lists logic.It also contains the
 	  <recipient_map_> which is the central storage for subscription
 	  lists and is accessed to decide where events should go.
- 	* orbscvs/Notify/Notify_ID_Pool_T.{h,cpp,i}:
+ 	* orbsvcs/Notify/Notify_ID_Pool_T.{h,cpp,i}:
 	  The <TAO_Notify_ID_Pool> template class generates Ids for all object
 	  factories in Notify.Id's can be returned to the pool for recyling.
- 	* orbscvs/Notify/Notify_Listeners.h:
+ 	* orbsvcs/Notify/Notify_Listeners.h:
 	  Defines the <TAO_Notify_Event_Listener> and
 	  <TAO_Notify_Update_Listener> internal interfaces for Notify.
-	* orbscvs/Notify/Notify_ProxyConsumer_T.{h,cpp}:
+	* orbsvcs/Notify/Notify_ProxyConsumer_T.{h,cpp}:
 	  Template Base classes for the Proxy Consumers.
- 	* orbscvs/Notify/Notify_ProxySupplier_T.{h,cpp}:
+ 	* orbsvcs/Notify/Notify_ProxySupplier_T.{h,cpp}:
 	  Template Base classes for the Proxy Suppliers.
- 	* orbscvs/Notify/Notify_PushConsumer.{h,cpp}:
+ 	* orbsvcs/Notify/Notify_PushConsumer.{h,cpp}:
 	  Helper servant implementation for PushConsumers.
- 	* orbscvs/Notify/Notify_PushSupplier.cpp.{h,cpp}:
+ 	* orbsvcs/Notify/Notify_PushSupplier.cpp.{h,cpp}:
 	  Helper servant implementation for PushSuppliers.
- 	* orbscvs/Notify/Notify_Resource_Manager.{h,cpp}:
+ 	* orbsvcs/Notify/Notify_Resource_Manager.{h,cpp}:
 	  All object creations are done here.
- 	* orbscvs/Notify/Notify_Types.{h,cpp}:
+ 	* orbsvcs/Notify/Notify_Types.{h,cpp}:
           Defines the <TAO_Notify_EventType> and Subscription and Publication
 	  list types.
 	* orbsvcs/examples/Notify/Subscribe/Subscribe{.h,.cpp}:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
index 09944a5a7e0..3cec9294d97 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
@@ -25,6 +25,13 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
 class TAO_Notify_Resource_Manager;
 
 class TAO_ORBSVCS_Export TAO_Notify_EventChannelFactory_i : public virtual POA_CosNotifyChannelAdmin::EventChannelFactory, public virtual PortableServer::RefCountServantBase
@@ -107,4 +114,8 @@ virtual CosNotifyChannelAdmin::EventChannel_ptr get_event_channel (
  // Id generator for event channels
 };
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
 #endif /* NOTIFY_EVENTCHANNELFACTORY_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.h
index 6d1ff81a8fa..a83b2fdf6b4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.h
@@ -21,6 +21,13 @@
 
 #include "orbsvcs/orbsvcs/CosNotifyFilterS.h"
 
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
 class TAO_ORBSVCS_Export TAO_Notify_FilterFactory_i : public POA_CosNotifyFilter::FilterFactory, public PortableServer::RefCountServantBase
 {
   // = TITLE
@@ -61,4 +68,8 @@ public:
 
 };
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
 #endif /* NOTIFY_FILTER_FACTORY_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_PushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_PushConsumer.h
index 30d7a6c9634..ab330199b4d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_PushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_PushConsumer.h
@@ -29,6 +29,13 @@
 
 #include "orbsvcs/CosNotifyChannelAdminS.h"
 
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
 class TAO_Notify_PushConsumer : public POA_CosNotifyComm::PushConsumer, public PortableServer::RefCountServantBase
 {
   // = TITLE
@@ -101,4 +108,8 @@ class TAO_Notify_PushConsumer : public POA_CosNotifyComm::PushConsumer, public P
     // The proxy that we are connected to.
 };
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
 #endif /* TAO_NOTIFY_PUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_PushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_PushSupplier.h
index 808ea7773e2..6d2fb6a9c9d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_PushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_PushSupplier.h
@@ -4,6 +4,13 @@
 
 #include "orbsvcs/CosNotifyChannelAdminS.h"
 
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
 class TAO_Notify_PushSupplier : public POA_CosNotifyComm::PushSupplier, public PortableServer::RefCountServantBase
 {
  public:
@@ -63,4 +70,8 @@ class TAO_Notify_PushSupplier : public POA_CosNotifyComm::PushSupplier, public P
     // The proxy that we are connected to.
 };
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
 #endif /* TAO_NOTIFY_PUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredPushConsumer.h
index 8527d946d63..7dbc97e9539 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredPushConsumer.h
@@ -22,6 +22,13 @@
 
 #include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
 
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
 class TAO_ORBSVCS_Export TAO_Notify_StructuredPushConsumer : public POA_CosNotifyComm::StructuredPushConsumer, public PortableServer::RefCountServantBase
 {
   // = TITLE
@@ -93,4 +100,9 @@ protected:
   PortableServer::POA_ptr default_POA_;
   // The default POA.
 };
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
 #endif /* NOTIFY_STRUCTUREDPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredPushSupplier.h
index eb256fa3344..b7db6b32474 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredPushSupplier.h
@@ -21,6 +21,13 @@
 
 #include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
 
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
 class TAO_ORBSVCS_Export TAO_Notify_StructuredPushSupplier:public POA_CosNotifyComm::StructuredPushSupplier, public PortableServer::RefCountServantBase
 {
   // = TITLE
@@ -88,4 +95,9 @@ protected:
   CosNotifyChannelAdmin::StructuredProxyPushConsumer_var consumer_proxy_;
   // The proxy that we are connected to.
 };
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
 #endif /* TAO_NOTIFY_STRUCTUREDPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs.dsp b/TAO/orbsvcs/orbsvcs/orbsvcs.dsp
index 0602173ee41..dd833cfc7f5 100644
--- a/TAO/orbsvcs/orbsvcs/orbsvcs.dsp
+++ b/TAO/orbsvcs/orbsvcs/orbsvcs.dsp
@@ -2719,6 +2719,25 @@ SOURCE=.\Notify\Notify_Dispatcher.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Notify\Notify_Event_Manager.cpp

+

+!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

 SOURCE=.\Notify\Notify_EventChannel_i.cpp

 

 !IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

@@ -2890,6 +2909,44 @@ SOURCE=.\Notify\Notify_ProxySupplier_i.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Notify\Notify_PushConsumer.cpp

+

+!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Notify\Notify_PushSupplier.cpp

+

+!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

 SOURCE=.\Notify\Notify_QoSAdmin_i.cpp

 

 !IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

@@ -2909,6 +2966,25 @@ SOURCE=.\Notify\Notify_QoSAdmin_i.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Notify\Notify_Resource_Manager.cpp

+

+!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

 SOURCE=.\Notify\Notify_StructuredProxyPushConsumer_i.cpp

 

 !IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

@@ -3004,6 +3080,25 @@ SOURCE=.\Notify\Notify_SupplierAdmin_i.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Notify\Notify_Types.cpp

+

+!IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ORB Services DLL - Win32 MFC Release"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

 SOURCE=.\Notify\NotifyPublish_i.cpp

 

 !IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

@@ -4426,6 +4521,10 @@ SOURCE=.\Notify\Notify_Dispatcher.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Notify\Notify_Event_Manager.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Notify\Notify_EventChannel_i.h

 # End Source File

 # Begin Source File

@@ -4446,10 +4545,22 @@ SOURCE=.\Notify\Notify_FilterFactory_i.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Notify\Notify_ID_Pool_T.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Notify\Notify_Listeners.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Notify\Notify_ProxyConsumer_i.h

 # End Source File

 # Begin Source File

 

+SOURCE=.\Notify\Notify_ProxyConsumer_T.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Notify\Notify_ProxyPushConsumer_i.h

 # End Source File

 # Begin Source File

@@ -4462,10 +4573,26 @@ SOURCE=.\Notify\Notify_ProxySupplier_i.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Notify\Notify_ProxySupplier_T.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Notify\Notify_PushConsumer.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Notify\Notify_PushSupplier.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Notify\Notify_QoSAdmin_i.h

 # End Source File

 # Begin Source File

 

+SOURCE=.\Notify\Notify_Resource_Manager.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Notify\Notify_StructuredProxyPushConsumer_i.h

 # End Source File

 # Begin Source File

@@ -4486,6 +4613,10 @@ SOURCE=.\Notify\Notify_SupplierAdmin_i.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Notify\Notify_Types.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Notify\NotifyPublish_i.h

 # End Source File

 # Begin Source File

@@ -5082,6 +5213,10 @@ SOURCE=.\Event\Memory_Pools.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Notify\Notify_ID_Pool_T.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\RtecDefaultEventDataC.i

 # End Source File

 # Begin Source File

@@ -9576,6 +9711,21 @@ SOURCE=.\ImplRepoS_T.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Notify\Notify_ID_Pool_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

+# Begin Source File

+

+SOURCE=.\Notify\Notify_ProxyConsumer_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

+# Begin Source File

+

+SOURCE=.\Notify\Notify_ProxySupplier_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

+# Begin Source File

+

 SOURCE=.\Trader\Offer_Database.cpp

 

 !IF  "$(CFG)" == "ORB Services DLL - Win32 Release"

diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsp b/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsp
index 301e7321897..6a8cf3ca7af 100644
--- a/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsp
+++ b/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsp
@@ -610,6 +610,10 @@ SOURCE=.\Notify\Notify_Dispatcher.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Notify\Notify_Event_Manager.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Notify\Notify_EventChannel_i.cpp

 # End Source File

 # Begin Source File

@@ -646,10 +650,22 @@ SOURCE=.\Notify\Notify_ProxySupplier_i.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Notify\Notify_PushConsumer.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Notify\Notify_PushSupplier.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Notify\Notify_QoSAdmin_i.cpp

 # End Source File

 # Begin Source File

 

+SOURCE=.\Notify\Notify_Resource_Manager.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Notify\Notify_StructuredProxyPushConsumer_i.cpp

 # End Source File

 # Begin Source File

@@ -670,6 +686,10 @@ SOURCE=.\Notify\Notify_SupplierAdmin_i.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Notify\Notify_Types.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Notify\NotifyPublish_i.cpp

 # End Source File

 # Begin Source File

@@ -1402,6 +1422,10 @@ SOURCE=.\Notify\Notify_Dispatcher.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Notify\Notify_Event_Manager.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Notify\Notify_EventChannel_i.h

 # End Source File

 # Begin Source File

@@ -1422,10 +1446,22 @@ SOURCE=.\Notify\Notify_FilterFactory_i.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Notify\Notify_ID_Pool_T.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Notify\Notify_Listeners.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Notify\Notify_ProxyConsumer_i.h

 # End Source File

 # Begin Source File

 

+SOURCE=.\Notify\Notify_ProxyConsumer_T.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Notify\Notify_ProxyPushConsumer_i.h

 # End Source File

 # Begin Source File

@@ -1438,10 +1474,26 @@ SOURCE=.\Notify\Notify_ProxySupplier_i.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Notify\Notify_ProxySupplier_T.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Notify\Notify_PushConsumer.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Notify\Notify_PushSupplier.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Notify\Notify_QoSAdmin_i.h

 # End Source File

 # Begin Source File

 

+SOURCE=.\Notify\Notify_Resource_Manager.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Notify\Notify_StructuredProxyPushConsumer_i.h

 # End Source File

 # Begin Source File

@@ -1462,6 +1514,10 @@ SOURCE=.\Notify\Notify_SupplierAdmin_i.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Notify\Notify_Types.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Notify\NotifyPublish_i.h

 # End Source File

 # Begin Source File

@@ -2058,6 +2114,10 @@ SOURCE=.\Event\Memory_Pools.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Notify\Notify_ID_Pool_T.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\RtecDefaultEventDataC.i

 # End Source File

 # Begin Source File

@@ -3925,6 +3985,21 @@ SOURCE=.\ImplRepoS_T.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Notify\Notify_ID_Pool_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

+# Begin Source File

+

+SOURCE=.\Notify\Notify_ProxyConsumer_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

+# Begin Source File

+

+SOURCE=.\Notify\Notify_ProxySupplier_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

+# Begin Source File

+

 SOURCE=.\Trader\Offer_Database.cpp

 # PROP Exclude_From_Build 1

 # End Source File