From 47d3f475ed6ac66c42335bc6c420c189c6c1c975 Mon Sep 17 00:00:00 2001
From: "T. van der Zwan" <zwantvd@gmail.com>
Date: Sat, 28 Dec 2013 08:41:23 +0100
Subject: [PATCH] Removed bug in Hyperion.cpp and warning in
 TestRs232HighSpeed.cpp

Former-commit-id: 63e992a3590db5a4e2c8d121b08291588f347ac7
---
 CMakeLists.txt               | 3 ++-
 libsrc/hyperion/Hyperion.cpp | 2 +-
 test/TestRs232HighSpeed.cpp  | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a0e293e1..285b4533 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,8 @@ include_directories(${CMAKE_SOURCE_DIR}/include)
 set(CMAKE_BUILD_TYPE "Release")
 
 # enable C++11
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall")
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -std=c++11 -Wall")
 
 # Configure the use of QT4
 find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork REQUIRED QUIET)
diff --git a/libsrc/hyperion/Hyperion.cpp b/libsrc/hyperion/Hyperion.cpp
index 3b726ed5..bfe14a9d 100644
--- a/libsrc/hyperion/Hyperion.cpp
+++ b/libsrc/hyperion/Hyperion.cpp
@@ -363,7 +363,7 @@ void Hyperion::clear(int priority)
 		_muxer.clearInput(priority);
 
 		// update leds if necessary
-		if (priority < _muxer.getCurrentPriority());
+		if (priority < _muxer.getCurrentPriority())
 		{
 			update();
 		}
diff --git a/test/TestRs232HighSpeed.cpp b/test/TestRs232HighSpeed.cpp
index 95707ca4..68a9b13b 100644
--- a/test/TestRs232HighSpeed.cpp
+++ b/test/TestRs232HighSpeed.cpp
@@ -12,8 +12,8 @@ public:
 		// empty
 	}
 
-	int write(const std::vector<ColorRgb> &ledValues) {}
-	int switchOff() {};
+	int write(const std::vector<ColorRgb> &ledValues) { return 0; }
+	int switchOff() { return 0; };
 
 	void writeTestSequence()
 	{