Changeset 18916 for trunk

Timestamp:

10/18/17 13:44:23 (7 years ago)

Author:

tbretz

Message:

Renamed DimData to Data and moved definition to header

Location:

trunk/FACT++/src

Files:

• HeadersBiasTemp.h (modified) (1 diff)
• biastemp.cc (modified) (3 diffs)

trunk/FACT++/src/HeadersBiasTemp.h

@@ -13 +13 @@
         };
     }
+
+    struct Data
+    {
+        uint64_t time;
+        float temp[10];
+        double avg;
+        double rms;
+    } __attribute__((__packed__));
 }
 

trunk/FACT++/src/biastemp.cc

@@ -48 +48 @@
     string fData;
 
-    struct DimData
-    {
-        uint64_t time;
-        float temp[10];
-        double avg;
-        double rms;
-    } __attribute__((__packed__));
-
-    virtual void UpdateBiasTemp(const DimData &)
+    virtual void UpdateBiasTemp(const Data &)
     {
     }
@@ -70 +62 @@
             pt::read_json(ss, tree);
 
-            DimData data;
+            Data data;
             data.time = tree.get_child("timestamp").get_value<uint64_t>();
 
@@ -298 +290 @@
     DimDescribedService fDimBiasTemp;
 
-    virtual void UpdateBiasTemp(const DimData &data)
-    {
-        fDimBiasTemp.setData(&data, sizeof(DimData));
+    virtual void UpdateBiasTemp(const Data &data)
+    {
+        fDimBiasTemp.setData(&data, sizeof(Data));
         fDimBiasTemp.Update();
     }