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>
112
112
*/
113
113
void addConsumer (std::shared_ptr<IConsumer<T>> consumer)
114
114
{
115
- std::lock_guard<std::mutex> lk (consumer_list );
115
+ std::lock_guard<std::mutex> lk (consumer_list_ );
116
116
consumers_.push_back (consumer);
117
117
}
118
118
@@ -123,7 +123,7 @@ class MultiConsumer : public IConsumer<T>
123
123
*/
124
124
void removeConsumer (std::shared_ptr<IConsumer<T>> consumer)
125
125
{
126
- std::lock_guard<std::mutex> lk (consumer_list );
126
+ std::lock_guard<std::mutex> lk (consumer_list_ );
127
127
auto it = std::find (consumers_.begin (), consumers_.end (), consumer);
128
128
if (it == consumers_.end ())
129
129
{
@@ -183,7 +183,7 @@ class MultiConsumer : public IConsumer<T>
183
183
*/
184
184
bool consume (std::shared_ptr<T> product)
185
185
{
186
- std::lock_guard<std::mutex> lk (consumer_list );
186
+ std::lock_guard<std::mutex> lk (consumer_list_ );
187
187
bool res = true ;
188
188
for (auto & con : consumers_)
189
189
{
@@ -194,7 +194,7 @@ class MultiConsumer : public IConsumer<T>
194
194
}
195
195
196
196
private:
197
- std::mutex consumer_list ;
197
+ std::mutex consumer_list_ ;
198
198
};
199
199
200
200
/* !
Original file line number Diff line number Diff line change @@ -119,7 +119,7 @@ class PrimaryConsumer : public AbstractPrimaryConsumer
119
119
code.timestamp = pkg.timestamp_ ;
120
120
code.to_string = pkg.toString ();
121
121
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 ();
123
123
124
124
switch (code.report_level )
125
125
{
@@ -129,18 +129,18 @@ class PrimaryConsumer : public AbstractPrimaryConsumer
129
129
case urcl::primary_interface::ReportLevel::DEVL_WARNING:
130
130
case urcl::primary_interface::ReportLevel::DEVL_VIOLATION:
131
131
case urcl::primary_interface::ReportLevel::DEVL_FAULT:
132
- URCL_LOG_DEBUG (logContents .c_str ());
132
+ URCL_LOG_DEBUG (log_contents .c_str ());
133
133
break ;
134
134
case urcl::primary_interface::ReportLevel::INFO:
135
- URCL_LOG_INFO (logContents .c_str ());
135
+ URCL_LOG_INFO (log_contents .c_str ());
136
136
break ;
137
137
case urcl::primary_interface::ReportLevel::WARNING:
138
- URCL_LOG_WARN (logContents .c_str ());
138
+ URCL_LOG_WARN (log_contents .c_str ());
139
139
break ;
140
140
default :
141
141
// urcl::primary_interface::ReportLevel::VIOLATION:
142
142
// urcl::primary_interface::ReportLevel::FAULT:
143
- URCL_LOG_ERROR (logContents .c_str ());
143
+ URCL_LOG_ERROR (log_contents .c_str ());
144
144
break ;
145
145
}
146
146
You can’t perform that action at this time.
0 commit comments