diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-08-16 08:39:13 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-08-16 08:39:13 -0700 |
| commit | ee6f4e343e31d141d4e303b1c27c9743953fc396 (patch) | |
| tree | 30028db275cb79fe6a6699eaa124e610fa9c3c78 | |
| parent | 0bfbc97d629becd16e6ffbc1495ef72f19b29961 (diff) | |
| parent | cd40a9b64622141f64d5cc31334419371ddf5613 (diff) | |
Merge branch 'maint'
| -rw-r--r-- | cmake/msvc/config.h | 3 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/sys_paths.cc | 8 | ||||
| -rw-r--r-- | gr-audio/lib/portaudio/portaudio_sink.cc | 4 | ||||
| -rw-r--r-- | gr-audio/lib/portaudio/portaudio_source.cc | 4 | ||||
| -rw-r--r-- | gr-digital/lib/pfb_clock_sync_fff_impl.cc | 2 | ||||
| -rw-r--r-- | gr-fec/include/gnuradio/fec/polar_decoder_common.h | 2 | ||||
| -rw-r--r-- | gr-fec/lib/polar_decoder_common.cc | 2 |
7 files changed, 22 insertions, 3 deletions
diff --git a/cmake/msvc/config.h b/cmake/msvc/config.h index 50515104db..99a2ea0f89 100644 --- a/cmake/msvc/config.h +++ b/cmake/msvc/config.h @@ -62,4 +62,7 @@ static inline float rintf(float x){return (x > 0.0f)? floorf(x + 0.5f) : ceilf(x static inline long int random (void) { return rand(); } static inline void srandom (unsigned int seed) { srand(seed); } +#define srand48(seed) srand(seed) +#define drand48() (double(rand()) / RAND_MAX) + #endif // _MSC_CONFIG_H_ ] diff --git a/gnuradio-runtime/lib/sys_paths.cc b/gnuradio-runtime/lib/sys_paths.cc index 3bf6697bac..f63d7730e4 100644 --- a/gnuradio-runtime/lib/sys_paths.cc +++ b/gnuradio-runtime/lib/sys_paths.cc @@ -64,10 +64,16 @@ namespace gr { return tmp_path(); } - const char *userconf_path() + std::string __userconf_path() { boost::filesystem::path p(appdata_path()); p = p / ".gnuradio"; + return p.string(); + } + + const char *userconf_path() + { + static std::string p(__userconf_path()); return p.c_str(); } diff --git a/gr-audio/lib/portaudio/portaudio_sink.cc b/gr-audio/lib/portaudio/portaudio_sink.cc index 2397b65442..e6698adb72 100644 --- a/gr-audio/lib/portaudio/portaudio_sink.cc +++ b/gr-audio/lib/portaudio/portaudio_sink.cc @@ -24,6 +24,10 @@ #include "config.h" #endif +#ifdef _MSC_VER +#include <io.h> +#endif + #include "audio_registry.h" #include <portaudio_sink.h> #include <portaudio_impl.h> diff --git a/gr-audio/lib/portaudio/portaudio_source.cc b/gr-audio/lib/portaudio/portaudio_source.cc index 1e1bbfacbb..7f2e8f30b9 100644 --- a/gr-audio/lib/portaudio/portaudio_source.cc +++ b/gr-audio/lib/portaudio/portaudio_source.cc @@ -24,6 +24,10 @@ #include "config.h" #endif +#ifdef _MSC_VER +#include <io.h> +#endif + #include "audio_registry.h" #include <portaudio_source.h> #include <portaudio_impl.h> diff --git a/gr-digital/lib/pfb_clock_sync_fff_impl.cc b/gr-digital/lib/pfb_clock_sync_fff_impl.cc index 09c72495a0..30ef526ad0 100644 --- a/gr-digital/lib/pfb_clock_sync_fff_impl.cc +++ b/gr-digital/lib/pfb_clock_sync_fff_impl.cc @@ -66,7 +66,7 @@ namespace gr { d_osps(osps), d_error(0), d_out_idx(0) { if(taps.size() == 0) - throw std::runtime_error("pfb_clock_sync_ccf: please specify a filter.\n"); + throw std::runtime_error("pfb_clock_sync_fff: please specify a filter.\n"); // Let scheduler adjust our relative_rate. enable_update_rate(true); diff --git a/gr-fec/include/gnuradio/fec/polar_decoder_common.h b/gr-fec/include/gnuradio/fec/polar_decoder_common.h index a39ee4f232..13b25ea19b 100644 --- a/gr-fec/include/gnuradio/fec/polar_decoder_common.h +++ b/gr-fec/include/gnuradio/fec/polar_decoder_common.h @@ -68,7 +68,7 @@ namespace gr { bool set_frame_size(unsigned int frame_size){return false;}; private: - static BOOST_CONSTEXPR_OR_CONST float D_LLR_FACTOR = -2.19722458f; + static BOOST_CONSTEXPR_OR_CONST float D_LLR_FACTOR; unsigned int d_frozen_bit_counter; protected: diff --git a/gr-fec/lib/polar_decoder_common.cc b/gr-fec/lib/polar_decoder_common.cc index 8fc2e37fb7..1d4a21a191 100644 --- a/gr-fec/lib/polar_decoder_common.cc +++ b/gr-fec/lib/polar_decoder_common.cc @@ -34,6 +34,8 @@ namespace gr { namespace fec { namespace code { + const float polar_decoder_common::D_LLR_FACTOR = -2.19722458f; + polar_decoder_common::polar_decoder_common(int block_size, int num_info_bits, std::vector<int> frozen_bit_positions, std::vector<char> frozen_bit_values) : |