[cig-commits] [commit] master: Fixed event/sweep output operator (91215fe)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/vc

On branch  : master
Link       : https://github.com/geodynamics/vc/compare/23464fca3efa2b6ad7ee0ce8f60c225b18b49741...e4325192ad1118379f46ba66899cb98143d09e04

>---------------------------------------------------------------

commit 91215fee938de1e75cfd7e0132d7e93596afd1a1
Author: Eric Heien <emheien at ucdavis.edu>
Date:   Thu Sep 25 13:28:59 2014 -0700

    Fixed event/sweep output operator


>---------------------------------------------------------------

91215fee938de1e75cfd7e0132d7e93596afd1a1
 quakelib/src/QuakeLibIO.cpp | 15 +++++++++------
 quakelib/src/QuakeLibIO.h   |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/quakelib/src/QuakeLibIO.cpp b/quakelib/src/QuakeLibIO.cpp
index ff81e65..486a064 100644
--- a/quakelib/src/QuakeLibIO.cpp
+++ b/quakelib/src/QuakeLibIO.cpp
@@ -2740,11 +2740,14 @@ void quakelib::ModelEvent::append_event_hdf5(const hid_t &data_file) const {
     delete field_sizes;
 }
 
-std::ostream &operator<<(std::ostream &os, const quakelib::ModelSweeps &ms) {
-    return os;
-}
+namespace quakelib {
+    std::ostream &operator<<(std::ostream &os, const ModelSweeps &ms) {
+        os << "SWEEPS(" << ms._sweeps.size() << ")";
+        return os;
+    }
 
-std::ostream &operator<<(std::ostream &os, const quakelib::ModelEvent &me) {
-    //os << me._data._event_number << " " << me._data._event_year;
-    return os;
+    std::ostream &operator<<(std::ostream &os, const ModelEvent &me) {
+        os << me._data._event_number << " " << me._data._event_year;
+        return os;
+    }
 }
diff --git a/quakelib/src/QuakeLibIO.h b/quakelib/src/QuakeLibIO.h
index 66ffaac..bce7f99 100644
--- a/quakelib/src/QuakeLibIO.h
+++ b/quakelib/src/QuakeLibIO.h
@@ -704,7 +704,7 @@ namespace quakelib {
             void read_ascii(std::istream &in_stream, const unsigned int num_records);
             void write_ascii(std::ostream &out_stream) const;
 
-            friend std::ostream &operator<<(std::ostream &os, const SweepData &ms);
+            friend std::ostream &operator<<(std::ostream &os, const ModelSweeps &ms);
     };
 
     typedef std::map<UIndex, SweepData> EventElementMap;