From 6003121c6450a7e5e88dade2b274a3df9caaae3c Mon Sep 17 00:00:00 2001
From: Guilhem Lavaux <lavaux@iap.fr>
Date: Wed, 15 Feb 2017 15:14:42 +0100
Subject: [PATCH] Use int64_t everywhere for flash id

---
 src/h5_readFlash.cpp | 4 ++--
 src/h5_readFlash.hpp | 3 ++-
 src/loadFlash.cpp    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/h5_readFlash.cpp b/src/h5_readFlash.cpp
index 3d6d205..8e46b89 100644
--- a/src/h5_readFlash.cpp
+++ b/src/h5_readFlash.cpp
@@ -226,7 +226,7 @@ void h5_read_flash3_particles (H5File* file,
                         float *vel1,
                         float *vel2,
                         float *vel3,
-                        long    *id)
+                        int64_t    *id)
 {
 
   herr_t   status;
@@ -381,7 +381,7 @@ void h5_read_flash3_particles (H5File* file,
 
     if (id) {
     for(p=0; p < (pcount); p++) {
-      id[p+poffset] = (long)  *(partBuffer+iptag-1+p*numProps);
+      id[p+poffset] = (int64_t)  *(partBuffer+iptag-1+p*numProps);
     } }
 
     if (pos1 && pos2 && pos3) {
diff --git a/src/h5_readFlash.hpp b/src/h5_readFlash.hpp
index 56f290f..e50b2a2 100644
--- a/src/h5_readFlash.hpp
+++ b/src/h5_readFlash.hpp
@@ -52,6 +52,7 @@ This file has been developped by P. M. Sutter.
 #include <cstring>
 #include "H5Cpp.h"
 #include "hdf5_flash.h"
+#include <stdint.h>
 
 using namespace H5;
 
@@ -73,7 +74,7 @@ void h5_read_flash3_particles (H5File* file,
                         float *vel1,
                         float *vel2,
                         float *vel3,
-                        long    *id);
+                        int64_t    *id);
 
 void h5_read_flash3_header_info(H5File* file,
 				double* time,                   /* simulation time */
diff --git a/src/loadFlash.cpp b/src/loadFlash.cpp
index 5f54f3d..d0c33eb 100644
--- a/src/loadFlash.cpp
+++ b/src/loadFlash.cpp
@@ -106,7 +106,7 @@ SimuData *CosmoTool::loadFlashMulti(const char *fname, int id, int loadflags)
     } }
  
     if (loadflags & NEED_GADGET_ID) {
-    data->Id = new long[data->NumPart];
+    data->Id = new int64_t[data->NumPart];
     if (data->Id == 0) {
       delete data;
       return 0;