Merge pull request #119 from battlesnake/master

Minor fixes: unnecessary sign conversion, redundant path delimiter.
PX4 · Nov 29, 2017 · 9044cd1 · 9044cd1
2 parents e2c68be + 155c721
commit 9044cd1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/libuavcan/include.mk b/libuavcan/include.mk
@@ -21,4 +21,4 @@ LIBUAVCAN_DSDLC := $(LIBUAVCAN_DIR)dsdl_compiler/libuavcan_dsdlc
 #
 # Standard DSDL definitions
 #
-UAVCAN_DSDL_DIR := $(UAVCAN_DIR)/dsdl/uavcan
+UAVCAN_DSDL_DIR := $(UAVCAN_DIR)dsdl/uavcan
diff --git a/libuavcan/src/marshal/uc_bit_stream.cpp b/libuavcan/src/marshal/uc_bit_stream.cpp
@@ -84,7 +84,7 @@ std::string BitStream::toString() const
     for (unsigned offset = 0; true; offset++)
     {
         uint8_t byte = 0;
-        if (1U != buf_.read(offset, &byte, 1U))
+        if (1 != buf_.read(offset, &byte, 1U))
         {
             break;
         }