From 56748523fc972380eb1fedb3f6e5850ad23bccc3 Mon Sep 17 00:00:00 2001
From: Pavel Kirienko <pavel.kirienko@gmail.com>
Date: Mon, 24 Mar 2014 13:25:26 +0400
Subject: [PATCH] GlobalTimeSyncSlave typo

---
 .../include/uavcan/protocol/global_time_sync_slave.hpp      | 4 ++--
 libuavcan/src/protocol/global_time_sync_slave.cpp           | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libuavcan/include/uavcan/protocol/global_time_sync_slave.hpp b/libuavcan/include/uavcan/protocol/global_time_sync_slave.hpp
index ddf6534851..ba2b9e766f 100644
--- a/libuavcan/include/uavcan/protocol/global_time_sync_slave.hpp
+++ b/libuavcan/include/uavcan/protocol/global_time_sync_slave.hpp
@@ -22,7 +22,7 @@ class GlobalTimeSyncSlave : Noncopyable
     UtcTime prev_ts_utc_;
     MonotonicTime prev_ts_mono_;
     MonotonicTime last_adjustment_ts_;
-    enum State { Update, Adjust } state;
+    enum State { Update, Adjust } state_;
     NodeID master_nid_;
     uint8_t prev_iface_index_;
 
@@ -39,7 +39,7 @@ class GlobalTimeSyncSlave : Noncopyable
 public:
     GlobalTimeSyncSlave(INode& node)
     : sub_(node)
-    , state(Update)
+    , state_(Update)
     , prev_iface_index_(0xFF)
     { }
 
diff --git a/libuavcan/src/protocol/global_time_sync_slave.cpp b/libuavcan/src/protocol/global_time_sync_slave.cpp
index 5badb1348c..3143a90856 100644
--- a/libuavcan/src/protocol/global_time_sync_slave.cpp
+++ b/libuavcan/src/protocol/global_time_sync_slave.cpp
@@ -20,7 +20,7 @@ void GlobalTimeSyncSlave::adjustFromMsg(const ReceivedDataStructure<protocol::Gl
 
     getSystemClock().adjustUtc(adjustment);
     last_adjustment_ts_ = msg.getMonotonicTimestamp();
-    state = Update;
+    state_ = Update;
 }
 
 void GlobalTimeSyncSlave::updateFromMsg(const ReceivedDataStructure<protocol::GlobalTimeSync>& msg)
@@ -32,7 +32,7 @@ void GlobalTimeSyncSlave::updateFromMsg(const ReceivedDataStructure<protocol::Gl
     prev_ts_mono_     = msg.getMonotonicTimestamp();
     master_nid_       = msg.getSrcNodeID();
     prev_iface_index_ = msg.getIfaceIndex();
-    state             = Adjust;
+    state_             = Adjust;
 }
 
 void GlobalTimeSyncSlave::processMsg(const ReceivedDataStructure<protocol::GlobalTimeSync>& msg)
@@ -52,7 +52,7 @@ void GlobalTimeSyncSlave::processMsg(const ReceivedDataStructure<protocol::Globa
     }
     else if (msg.getIfaceIndex() == prev_iface_index_ && msg.getSrcNodeID() == master_nid_)
     {
-        if (state == Adjust && msg.prev_utc_usec > 0)
+        if (state_ == Adjust && msg.prev_utc_usec > 0)
         {
             adjustFromMsg(msg);
         }