Fix warnings/errors with Intel compiler

geodynamics · Oct 23, 2014 · 0e94b39 · 0e94b39
1 parent 6aa97de
commit 0e94b39
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/quakelib/src/QuakeLibIO.h b/quakelib/src/QuakeLibIO.h
@@ -916,7 +916,7 @@ namespace quakelib {
             };
 
             void clear(void) {
-                _data._event_number = nan("");
+                _data._event_number = UNDEFINED_EVENT_ID;
                 _data._event_year = nan("");
                 _data._event_trigger = UNDEFINED_ELEMENT_ID;
                 _sweeps.clear();

diff --git a/src/core/SimTimer.h b/src/core/SimTimer.h
@@ -18,21 +18,21 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+#include "config.h"
+
+#ifdef MPI_C_FOUND
+#include <mpi.h>
+#endif
+
 #include <vector>
 #include <string>
 #include <stack>
 #include <iostream>
 
-#include "config.h"
-
 #ifdef VQ_HAVE_MATH_H
 #include <math.h>
 #endif
 
-#ifdef MPI_C_FOUND
-#include <mpi.h>
-#endif
-
 #ifndef _SIM_TIMER_H_
 #define _SIM_TIMER_H_
 

diff --git a/src/misc/MPIDebugOutputStream.h b/src/misc/MPIDebugOutputStream.h
@@ -18,15 +18,15 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#include <iostream>
-#include <string>
-
 #include "config.h"
 
 #ifdef MPI_C_FOUND
 #include <mpi.h>
 #endif
 
+#include <iostream>
+#include <string>
+
 #ifndef _MPI_DEBUG_OUTPUT_STREAM_H_
 #define _MPI_DEBUG_OUTPUT_STREAM_H_