diff options
| author | Tom Rondeau | 2011-06-13 12:35:42 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-06-13 12:35:42 -0400 |
| commit | 5ce630cbce6460b739b175257ce0d717095a55f4 (patch) | |
| tree | cabaca9d47ca1959f5e2861801a0ab160fe0be11 /gnuradio-core/src/lib/runtime | |
| parent | 86553ec410b1074bc4258b22027c5d31443d12ec (diff) | |
| parent | f0143c5d557ca7e4bf05c26f410da13520df91e5 (diff) | |
| download | gnuradio-5ce630cbce6460b739b175257ce0d717095a55f4.tar.gz gnuradio-5ce630cbce6460b739b175257ce0d717095a55f4.tar.bz2 gnuradio-5ce630cbce6460b739b175257ce0d717095a55f4.zip | |
Merge branch 'master' into 8psk
Conflicts:
gr-qtgui/lib/qtgui_time_sink_c.cc
gr-trellis/src/lib/Makefile.am
gr-trellis/src/lib/calc_metric.h
gr-trellis/src/lib/trellis.i
gr-trellis/src/lib/trellis_constellation_metrics_cf.i
gr-trellis/src/lib/trellis_metric_type.h
gr-trellis/src/lib/trellis_sccc_encoder_XX.i.t
Diffstat (limited to 'gnuradio-core/src/lib/runtime')
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc b/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc index abcf5b2a6..3b8a6e617 100644 --- a/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc +++ b/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc @@ -100,8 +100,10 @@ gr_vmcircbuf_sysconfig::all_factories () std::vector<gr_vmcircbuf_factory *> result; result.push_back (gr_vmcircbuf_createfilemapping_factory::singleton ()); +#ifdef TRY_SHM_VMCIRCBUF result.push_back (gr_vmcircbuf_sysv_shm_factory::singleton ()); result.push_back (gr_vmcircbuf_mmap_shm_open_factory::singleton ()); +#endif result.push_back (gr_vmcircbuf_mmap_tmpfile_factory::singleton ()); return result; |