projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0771cc9
)
InputOutput: replace nullptr with boost::none in Double()
author
Bartosz Golaszewski
<bgolaszewski@baylibre.com>
Mon, 29 Jun 2015 13:17:54 +0000
(15:17 +0200)
committer
Uwe Hermann
<uwe@hermann-uwe.de>
Tue, 30 Jun 2015 09:15:47 +0000
(11:15 +0200)
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 <bgolaszewski@baylibre.com>
pv/binding/inputoutput.cpp
patch
|
blob
|
history
diff --git
a/pv/binding/inputoutput.cpp
b/pv/binding/inputoutput.cpp
index 956b12b32ff4d04de89c7e26f84352b689520930..0dc0fc19dd5a8e6d38ac7bf79ebd89c9705cf92c 100644
(file)
--- a/
pv/binding/inputoutput.cpp
+++ b/
pv/binding/inputoutput.cpp
@@
-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, "",
- n
ullptr, nullptr
, get, set));
+ n
one, 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")))