[ismrmrd] 60/177: More header fixes for windows

[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 fde2511ee221ad5eab3a8ae629eed6a88720f8b5
Author: Souheil Inati <souheil.inati at nih.gov>
Date:   Thu Sep 18 12:42:21 2014 -0400

    More header fixes for windows
---
 include/ismrmrd/dataset.h |  2 +-
 include/ismrmrd/ismrmrd.h | 26 ++++++++++++++------------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/include/ismrmrd/dataset.h b/include/ismrmrd/dataset.h
index 07bf2ac..b917393 100644
--- a/include/ismrmrd/dataset.h
+++ b/include/ismrmrd/dataset.h
@@ -154,7 +154,7 @@ uint32_t ismrmrd_get_number_of_arrays(const ISMRMRD_Dataset *dset, const char *v
 
 // TODO:
 // - exports as needed
-class Dataset {
+EXPORTISMRMRD class Dataset {
 public:
     // Constructor and destructor
     Dataset(const char* filename, const char* groupname, bool create_file_if_needed = true);
diff --git a/include/ismrmrd/ismrmrd.h b/include/ismrmrd/ismrmrd.h
index 5aa577a..0d845ef 100644
--- a/include/ismrmrd/ismrmrd.h
+++ b/include/ismrmrd/ismrmrd.h
@@ -24,7 +24,7 @@ typedef __int64 int64_t;
 typedef unsigned __int64 uint64_t;
 #else /* non MS C or C++ compiler */
 #include <stdint.h>
-#endif
+#endif /* _MSC_VER */
 
 /* Complex numbers */
 #ifdef __cplusplus
@@ -45,6 +45,7 @@ typedef struct complex_double_t{
 #include <complex.h>
 typedef float complex complex_float_t;
 typedef double complex complex_double_t;
+#endif /* _MSC_VER */
 #endif /* __cplusplus */
 
 /* Booleans - part of C++ */
@@ -55,12 +56,16 @@ typedef int bool;
 #define true 1
 #else /* C99 compiler */
 #include <stdbool.h>
-#endif
+#endif /* _MSC_VER */
+#endif /* __cplusplus */
 
 /* Vectors */
 #ifdef __cplusplus
 #include <vector>
-#endif
+#endif /* __cplusplus */
+
+/* Exports needed for MS C++ */
+#include "ismrmrd/export.h"
 
 #pragma pack(push, 2) /* Use 2 byte alignment */
 
@@ -367,14 +372,11 @@ void ismrmrd_quaternion_to_directions(float quat[4], float read_dir[3], float ph
 //  ISMRMRD C++ Interface
 //
 
-// TODO:
-// - exports for all the classes
-
 // Some typedefs to beautify the namespace
 typedef  ISMRMRD_EncodingCounters EncodingCounters;
 
 // A convenience class for flags
-class FlagBit
+EXPORTISMRMRD class FlagBit
 {
 public:
  FlagBit(unsigned short b)
@@ -394,7 +396,7 @@ public:
   
 };
 
-class AcquisitionHeader: public ISMRMRD_AcquisitionHeader {
+EXPORTISMRMRD class AcquisitionHeader: public ISMRMRD_AcquisitionHeader {
 public:
     // Constructors
     AcquisitionHeader();
@@ -414,7 +416,7 @@ public:
 
 };
 
-class Acquisition: protected ISMRMRD_Acquisition {
+EXPORTISMRMRD class Acquisition: protected ISMRMRD_Acquisition {
 public:
     // Constructors, assignment, destructor
     Acquisition();
@@ -472,7 +474,7 @@ public:
 
 };
 
-class ImageHeader: public ISMRMRD_ImageHeader {
+EXPORTISMRMRD class ImageHeader: public ISMRMRD_ImageHeader {
 public:
     // Constructor
     ImageHeader();
@@ -485,7 +487,7 @@ public:
 
 };
 
-class Image : protected ISMRMRD_Image {
+EXPORTISMRMRD class Image : protected ISMRMRD_Image {
 public:
     // Constructors
     Image();
@@ -539,7 +541,7 @@ public:
     void clearAllFlags();
 };
 
-class NDArray: protected ISMRMRD_NDArray {
+EXPORTISMRMRD class NDArray: protected ISMRMRD_NDArray {
 public:
     // Constructors, destructor and copy
     NDArray();

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