[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 07/08: pager & digital: add explicit type t
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 07/08: pager & digital: add explicit type to constants that could be interpreted in other ways, to make various compilers happy. |
Date: |
Tue, 31 Mar 2015 20:37:40 +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 9332cc4dcbbdfc4a247c07819c020627853b3340
Author: Michael Dickens <address@hidden>
Date: Wed Mar 18 12:57:26 2015 -0400
pager & digital: add explicit type to constants that could be interpreted
in other ways, to make various compilers happy.
---
gr-digital/lib/glfsr.cc | 2 +-
gr-pager/lib/flex_modes.cc | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/gr-digital/lib/glfsr.cc b/gr-digital/lib/glfsr.cc
index fc2762f..fa6c765 100644
--- a/gr-digital/lib/glfsr.cc
+++ b/gr-digital/lib/glfsr.cc
@@ -59,7 +59,7 @@ namespace gr {
0x10000002, // x^29 + x^2 + 1
0x20000029, // x^30 + x^4 + x^1 + 1
0x40000004, // x^31 + x^3 + 1
- 0x80000057 // x^32 + x^7 + x^5 + x^3 + x^2 + x^1 + 1
+ (int) 0x80000057 // x^32 + x^7 + x^5 + x^3 + x^2 + x^1 + 1
};
glfsr::~glfsr()
diff --git a/gr-pager/lib/flex_modes.cc b/gr-pager/lib/flex_modes.cc
index bb54733..333883f 100644
--- a/gr-pager/lib/flex_modes.cc
+++ b/gr-pager/lib/flex_modes.cc
@@ -28,11 +28,11 @@ namespace gr {
const flex_mode_t
flex_modes[] =
{
- { 0x870C78F3, 1600, 2 },
- { 0xB0684F97, 1600, 4 },
- { 0x7B1884E7, 3200, 2 },
- { 0xDEA0215F, 3200, 4 },
- { 0x4C7CB383, 3200, 4 }
+ { (int32_t) 0x870C78F3, 1600, 2 },
+ { (int32_t) 0xB0684F97, 1600, 4 },
+ { (int32_t) 0x7B1884E7, 3200, 2 },
+ { (int32_t) 0xDEA0215F, 3200, 4 },
+ { (int32_t) 0x4C7CB383, 3200, 4 }
};
const int num_flex_modes = sizeof(flex_modes)/sizeof(flex_modes[0]);
- [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, 2015/03/31
- [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 <=
- [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