Skip to content
This repository was archived by the owner on Jul 8, 2022. It is now read-only.

Commit 960163b

Browse files
authored
Merge pull request #700 from tango-controls/upgrade-llvm
Upgrade llvm in warning as errors CI tests
2 parents 376d118 + 8fe3c97 commit 960163b

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

.travis/llvm-latest/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM debian:buster
22

3-
ARG LLVM_VERSION=9
3+
ARG LLVM_VERSION=10
44

55
ARG APP_UID=2000
66

cppapi/server/attrgetsetprop.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -440,8 +440,8 @@ void Attribute::add_config_5_specific(AttributeConfig_5 &conf)
440440

441441
void Attribute::set_properties(const Tango::AttributeConfig &conf,std::string &dev_name,TANGO_UNUSED(bool from_ds),std::vector<AttPropDb> &v_db)
442442
{
443-
if (name_lower == "state" || name_lower == "status")
444-
return;
443+
if (name_lower == "state" || name_lower == "status")
444+
return;
445445

446446
//
447447
// Check if the caller try to change "hard coded" properties. Throw exception in case of

cppapi/server/eventcmds.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,14 @@ DevLong DServer::event_subscription_change(const Tango::DevVarStringArray *argin
133133
client_release = 3;
134134
}
135135

136-
event_subscription(dev_name,attr_name,action,event,attr_name_lower,NOTIFD,mcast,rate,ivl,NULL,client_release);
136+
event_subscription(dev_name,attr_name,action,event,attr_name_lower,NOTIFD,mcast,rate,ivl,NULL,client_release);
137137

138138
//
139139
// Init one subscription command flag in Eventsupplier
140140
//
141141

142-
if (ev != NULL && ev->get_one_subscription_cmd() == false)
143-
ev->set_one_subscription_cmd(true);
142+
if (ev != NULL && ev->get_one_subscription_cmd() == false)
143+
ev->set_one_subscription_cmd(true);
144144

145145
//
146146
// Return to caller

cppapi/server/fwdattribute.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,10 @@ void FwdAttribute::set_att_config(const Tango::AttributeConfig_5 &conf)
133133
// Enum labels (in case of)
134134
//
135135

136-
enum_labels.clear();
137-
size_t enum_labels_nb = conf.enum_labels.length();
138-
for (size_t loop = 0;loop < enum_labels_nb;loop++)
139-
enum_labels.push_back(conf.enum_labels[loop].in());
136+
enum_labels.clear();
137+
size_t enum_labels_nb = conf.enum_labels.length();
138+
for (size_t loop = 0;loop < enum_labels_nb;loop++)
139+
enum_labels.push_back(conf.enum_labels[loop].in());
140140

141141
//
142142
// min alarm

0 commit comments

Comments
 (0)