[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/08: qtgui: clarify return value, to make
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 01/08: qtgui: clarify return value, to make some compilers happier. |
Date: |
Tue, 31 Mar 2015 20:37:39 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch maint
in repository gnuradio.
commit de174af9f59d74a616772d5f9a6d4f09ea9ebb1f
Author: Michael Dickens <address@hidden>
Date: Wed Mar 18 12:49:03 2015 -0400
qtgui: clarify return value, to make some compilers happier.
---
gr-qtgui/lib/SpectrumGUIClass.cc | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/gr-qtgui/lib/SpectrumGUIClass.cc b/gr-qtgui/lib/SpectrumGUIClass.cc
index 4fe8628..cf7c728 100644
--- a/gr-qtgui/lib/SpectrumGUIClass.cc
+++ b/gr-qtgui/lib/SpectrumGUIClass.cc
@@ -359,15 +359,17 @@ SpectrumGUIClass::getFFTSizeIndex()
{
gr::thread::scoped_lock lock(d_mutex);
int fftsize = getFFTSize();
+ int rv = 0;
switch(fftsize) {
- case(1024): return 0; break;
- case(2048): return 1; break;
- case(4096): return 2; break;
- case(8192): return 3; break;
- case(16384): return 3; break;
- case(32768): return 3; break;
- default: return 0;
+ case(1024): rv = 0; break;
+ case(2048): rv = 1; break;
+ case(4096): rv = 2; break;
+ case(8192): rv = 3; break;
+ case(16384): rv = 3; break;
+ case(32768): rv = 3; break;
+ default: rv = 0; break;
}
+ return rv;
}
void
- [Commit-gnuradio] [gnuradio] branch maint updated (48b29c4 -> d817c5f), git, 2015/03/31
- [Commit-gnuradio] [gnuradio] 01/08: qtgui: clarify return value, to make some compilers happier.,
git <=
- [Commit-gnuradio] [gnuradio] 05/08: audio osx: use memcpy instead of bcopy, to be consistent with the rest of GNU Radio., git, 2015/03/31
- [Commit-gnuradio] [gnuradio] 02/08: filter: use correct function for argument type; where's std::abs when you need it to auto-type?, git, 2015/03/31
- [Commit-gnuradio] [gnuradio] 08/08: logger: fix macro name in comments., git, 2015/03/31
- [Commit-gnuradio] [gnuradio] 03/08: blocks: fixmsg handler pmt length / size comparison to be valid., git, 2015/03/31
- [Commit-gnuradio] [gnuradio] 06/08: blocks: use explicit type conversion to compare the same types., git, 2015/03/31
- [Commit-gnuradio] [gnuradio] 07/08: pager & digital: add explicit type to constants that could be interpreted in other ways, to make various compilers happy., git, 2015/03/31
- [Commit-gnuradio] [gnuradio] 04/08: audio osx: change copying of a UInt32 type into a string by using memcpy instead of a direct pointer manipulation, to make some newer compilers happy., git, 2015/03/31