Fix a couple more clang build errors.

OpenLightingProject · Jan 12, 2014 · bfc1d99 · bfc1d99
1 parent 7dbae66
commit bfc1d99
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/common.mk b/common.mk
@@ -1,6 +1,6 @@
 # here we define common flags for C++ targets
 WARNING_CXXFLAGS = -I$(top_builddir)/include \
-                   -Wall -Wformat -W \
+                   -Wall -Wformat -W -fvisibility-inlines-hidden \
                    $(libprotobuf_CFLAGS)
 
 COMMON_CXXFLAGS = $(WARNING_CXXFLAGS)

diff --git a/tools/logic/DMXSignalProcessor.cpp b/tools/logic/DMXSignalProcessor.cpp
@@ -48,6 +48,14 @@
 
 using std::vector;
 
+const double DMXSignalProcessor::MIN_BREAK_TIME = 88.0;
+const double DMXSignalProcessor::MIN_MAB_TIME = 8.0;
+const double DMXSignalProcessor::MAX_MAB_TIME = 1000000.0;
+const double DMXSignalProcessor::MIN_BIT_TIME = 3.75;
+const double DMXSignalProcessor::MAX_BIT_TIME = 4.08;
+const double DMXSignalProcessor::MIN_LAST_BIT_TIME = 2.64;
+const double DMXSignalProcessor::MAX_MARK_BETWEEN_SLOTS = 1000000.0;
+
 /**
  * Create a new DMXSignalProcessor which runs the specified callback when a new
  * frame is received.

diff --git a/tools/logic/DMXSignalProcessor.h b/tools/logic/DMXSignalProcessor.h
@@ -105,14 +105,14 @@ class DMXSignalProcessor {
 
     static const unsigned int DMX_BITRATE = 250000;
     // These are all in microseconds and are the receiver side limits.
-    static const double MIN_BREAK_TIME = 88.0;
-    static const double MIN_MAB_TIME = 8.0;
-    static const double MAX_MAB_TIME = 1000000.0;
+    static const double MIN_BREAK_TIME;
+    static const double MIN_MAB_TIME;
+    static const double MAX_MAB_TIME;
     // The minimum bit time, based on a 4MHz sample rate.
     // TODO(simon): adjust this based on the sample rate.
-    static const double MIN_BIT_TIME = 3.75;
-    static const double MAX_BIT_TIME = 4.08;
-    static const double MIN_LAST_BIT_TIME = 2.64;
-    static const double MAX_MARK_BETWEEN_SLOTS = 1000000.0;
+    static const double MIN_BIT_TIME;
+    static const double MAX_BIT_TIME;
+    static const double MIN_LAST_BIT_TIME;
+    static const double MAX_MARK_BETWEEN_SLOTS;
 };
 #endif  // TOOLS_LOGIC_DMXSIGNALPROCESSOR_H_
diff --git a/tools/logic/logic-rdm-sniffer.cpp b/tools/logic/logic-rdm-sniffer.cpp
@@ -29,9 +29,10 @@
 #include <string.h>
 #include <time.h>
 
-#include <ola/Logging.h>
 #include <ola/base/Flags.h>
+#include <ola/base/Init.h>
 #include <ola/io/SelectServer.h>
+#include <ola/Logging.h>
 
 #include <ola/BaseTypes.h>
 #include <ola/Callback.h>