4 files changed, 17 insertions, 0 deletions
diff --git a/TAO/tao/Monitor/Monitor.cpp b/TAO/tao/Monitor/Monitor.cpp
index a80b07d8717..358e5d3eb32 100644
--- a/TAO/tao/Monitor/Monitor.cpp
+++ b/TAO/tao/Monitor/Monitor.cpp
@@ -7,6 +7,8 @@ ACE_RCSID (Monitor,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+#if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1)
+
 TAO_Monitor_Init::TAO_Monitor_Init (void)
 {
 }
@@ -68,3 +70,5 @@ ACE_STATIC_SVC_DEFINE (TAO_Monitor_Init,
                        0)
 ACE_FACTORY_DEFINE (TAO_Monitor, TAO_Monitor_Init)
 
+#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */
+
diff --git a/TAO/tao/Monitor/Monitor.h b/TAO/tao/Monitor/Monitor.h
index 21a8fee3ef0..9a6d1a9a771 100644
--- a/TAO/tao/Monitor/Monitor.h
+++ b/TAO/tao/Monitor/Monitor.h
@@ -25,6 +25,8 @@
 #include "tao/Versioned_Namespace.h"
 #include "tao/Object_Loader.h"
 
+#if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1)
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
@@ -56,6 +58,8 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 ACE_STATIC_SVC_DECLARE (TAO_Monitor_Init)
 ACE_FACTORY_DECLARE (TAO_Monitor, TAO_Monitor_Init)
 
+#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */
+
 #include /**/ "ace/post.h"
 
 #define TAO_MONITOR_SAFE_INCLUDE
diff --git a/TAO/tao/Monitor/Monitor_Impl.cpp b/TAO/tao/Monitor/Monitor_Impl.cpp
index 7c2d4182f57..77ce29a4d07 100644
--- a/TAO/tao/Monitor/Monitor_Impl.cpp
+++ b/TAO/tao/Monitor/Monitor_Impl.cpp
@@ -2,6 +2,9 @@
 // $Id$
 //
 #include "tao/Monitor/Monitor_Impl.h"
+
+#if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1)
+
 #include "ace/Monitor_Point_Registry.h"
 #include "ace/Monitor_Control_Action.h"
 #include "MonitorControl/MonitorControl.h"
@@ -257,3 +260,5 @@ Monitor_Impl::unregister_constraints (
     }
 }
 
+#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */
+
diff --git a/TAO/tao/Monitor/Monitor_Impl.h b/TAO/tao/Monitor/Monitor_Impl.h
index 081198684e5..4bdccfe7043 100644
--- a/TAO/tao/Monitor/Monitor_Impl.h
+++ b/TAO/tao/Monitor/Monitor_Impl.h
@@ -9,6 +9,8 @@
 
 #include "tao/Monitor/MonitorS.h"
 
+#if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1)
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class Monitor_Impl
@@ -46,6 +48,8 @@ private:
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
+#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_MONITOR_IMPL_H */