[Commit-gnuradio] [gnuradio] 06/11: Merge remote-tracking branch 'mmueller/pmt_io_uniform_vector_to_string'

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit f5aafacd7416822cd0ec7017dd9604cfdb1533dc
Merge: f3fbf45 dbd2aee
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jun 13 14:41:50 2014 -0700

    Merge remote-tracking branch 'mmueller/pmt_io_uniform_vector_to_string'
    
    Conflicts:
        gnuradio-runtime/lib/pmt/pmt_int.h

 gnuradio-runtime/lib/pmt/generate_unv.py   |  1 +
 gnuradio-runtime/lib/pmt/pmt_int.h         |  1 +
 gnuradio-runtime/lib/pmt/pmt_io.cc         | 13 ++++++++++---
 gnuradio-runtime/lib/pmt/unv_template.cc.t |  6 ++++++
 gnuradio-runtime/lib/pmt/unv_template.h.t  |  1 +
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --cc gnuradio-runtime/lib/pmt/pmt_int.h
index ca90c5a,25bcdb9..49bde52
--- a/gnuradio-runtime/lib/pmt/pmt_int.h
+++ b/gnuradio-runtime/lib/pmt/pmt_int.h
@@@ -238,7 -238,7 +238,8 @@@ public
    virtual const void *uniform_elements(size_t &len) = 0;
    virtual void *uniform_writable_elements(size_t &len) = 0;
    virtual size_t length() const = 0;
 -  virtual const std::string string_ref(size_t k) const { return 
std::string("FIXME"); }
 +  virtual size_t itemsize() const = 0;
++  virtual const std::string string_ref(size_t k) const { return 
std::string("not implemented"); }
  };
  
  #include "pmt_unv_int.h"