Passing nullptr as the fourth argument in Double's constructor
seems to build fine on x86, but causes build failures on many
other architectures.
Replace it with boost::none.
Signed-off-by: Bartosz Golaszewski <bgolaszew...@baylibre.com>
---
Version 2: use none instead of boost::none since there's a 'using
boost::none' at the top of the file.
pv/binding/inputoutput.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pv/binding/inputoutput.cpp b/pv/binding/inputoutput.cpp
index 956b12b..62053e5 100644
--- a/pv/binding/inputoutput.cpp
+++ b/pv/binding/inputoutput.cpp
@@ -71,7 +71,7 @@ InputOutput::InputOutput(
const vector<VariantBase> values = opt->values();
options_[opt->id()] = def_val;
-
+
const Property::Getter get = [&, opt]() {
return options_[opt->id()]; };
const Property::Setter set = [&, opt](VariantBase value) {
@@ -85,7 +85,7 @@ InputOutput::InputOutput(
prop = shared_ptr<Property>(new Bool(name, get, set));
else if (def_val.is_of_type(VariantType("d")))
prop = shared_ptr<Property>(new Double(name, 2, "",
- nullptr, nullptr, get, set));
+ none, none, get, set));
else if (def_val.is_of_type(VariantType("i")) ||
def_val.is_of_type(VariantType("t")) ||
def_val.is_of_type(VariantType("u")))
--
2.1.4
------------------------------------------------------------------------------
Monitor 25 network devices or servers for free with OpManager!
OpManager is web-based network management software that monitors
network devices and physical & virtual servers, alerts via email & sms
for fault. Monitor 25 devices for free with no restriction. Download now
http://ad.doubleclick.net/ddm/clk/292181274;119417398;o
_______________________________________________
sigrok-devel mailing list
sigrok-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sigrok-devel
