diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-12-17 16:10:13 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-12-17 16:10:13 -0500 |
| commit | e39fae92a396aa984cba96a8bfd5cfe562ed7008 (patch) | |
| tree | 6d6cd8493b0171af1f96edca4a1d0dca2ac5e98b /gruel | |
| parent | af16ab52459dd136cb04caf0ced5deefebc7a71d (diff) | |
| parent | b15b38df132ae662c1b9e3ebe5ea5ba4f7180afa (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gruel')
| -rw-r--r-- | gruel/src/lib/pmt/pmt_serialize.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gruel/src/lib/pmt/pmt_serialize.cc b/gruel/src/lib/pmt/pmt_serialize.cc index 1ee7ca1fe7..24be6b772c 100644 --- a/gruel/src/lib/pmt/pmt_serialize.cc +++ b/gruel/src/lib/pmt/pmt_serialize.cc @@ -711,12 +711,12 @@ pmt_deserialize(std::streambuf &sb) { pmt_t vec = pmt_make_c32vector(nitems, 0); for(uint32_t i=0; i<nitems; i++) { - std::complex<float> c; + float re, im; deserialize_untagged_f64(&f64, sb); - c.real(static_cast<float>(f64)); + re = static_cast<float>(f64); deserialize_untagged_f64(&f64, sb); - c.imag(static_cast<float>(f64)); - pmt_c32vector_set(vec, i, c); + im = static_cast<float>(f64); + pmt_c32vector_set(vec, i, std::complex<float>(re, im)); } return vec; } @@ -725,12 +725,12 @@ pmt_deserialize(std::streambuf &sb) { pmt_t vec = pmt_make_c64vector(nitems, 0); for(uint32_t i=0; i<nitems; i++) { - std::complex<double> c; + double re, im; deserialize_untagged_f64(&f64, sb); - c.real(f64); + re = f64; deserialize_untagged_f64(&f64, sb); - c.imag(f64); - pmt_c64vector_set(vec, i, c); + im = f64; + pmt_c64vector_set(vec, i, std::complex<double>(re, im)); } return vec; } |