Skip to content

Commit f431b9b

Browse files
committed
Fix SmartOS compilation
1 parent 27d6406 commit f431b9b

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

src/openzwave-management.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ namespace OZW {
299299
{
300300
Nan::HandleScope scope;
301301
CheckMinArgs(1, "command");
302-
std::string ctrcmd(*Nan::Utf8String( info[0] ));
302+
::std::string ctrcmd(*Nan::Utf8String( info[0] ));
303303
uint8 nodeid1 = 0xff;
304304
uint8 nodeid2 = 0;
305305
bool highpower = false;

src/openzwave-nodes.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ namespace OZW {
313313
Nan::HandleScope scope;
314314
CheckMinArgs(1, "nodeid");
315315
uint8 nodeid = Nan::To<Number>(info[0]).ToLocalChecked()->Value();
316-
std::string result = OpenZWave::Manager::Get()->GetNodePlusTypeString(homeid, nodeid);
316+
::std::string result = OpenZWave::Manager::Get()->GetNodePlusTypeString(homeid, nodeid);
317317
info.GetReturnValue().Set(Nan::New<String>(result.c_str()).ToLocalChecked());
318318
}
319319
/*
@@ -325,7 +325,7 @@ namespace OZW {
325325
Nan::HandleScope scope;
326326
CheckMinArgs(1, "nodeid");
327327
uint8 nodeid = Nan::To<Number>(info[0]).ToLocalChecked()->Value();
328-
std::string result = OpenZWave::Manager::Get()->GetNodeRoleString(homeid, nodeid);
328+
::std::string result = OpenZWave::Manager::Get()->GetNodeRoleString(homeid, nodeid);
329329
info.GetReturnValue().Set(Nan::New<String>(result.c_str()).ToLocalChecked());
330330
}
331331
/*
@@ -361,7 +361,7 @@ namespace OZW {
361361
Nan::HandleScope scope;
362362
CheckMinArgs(1, "nodeid");
363363
uint8 nodeid = Nan::To<Number>(info[0]).ToLocalChecked()->Value();
364-
std::string result = OpenZWave::Manager::Get()->GetNodeDeviceTypeString(homeid, nodeid);
364+
::std::string result = OpenZWave::Manager::Get()->GetNodeDeviceTypeString(homeid, nodeid);
365365
info.GetReturnValue().Set(Nan::New<String>(result.c_str()).ToLocalChecked());
366366
}
367367
/*
@@ -422,7 +422,7 @@ namespace OZW {
422422
Nan::HandleScope scope;
423423
CheckMinArgs(1, "nodeid");
424424
uint8 nodeid = Nan::To<Number>(info[0]).ToLocalChecked()->Value();
425-
std::string result = OpenZWave::Manager::Get()->GetNodeQueryStage(homeid, nodeid);
425+
::std::string result = OpenZWave::Manager::Get()->GetNodeQueryStage(homeid, nodeid);
426426
info.GetReturnValue().Set(Nan::New<String>(result.c_str()).ToLocalChecked());
427427
}
428428
/*

src/utils.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,17 +111,17 @@ namespace OZW {
111111
}
112112
case OpenZWave::ValueID::ValueType_List: {
113113
int32 val;
114-
std::vector < std::string > items;
115-
std::vector < int32> itemsvalues;
114+
::std::vector < ::std::string > items;
115+
::std::vector < int32> itemsvalues;
116116

117117
// populate array of all available items in the list
118118
OZWManager( GetValueListItems, value, &items);
119119
OZWManager( GetValueListValues, value, &itemsvalues);
120120

121121
for (int i = 0; (unsigned)i != items.size(); i++){
122-
//items[i]=std::to_string(itemsvalues[i])+"|"+items[i];
122+
//items[i]=::std::to_string(itemsvalues[i])+"|"+items[i];
123123

124-
std::stringstream sstm;
124+
::std::stringstream sstm;
125125
sstm << itemsvalues[i] << "|" << items[i];
126126
items[i] = sstm.str();
127127
}

0 commit comments

Comments
 (0)