Tue Jul 22 06:26:28 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

2 files changed, 49 insertions, 43 deletions

diff --git a/TAO/tao/Monitor/Monitor.pidl b/TAO/tao/Monitor/Monitor.pidl
index af6bce67473..798932fd136 100644
--- a/TAO/tao/Monitor/Monitor.pidl
+++ b/TAO/tao/Monitor/Monitor.pidl
@@ -1,51 +1,9 @@
 // $Id$
 
-#include "tao/TimeBase.pidl"
-#include "tao/StringSeq.pidl"
+#include "tao/Monitor/Monitor_Types.pidl"
 
 module Monitor
 {
-  struct DataValue
-  {
-    /// The number of samples currently taken into account
-    TimeBase::TimeT timestamp;
-    double value;
-  };
-
-  typedef string Name;
-  typedef string NameFilter;
-  typedef CORBA::StringSeq NameList;
-  typedef sequence<DataValue> DataValueList;
-  struct Numeric
-  {
-    DataValueList dlist;
-    unsigned long count;
-    double average;
-    double sum_of_squares;
-    double minimum;
-    double maximum;
-  };
-  enum DataType { DATA_NUMERIC, DATA_TEXT };
-  union UData switch (DataType) {
-    case DATA_NUMERIC: Numeric num;
-    case DATA_TEXT: NameList list;
-  };
-  struct Data
-  {
-    Name itemname;
-    UData data_union;
-  };
-  typedef sequence<Data> DataList;
-  typedef long ConstraintId;
-  typedef sequence<ConstraintId> ConstraintIdList;
-  typedef string Constraint;
-  struct ConstraintStruct
-  {
-    Name itemname;
-    ConstraintId id;
-  };
-  typedef sequence<ConstraintStruct> ConstraintStructList;
-
   interface Subscriber
   {
     oneway void push (in DataList dil);
diff --git a/TAO/tao/Monitor/Monitor_Types.pidl b/TAO/tao/Monitor/Monitor_Types.pidl
new file mode 100644
index 00000000000..8027cdfce7d
--- /dev/null
+++ b/TAO/tao/Monitor/Monitor_Types.pidl
@@ -0,0 +1,48 @@
+// $Id$
+
+#include "tao/TimeBase.pidl"
+#include "tao/StringSeq.pidl"
+
+module Monitor
+{
+  struct DataValue
+  {
+    /// The number of samples currently taken into account
+    TimeBase::TimeT timestamp;
+    double value;
+  };
+
+  typedef string Name;
+  typedef string NameFilter;
+  typedef CORBA::StringSeq NameList;
+  typedef sequence<DataValue> DataValueList;
+  struct Numeric
+  {
+    DataValueList dlist;
+    unsigned long count;
+    double average;
+    double sum_of_squares;
+    double minimum;
+    double maximum;
+  };
+  enum DataType { DATA_NUMERIC, DATA_TEXT };
+  union UData switch (DataType) {
+    case DATA_NUMERIC: Numeric num;
+    case DATA_TEXT: NameList list;
+  };
+  struct Data
+  {
+    Name itemname;
+    UData data_union;
+  };
+  typedef sequence<Data> DataList;
+  typedef long ConstraintId;
+  typedef sequence<ConstraintId> ConstraintIdList;
+  typedef string Constraint;
+  struct ConstraintStruct
+  {
+    Name itemname;
+    ConstraintId id;
+  };
+  typedef sequence<ConstraintStruct> ConstraintStructList;
+};