[ismrmrd] 32/177: Cleaning up compiler issues on older versions of GCC.

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to annotated tag v1.1.0.beta.1
in repository ismrmrd.

commit 3977ab88f594bd7333a71081f6c0e54152dd777a
Author: Souheil Inati <souheil.inati at nih.gov>
Date:   Fri Aug 29 13:37:17 2014 -0400

    Cleaning up compiler issues on older versions of GCC.
---
 CMakeLists.txt      | 2 +-
 ismrmrd.c           | 9 +++------
 ismrmrd.cpp         | 3 +++
 ismrmrd.h           | 4 +---
 ismrmrd_dataset.cpp | 5 ++++-
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4b7367..18f75f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,7 +26,7 @@ if (WIN32)
     set(CMAKE_MODULE_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO")
 else (WIN32)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 endif (WIN32)
 
 # required packages for main library
diff --git a/ismrmrd.c b/ismrmrd.c
index f0b2f60..86ea9b0 100644
--- a/ismrmrd.c
+++ b/ismrmrd.c
@@ -1,8 +1,8 @@
+#include <string.h>
+#include <stdlib.h>
+
 /* Language and Cross platform section for defining types */
 #ifdef __cplusplus
-
-#include <cstring>
-#include <cstdlib>
 #include <cmath>
 #include <cassert>
 
@@ -11,10 +11,7 @@
 #endif /* DEBUG */
 
 #else
-
 /* C99 compiler */
-#include <string.h>
-#include <stdlib.h>
 #include <math.h>
 #include <assert.h>
 
diff --git a/ismrmrd.cpp b/ismrmrd.cpp
index 1c202ee..da55f40 100644
--- a/ismrmrd.cpp
+++ b/ismrmrd.cpp
@@ -1,3 +1,6 @@
+#include <string.h>
+#include <stdlib.h>
+
 #include "ismrmrd.h"
 
 namespace ISMRMRD {
diff --git a/ismrmrd.h b/ismrmrd.h
index 509512f..afc9b58 100644
--- a/ismrmrd.h
+++ b/ismrmrd.h
@@ -24,20 +24,18 @@ typedef unsigned __int32 uint32_t;
 typedef __int64 int64_t;
 typedef unsigned __int64 uint64_t;
 #else /* non MS C++ compiler */
-#include <cstdint>
+#include <stdint.h>
 #endif
 #include <complex>
 typedef std::complex<float> complex_float_t;
 typedef std::complex<double> complex_double_t;
 #include <vector>
-#include <cstring>
 #else /* C99 compiler */
 #include <stdint.h>
 #include <complex.h>
 #include <stdbool.h>
 typedef float complex complex_float_t;
 typedef double complex complex_double_t;
-#include <string.h>
 #endif /* __cplusplus */
 
 #pragma pack(push, 2) /* Use 2 byte alignment */
diff --git a/ismrmrd_dataset.cpp b/ismrmrd_dataset.cpp
index 4192abc..f641d25 100644
--- a/ismrmrd_dataset.cpp
+++ b/ismrmrd_dataset.cpp
@@ -1,6 +1,9 @@
 #include "ismrmrd_dataset.h"
 
-#include <stdlib.h>     // for `free` in GCC 4.3
+// for memcpy and free in older compilers
+#include <string.h>
+#include <stdlib.h>
+
 namespace ISMRMRD {
 //
 // Dataset class implementation

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ismrmrd.git