Hi,
clang was complaining about
call to 'pow' is ambiguous
and
private field '_decoder' is not used [-Wunused-private-field]
private field '_options' is not used [-Wunused-private-field]
This patch allows pulseview to be built.
libsigrok and libsigrokdecode built without errors on OS X.
Rene
diff --git a/pv/dialogs/decoder.cpp b/pv/dialogs/decoder.cpp
index b7ddb52..88ccf76 100644
--- a/pv/dialogs/decoder.cpp
+++ b/pv/dialogs/decoder.cpp
@@ -42,9 +42,7 @@ namespace dialogs {
Decoder::Decoder(QWidget *parent, const srd_decoder *decoder,
const vector< shared_ptr<view::Signal> > &sigs, GHashTable *options) :
QDialog(parent),
- _decoder(decoder),
_sigs(sigs),
- _options(options),
_binding(decoder, options),
_layout(this),
_form(this),
diff --git a/pv/dialogs/decoder.h b/pv/dialogs/decoder.h
index 2277f98..56f02aa 100644
--- a/pv/dialogs/decoder.h
+++ b/pv/dialogs/decoder.h
@@ -62,12 +62,10 @@ private:
QWidget *parent, const char *name);
private:
- const srd_decoder *const _decoder;
const std::vector< boost::shared_ptr<view::Signal> > &_sigs;
std::map<const srd_probe*, QComboBox*> _probe_selector_map;
- GHashTable *const _options;
pv::prop::binding::DecoderOptions _binding;
QVBoxLayout _layout;
diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index a9a8452..17f2944 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -74,7 +74,7 @@ QString Ruler::format_time(double t, unsigned int prefix,
unsigned int precision)
{
const double multiplier = pow(10.0,
- - prefix * 3 - FirstSIPrefixPower);
+ (int)- prefix * 3 - FirstSIPrefixPower);
QString s;
QTextStream ts(&s);
@@ -106,7 +106,7 @@ void Ruler::paintEvent(QPaintEvent*)
const double min_period = _view.scale() * min_width;
const int order = (int)floorf(log10f(min_period));
- const double order_decimal = pow(10, order);
+ const double order_decimal = pow((double)10, order);
unsigned int unit = 0;
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60135991&iu=/4140/ostg.clktrk
_______________________________________________
sigrok-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/sigrok-devel
