Changeset 13946 for trunk/FACT++/gui

Timestamp:

05/27/12 21:15:20 (12 years ago)

Author:

tbretz

Message:

Fixed the problem with the anonymous structs in older compilers.

File:

• trunk/FACT++/gui/MainWindow.cc (modified) (5 diffs)

trunk/FACT++/gui/MainWindow.cc

@@ -557 +557 @@
 {
     static const struct Data { int32_t id; char on; } __attribute__((__packed__)) d = { -1, 1 };
-    Dim::SendCommand("FTM_CONTROL/ENABLE_FTU", &d, sizeof(d));
+    Dim::SendCommand("FTM_CONTROL/ENABLE_FTU", &d, sizeof(Data));
 }
 
@@ -563 +563 @@
 {
     static const struct Data { int32_t id; char on; } __attribute__((__packed__)) d = { -1, 0 };
-    Dim::SendCommand("FTM_CONTROL/ENABLE_FTU", &d, sizeof(d));
+    Dim::SendCommand("FTM_CONTROL/ENABLE_FTU", &d, sizeof(Data));
 }
 
@@ -694 +694 @@
         return;
 
-    const struct { uint16_t ch; float val; } __attribute__((__packed__)) val = {
+    const struct Data { uint16_t ch; float val; } __attribute__((__packed__)) val = {
         uint16_t(fBiasHvBoard->value()*32+fBiasHvChannel->value()),
         float(fBiasVolt->value())
     };
 
-    Dim::SendCommand("BIAS_CONTROL/SET_CHANNEL_VOLTAGE", val);
+    Dim::SendCommand("BIAS_CONTROL/SET_CHANNEL_VOLTAGE", &val, sizeof(Data));
 }
 
@@ -733 +733 @@
         return;
 
-    const struct { uint16_t ch; float val; } __attribute__((__packed__)) val = {
+    const struct Data { uint16_t ch; float val; } __attribute__((__packed__)) val = {
         uint16_t(fBiasHvBoard->value()*32+fBiasHvChannel->value()),
         float(fBiasOffsetVolt->value())
     };
 
-    Dim::SendCommand("BIAS_CONTROL/INCREASE_CHANNEL_VOLTAGE", val);
+    Dim::SendCommand("BIAS_CONTROL/INCREASE_CHANNEL_VOLTAGE", &val, sizeof(Data));
 }
 
@@ -760 +760 @@
         return;
 
-    const struct { uint16_t ch; float val; } __attribute__((__packed__)) val = {
+    const struct Data { uint16_t ch; float val; } __attribute__((__packed__)) val = {
         uint16_t(fBiasHvBoard->value()*32+fBiasHvChannel->value()),
         float(fBiasOffsetVolt->value())
     };
 
-    Dim::SendCommand("BIAS_CONTROL/SET_CHANNEL_OFFSET", val);
+    Dim::SendCommand("BIAS_CONTROL/SET_CHANNEL_OFFSET", &val, sizeof(Data));
 }