diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:20:09 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:20:09 -0400 |
| commit | bbfc759914da80214fabc70fbbed1edaf39f9e4b (patch) | |
| tree | 712eb6d1d95445bb6535534ce86d7faf1bfe6f90 /gnuradio-runtime/lib/pmt/pmt_serialize.cc | |
| parent | 3f469513b94ac992138360caca7e1b53f82214ae (diff) | |
| parent | 597b93798a804cde1783d6d2ab53b348d57c44cd (diff) | |
Merge branch 'maint'
Diffstat (limited to 'gnuradio-runtime/lib/pmt/pmt_serialize.cc')
| -rw-r--r-- | gnuradio-runtime/lib/pmt/pmt_serialize.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnuradio-runtime/lib/pmt/pmt_serialize.cc b/gnuradio-runtime/lib/pmt/pmt_serialize.cc index fc5763aed4..5cc2005ca7 100644 --- a/gnuradio-runtime/lib/pmt/pmt_serialize.cc +++ b/gnuradio-runtime/lib/pmt/pmt_serialize.cc @@ -276,14 +276,14 @@ serialize(pmt_t obj, std::streambuf &sb) } if(is_number(obj)) { - + if(is_uint64(obj)) { uint64_t i = to_uint64(obj); ok = serialize_untagged_u8(PST_UINT64, sb); ok &= serialize_untagged_u64(i, sb); return ok; } - else { + else { if(is_integer(obj)) { long i = to_long(obj); if(sizeof(long) > 4) { @@ -581,7 +581,7 @@ deserialize(std::streambuf &sb) goto error; return make_rectangular( r,i ); } - + case PST_TUPLE: { pmt_t tuple; @@ -614,7 +614,7 @@ deserialize(std::streambuf &sb) if(!deserialize_untagged_u32(&nitems, sb)) goto error; - + deserialize_untagged_u8(&npad, sb); for(size_t i = 0; i < npad; i++) deserialize_untagged_u8(&u8, sb); |