Mercurial > octave-nkf
changeset 15858:fb756e8d6620
Silence compilation warning in ov-java.h.
* libinterp/octave-value/ov-java.h(print, print_raw): Move function
bodies to ov-java.cc. Leave only prototypes in .h file.
* libinterp/octave-value/ov-java.cc(print, print_raw): Function bodies
moved from ov-java.h.
| author | Rik <rik@octave.org> |
|---|---|
| date | Thu, 27 Dec 2012 21:43:35 -0800 |
| parents | 715d324b1b72 |
| children | 0e393e744e5e |
| files | libinterp/octave-value/ov-java.cc libinterp/octave-value/ov-java.h |
| diffstat | 2 files changed, 15 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-java.cc Thu Dec 27 19:58:09 2012 -0800 +++ b/libinterp/octave-value/ov-java.cc Thu Dec 27 21:43:35 2012 -0800 @@ -178,6 +178,19 @@ std::list<std::string> java_opts; }; +void +octave_java::print (std::ostream& os, bool) const +{ + print_raw (os); + newline (os); +} + +void +octave_java::print_raw (std::ostream& os, bool) const +{ + os << "<Java object: " << java_classname << ">"; +} + static dim_vector compute_array_dimensions (JNIEnv* jni_env, jobject obj); #ifdef __WIN32__
--- a/libinterp/octave-value/ov-java.h Thu Dec 27 19:58:09 2012 -0800 +++ b/libinterp/octave-value/ov-java.h Thu Dec 27 21:43:35 2012 -0800 @@ -149,16 +149,9 @@ dim_vector dims (void) const; - void print (std::ostream& os, bool pr_as_read_syntax = false) const - { - os << "<Java object: " << java_classname << ">"; - newline(os); - } + void print (std::ostream& os, bool pr_as_read_syntax = false) const; - void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const - { - print(os, pr_as_read_syntax); - } + void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const; octave_value_list subsref (const std::string& type,