Fixed Compiler Error C2864 - only static const integral data members …

…can be initialized within a class
eliandar · Jul 23, 2013 · 57fc442 · 57fc442
1 parent 066ce66
commit 57fc442
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc
@@ -38,6 +38,11 @@
 * as the previous one created unless one calls deleteSettings in the code after
 * creating the UAS.
 */
+
+const float UAS::lipoFull = 4.2f;  ///< 100% charged voltage
+const float UAS::lipoEmpty = 3.5f; ///< Discharged voltage
+
+
 UAS::UAS(MAVLinkProtocol* protocol, int id) : UASInterface(),
     uasId(id),
     links(new QList<LinkInterface*>()),

diff --git a/src/uas/UAS.h b/src/uas/UAS.h
@@ -56,8 +56,8 @@ class UAS : public UASInterface
     UAS(MAVLinkProtocol* protocol, int id = 0);
     ~UAS();
 
-    static const float lipoFull = 4.2f;  ///< 100% charged voltage
-    static const float lipoEmpty = 3.5f; ///< Discharged voltage
+    static const float lipoFull;  ///< 100% charged voltage
+    static const float lipoEmpty; ///< Discharged voltage
 
     /* MANAGEMENT */