File tree Expand file tree Collapse file tree 2 files changed +9
-9
lines changed
include/ur_client_library Expand file tree Collapse file tree 2 files changed +9
-9
lines changed Original file line number Diff line number Diff line change @@ -112,7 +112,7 @@ class MultiConsumer : public IConsumer<T>
112112 */
113113 void addConsumer (std::shared_ptr<IConsumer<T>> consumer)
114114 {
115- std::lock_guard<std::mutex> lk (consumer_list );
115+ std::lock_guard<std::mutex> lk (consumer_list_ );
116116 consumers_.push_back (consumer);
117117 }
118118
@@ -123,7 +123,7 @@ class MultiConsumer : public IConsumer<T>
123123 */
124124 void removeConsumer (std::shared_ptr<IConsumer<T>> consumer)
125125 {
126- std::lock_guard<std::mutex> lk (consumer_list );
126+ std::lock_guard<std::mutex> lk (consumer_list_ );
127127 auto it = std::find (consumers_.begin (), consumers_.end (), consumer);
128128 if (it == consumers_.end ())
129129 {
@@ -183,7 +183,7 @@ class MultiConsumer : public IConsumer<T>
183183 */
184184 bool consume (std::shared_ptr<T> product)
185185 {
186- std::lock_guard<std::mutex> lk (consumer_list );
186+ std::lock_guard<std::mutex> lk (consumer_list_ );
187187 bool res = true ;
188188 for (auto & con : consumers_)
189189 {
@@ -194,7 +194,7 @@ class MultiConsumer : public IConsumer<T>
194194 }
195195
196196private:
197- std::mutex consumer_list ;
197+ std::mutex consumer_list_ ;
198198};
199199
200200/* !
Original file line number Diff line number Diff line change @@ -119,7 +119,7 @@ class PrimaryConsumer : public AbstractPrimaryConsumer
119119 code.timestamp = pkg.timestamp_ ;
120120 code.to_string = pkg.toString ();
121121
122- const auto logContents = " Logging an ErrorCodeMessage from the UR Controller Box: " + pkg.toString ();
122+ const auto log_contents = " Logging an ErrorCodeMessage from the UR Controller Box: " + pkg.toString ();
123123
124124 switch (code.report_level )
125125 {
@@ -129,18 +129,18 @@ class PrimaryConsumer : public AbstractPrimaryConsumer
129129 case urcl::primary_interface::ReportLevel::DEVL_WARNING:
130130 case urcl::primary_interface::ReportLevel::DEVL_VIOLATION:
131131 case urcl::primary_interface::ReportLevel::DEVL_FAULT:
132- URCL_LOG_DEBUG (logContents .c_str ());
132+ URCL_LOG_DEBUG (log_contents .c_str ());
133133 break ;
134134 case urcl::primary_interface::ReportLevel::INFO:
135- URCL_LOG_INFO (logContents .c_str ());
135+ URCL_LOG_INFO (log_contents .c_str ());
136136 break ;
137137 case urcl::primary_interface::ReportLevel::WARNING:
138- URCL_LOG_WARN (logContents .c_str ());
138+ URCL_LOG_WARN (log_contents .c_str ());
139139 break ;
140140 default :
141141 // urcl::primary_interface::ReportLevel::VIOLATION:
142142 // urcl::primary_interface::ReportLevel::FAULT:
143- URCL_LOG_ERROR (logContents .c_str ());
143+ URCL_LOG_ERROR (log_contents .c_str ());
144144 break ;
145145 }
146146
You can’t perform that action at this time.
0 commit comments