From: Rene H. <ren...@ma...> - 2013-10-22 03:00:44
|
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; |
From: Joel H. <jo...@ai...> - 2013-10-23 07:05:42
|
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi Rene, Thanks for doing this. I've tested your patch and it works for me, so I'll get it merged today. I hope you don't mind, but I've made one tiny alteration. uwe_, biot: Could one of you pull this branch please: https://github.com/jhol/pulseview/commits/rene Joel On 22/10/13 04:00, Rene Hopf wrote: > 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 sig...@li... > https://lists.sourceforge.net/lists/listinfo/sigrok-devel > -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBAgAGBQJSZ3UtAAoJEHgUeO+Es/hF2NAH/2kVIU0oWa1BZ2ceZtI5c8ru A/iugeVv2d5+IBzZZIcbrPa1sJ1+HPeuPn43CnhmZ8LPy8XIoYrZeI5ospxnhCdC DhDkLiWuKNxeKMMltk3c+VgIk9hEzIIb78rRHm1m1pE4Uy7JsPXF29AR30w6Utqh baQ1Pa7EpwmSaTHZC3nvqJnlnkAIN24W0CMys8AwD5uI8QVazC9tQun4pwuRqV2d NbDArleCcXuOYb4HjnQb3ijUrbXMqZlKWXZ2zEXwO/mRSEHdKu67+IWU/uB0983H TePPX5nzFaPIiBsnpBiC1sk5esQJa5AgoP3x+VPcrBHvr4GOm1mA1bpFw4Scqw8= =LVbf -----END PGP SIGNATURE----- |