diff options
| author | dai_y <dai_y@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-11-10 20:16:14 +0000 |
|---|---|---|
| committer | dai_y <dai_y@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-11-10 20:16:14 +0000 |
| commit | 139bd461a0a8e0f28342cbccd25c1ee92c192148 (patch) | |
| tree | 47b9af9420e02ac3da87a78d1a1bedf822851aa3 | |
| parent | 65850936c29b848702ab38a40839a4eb5bf3369b (diff) | |
| download | ATCD-139bd461a0a8e0f28342cbccd25c1ee92c192148.tar.gz | |
Tue Nov 10 20:14:12 UTC 2009 Yan Dai <dai_y@ociweb.com>
4 files changed, 21 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 126d3d2bfc7..2f532feebde 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Tue Nov 10 20:14:12 UTC 2009 Yan Dai <dai_y@ociweb.com> + + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxyPushSupplier.h: + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSequenceProxyPushSupplier.h: + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorStructuredProxyPushSupplier.h: + + Added TAO_HAS_MONITOR_FRAMEWORK==1 guard so it won't be compiled when + monitor framework is disabled. + Tue Nov 10 19:07:43 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/include/idl_global.h: @@ -33,7 +42,7 @@ Tue Nov 10 18:15:44 UTC 2009 Yan Dai <dai_y@ociweb.com> Added TAO_HAS_MONITOR_FRAMEWORK==1 guard so it won't be compiled when monitor framework is disabled. - + Tue Nov 10 13:37:57 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Param_Test/run_test.pl: diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxyPushSupplier.h index 8f5bf01b700..ddb18342519 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxyPushSupplier.h @@ -15,6 +15,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1) + class TAO_Notify_MC_Ext_Export TAO_MonitorProxyPushSupplier : public TAO_MonitorProxySupplier_T<TAO_Notify_ProxyPushSupplier> { @@ -23,5 +25,7 @@ class TAO_Notify_MC_Ext_Export TAO_MonitorProxyPushSupplier }; TAO_END_VERSIONED_NAMESPACE_DECL +#endif // TAO_HAS_MONITOR_FRAMEWORK == 1 + #include /**/ "ace/post.h" #endif /* MONITORPROXYPUSHSUPPLIER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSequenceProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSequenceProxyPushSupplier.h index 651252392d4..8c09c9199ec 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSequenceProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSequenceProxyPushSupplier.h @@ -13,6 +13,8 @@ #include "orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h" #include "orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h" +#if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1) + TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Notify_MC_Ext_Export TAO_MonitorSequenceProxyPushSupplier @@ -23,5 +25,7 @@ class TAO_Notify_MC_Ext_Export TAO_MonitorSequenceProxyPushSupplier }; TAO_END_VERSIONED_NAMESPACE_DECL +#endif // TAO_HAS_MONITOR_FRAMEWORK == 1 + #include /**/ "ace/post.h" #endif /* MONITORSEQUENCEPROXYPUSHSUPPLIER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorStructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorStructuredProxyPushSupplier.h index a1b9135dec7..e73e44a979e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorStructuredProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorStructuredProxyPushSupplier.h @@ -12,6 +12,7 @@ #include "orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h" #include "orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h" +#if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1) TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -26,5 +27,7 @@ class TAO_Notify_MC_Ext_Export TAO_MonitorStructuredProxyPushSupplier TAO_END_VERSIONED_NAMESPACE_DECL +#endif // TAO_HAS_MONITOR_FRAMEWORK == 1 + #include /**/ "ace/post.h" #endif /* MONITORSTRUCTUREDPROXYPUSHSUPPLIER_H */ |