Merge pull request #15 from forno/update-v1.2.4

Update v1.2.4 with fix type alias
forno · Nov 4, 2016 · f5ff088 · f5ff088
2 parents 95b4ce5 + e207cc6
commit f5ff088
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@ project(ics3 CXX)
 
 SET(PROJECT_VER_MAJOR 1)
 SET(PROJECT_VER_MINOR 2)
-SET(PROJECT_VER_PATCH 3)
+SET(PROJECT_VER_PATCH 4)
 SET(PROJECT_VER "${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}.${PROJECT_VER_PATCH}")
 SET(PROJECT_APIVER "${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}")
 

diff --git a/include/core.hpp b/include/core.hpp
@@ -10,10 +10,10 @@
 namespace ics {
   class Core {
   public:
-    using value = uint8_t;
-    using Container = std::vector<value>;
-    using IDContainerTx = std::array<value, 4>;
-    using IDContainerRx = std::array<value, 5>;
+    using value_type = uint8_t;
+    using Container = std::vector<value_type>;
+    using IDContainerTx = std::array<value_type, 4>;
+    using IDContainerRx = std::array<value_type, 5>;
     explicit Core(const std::string&, speed_t); // touch by only libics3
     ~Core() noexcept;
     Core(const Core&) = delete;

diff --git a/include/ics3/eepparam.hpp b/include/ics3/eepparam.hpp
@@ -10,8 +10,8 @@ namespace ics {
   class EepParam {
   public:
     using type = uint16_t;
-    using size_type = std::size_t;
     using TargetContainer = std::array<uint8_t, 64>;
+    using size_type = TargetContainer::size_type;
     using InvalidChecker = type (&)(type, type, type);
     enum Flag : type {
       REVERSE =   0x01,

diff --git a/include/ics3/eeprom.hpp b/include/ics3/eeprom.hpp
@@ -11,9 +11,7 @@ namespace ics {
   class EepRom {
     friend ICS3; // for ICS3::getRom()
   public:
-    using size_type = std::size_t;
-    static constexpr size_type length {64};
-    using Container = std::array<uint8_t, length>;
+    using Container = std::array<uint8_t, 64>;
 
     EepParam get(EepParam) const;
     void set(const EepParam&) noexcept;

diff --git a/src/ics3.cpp b/src/ics3.cpp
@@ -9,7 +9,7 @@ static inline ics::Angle::rawType getReceiveAngle(const ics::Core::Container& rx
   return (rx[4] << 7) | rx[5];
 }
 
-static inline ics::Core::value getCmd(const ics::Core::value head, const ics::ID& id) {
+static inline ics::Core::value_type getCmd(const ics::Core::value_type head, const ics::ID& id) {
   return head | id.get();
 }