[ismrmrd] 63/177: Fixing more windows woes.

[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 34ae9d7fc3c8c14cd41352534dac23fbba55de84
Author: Dusan Puletic <dusan.puletic at nih.gov>
Date:   Thu Sep 18 18:55:55 2014 +0000

    Fixing more windows woes.
---
 include/ismrmrd/dataset.h |  2 +-
 include/ismrmrd/ismrmrd.h | 18 +++++++++---------
 libsrc/ismrmrd.cpp        | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/include/ismrmrd/dataset.h b/include/ismrmrd/dataset.h
index b917393..8e394a9 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
-EXPORTISMRMRD class Dataset {
+class EXPORTISMRMRD 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 96d5bdf..7f53cf9 100644
--- a/include/ismrmrd/ismrmrd.h
+++ b/include/ismrmrd/ismrmrd.h
@@ -355,13 +355,13 @@ char *ismrmrd_strerror(int err);
 /* Rotations and Quaternions */
 /*****************************/
 /* Calculates the determinant of the matrix and return the sign */
-int ismrmrd_sign_of_directions(float read_dir[3], float phase_dir[3], float slice_dir[3]);
+EXPORTISMRMRD int ismrmrd_sign_of_directions(float read_dir[3], float phase_dir[3], float slice_dir[3]);
 
 /* Creates a normalized quaternion from a 3x3 rotation matrix */
-void ismrmrd_directions_to_quaternion(float read_dir[3], float phase_dir[3], float slice_dir[3], float quat[4]);
+EXPORTISMRMRD void ismrmrd_directions_to_quaternion(float read_dir[3], float phase_dir[3], float slice_dir[3], float quat[4]);
 
 /* Converts a quaternion of the form | a b c d | to a 3x3 rotation matrix */
-void ismrmrd_quaternion_to_directions(float quat[4], float read_dir[3], float phase_dir[3], float slice_dir[3]);
+EXPORTISMRMRD void ismrmrd_quaternion_to_directions(float quat[4], float read_dir[3], float phase_dir[3], float slice_dir[3]);
 
 #pragma pack(pop) // Restore old alignment
 
@@ -376,7 +376,7 @@ void ismrmrd_quaternion_to_directions(float quat[4], float read_dir[3], float ph
 typedef  ISMRMRD_EncodingCounters EncodingCounters;
 
 // A convenience class for flags
-EXPORTISMRMRD class FlagBit
+class EXPORTISMRMRD FlagBit
 {
 public:
  FlagBit(unsigned short b)
@@ -396,7 +396,7 @@ public:
   
 };
 
-EXPORTISMRMRD class AcquisitionHeader: public ISMRMRD_AcquisitionHeader {
+class EXPORTISMRMRD AcquisitionHeader: public ISMRMRD_AcquisitionHeader {
 public:
     // Constructors
     AcquisitionHeader();
@@ -416,7 +416,7 @@ public:
 
 };
 
-EXPORTISMRMRD class Acquisition: protected ISMRMRD_Acquisition {
+class EXPORTISMRMRD Acquisition: protected ISMRMRD_Acquisition {
 public:
     // Constructors, assignment, destructor
     Acquisition();
@@ -474,7 +474,7 @@ public:
 
 };
 
-EXPORTISMRMRD class ImageHeader: public ISMRMRD_ImageHeader {
+class EXPORTISMRMRD ImageHeader: public ISMRMRD_ImageHeader {
 public:
     // Constructor
     ImageHeader();
@@ -487,7 +487,7 @@ public:
 
 };
 
-EXPORTISMRMRD class Image : protected ISMRMRD_Image {
+class EXPORTISMRMRD Image : protected ISMRMRD_Image {
 public:
     // Constructors
     Image();
@@ -541,7 +541,7 @@ public:
     void clearAllFlags();
 };
 
-EXPORTISMRMRD class NDArray: protected ISMRMRD_NDArray {
+class EXPORTISMRMRD NDArray: protected ISMRMRD_NDArray {
 public:
     // Constructors, destructor and copy
     NDArray();
diff --git a/libsrc/ismrmrd.cpp b/libsrc/ismrmrd.cpp
index 45ef16c..29485e3 100644
--- a/libsrc/ismrmrd.cpp
+++ b/libsrc/ismrmrd.cpp
@@ -11,24 +11,24 @@ namespace ISMRMRD {
 // Constructors
 AcquisitionHeader::AcquisitionHeader() {
     ismrmrd_init_acquisition_header(this);
-};
+}
 
 // Flag methods
 bool AcquisitionHeader::isFlagSet(const ISMRMRD_AcquisitionFlags val) {
     return ismrmrd_is_flag_set(flags, val);
-};
+}
 
 void AcquisitionHeader::setFlag(const ISMRMRD_AcquisitionFlags val) {
     ismrmrd_set_flag(&flags, val);
-};
+}
 
 void AcquisitionHeader::clearFlag(const ISMRMRD_AcquisitionFlags val) {
     ismrmrd_clear_flag(&flags, val);
-};
+}
 
 void AcquisitionHeader::clearAllFlags() {
     ismrmrd_clear_all_flags(&flags);
-};
+}
 
 // TODO: Channel mask methods go here
 

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