fix some CLang compile warnings.

inkjet · Mar 24, 2017 · 2582cd4 · 2582cd4
1 parent ad107c0
commit 2582cd4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/MavLinkCom/MavLinkTest/Commands.cpp b/MavLinkCom/MavLinkTest/Commands.cpp
@@ -440,8 +440,8 @@ void PlayLogCommand::Execute(std::shared_ptr<MavLinkVehicle> com)
             std::copy(quaternion_, quaternion_ + 1, mocap.q);
             com->writeMessage(mocap);
             break;
-        }
-        default:
+        }
+        default:
             break;
         }
     }

diff --git a/MavLinkCom/MavLinkTest/Commands.h b/MavLinkCom/MavLinkTest/Commands.h
@@ -64,7 +64,7 @@ class Command
     static Command* create(const std::vector<std::string>& args);
     static std::vector<Command*> const * getAllCommand();
     static void setAllCommand(std::vector<Command*> const * all_commands);
-    static constexpr char* kCommandLogPrefix = "cmd:";
+    static constexpr const char* kCommandLogPrefix = "cmd:";
 protected:
     std::shared_ptr<MavLinkVehicle> vehicle;
 private:

diff --git a/MavLinkCom/src/impl/MavLinkNodeImpl.cpp b/MavLinkCom/src/impl/MavLinkNodeImpl.cpp
@@ -264,8 +264,7 @@ std::vector<MavLinkParameter> MavLinkNodeImpl::getParamList()
 	bool done = false;
 	Semaphore paramReceived;
 	bool waiting = false;
-	int paramCount = 0;
-	int paramIndex = 0;
+	size_t paramCount = 0;
 
 	auto con = ensureConnection();
 	int subscription = con->subscribe([&](std::shared_ptr<MavLinkConnection> connection, const MavLinkMessage& message) {
@@ -282,7 +281,6 @@ std::vector<MavLinkParameter> MavLinkNodeImpl::getParamList()
 			p.name = buf;
 			p.value = param.param_value;
 			result.push_back(p);
-			paramIndex  = param.param_index;
 			paramCount = param.param_count;
 			if (param.param_index == param.param_count - 1)
 			{
@@ -321,7 +319,7 @@ std::vector<MavLinkParameter> MavLinkNodeImpl::getParamList()
 		for (auto iter = result.begin(), end = result.end(); iter != end; iter++)
 		{
 			MavLinkParameter p = *iter;
-			if (p.index == i) {
+			if (static_cast<size_t>(p.index) == i) {
 				found = true;
 				break;
 			}