[cig-commits] [commit] master: hdf5 compile fix (3755ce0)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/vq/compare/4a71dae87966b80bfee7c194773543359a343617...941b3d7e55983967dea392d12aeac9ce3998ca30

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

commit 3755ce02ec4fc4f9f5f463743f1a18bc1b13c3f2
Author: Kasey Schultz <kwschultz at ucdavis.edu>
Date:   Wed Jan 28 21:16:17 2015 -0800

    hdf5 compile fix


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

3755ce02ec4fc4f9f5f463743f1a18bc1b13c3f2
 quakelib/src/QuakeLibIO.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/quakelib/src/QuakeLibIO.cpp b/quakelib/src/QuakeLibIO.cpp
index 59bacfc..823b49d 100644
--- a/quakelib/src/QuakeLibIO.cpp
+++ b/quakelib/src/QuakeLibIO.cpp
@@ -2882,8 +2882,8 @@ int quakelib::ModelEventSet::read_file_hdf5(const std::string &file_name) {
     return 0;
 }
 
-#ifdef HDF5_FOUND
 void quakelib::ModelEventSet::read_events_hdf5(const hid_t &data_file) {
+#ifdef HDF5_FOUND
     std::vector<FieldDesc>                        descs;
     std::map<UIndex, ModelEvent>::const_iterator  fit;
     hsize_t                     num_fields, num_events;
@@ -2927,9 +2927,13 @@ void quakelib::ModelEventSet::read_events_hdf5(const hid_t &data_file) {
     delete event_data;
     delete field_offsets;
     delete field_sizes;
+#else
+    // TODO: Error out
+#endif
 }
 
 void quakelib::ModelEventSet::read_sweeps_hdf5(const hid_t &data_file) {
+#ifdef HDF5_FOUND
     std::vector<FieldDesc>                          descs;
     ModelEventSet::iterator                   fit;
     hsize_t                     num_fields, num_sweeps;
@@ -2972,10 +2976,11 @@ void quakelib::ModelEventSet::read_sweeps_hdf5(const hid_t &data_file) {
         fit->setSweeps(new_sweeps);
         
     }
-    
+#else
+    // TODO: Error out
+#endif
     delete event_sweeps;
 }
-#endif
 
 // ********************************************************************************************