BUG 1907 Eduardo DAVILA, BRUKER_EXPORT in .h conflict

BUG  1906 Eduardo DAVILA         	Boot dependencies not needed

diff --git a/appli/testBruker2Dicom/CMakeLists.txt b/appli/testBruker2Dicom/CMakeLists.txt
index d2cc69f..2f0083c 100755 (executable)
--- a/appli/testBruker2Dicom/CMakeLists.txt
+++ b/appli/testBruker2Dicom/CMakeLists.txt
@@ -47,7 +47,7 @@ SET ( ${EXE_NAME}_LINK_LIBRARIES
   #    ${VTK_LIBRARIES}
   #    ${ITK_LIBRARIES}
       ${GDCM_LIBRARIES}
-      ${BOOST_LIBRARIES}
+  #EED13jan2013    ${BOOST_LIBRARIES}
       
   # Add here those agmonst the various (?) PROJECT LIBRARIES you need
   # for the current executable      

diff --git a/lib/src1/CMakeLists.txt b/lib/src1/CMakeLists.txt
index 5fe19ff..a0fb5b4 100644 (file)
--- a/lib/src1/CMakeLists.txt
+++ b/lib/src1/CMakeLists.txt
@@ -83,7 +83,7 @@ endif()
     #    ${VTK_LIBRARIES}
     #    ${ITK_LIBRARIES}
       ${GDCM_LIBRARIES}
-      ${BOOST_LIBRARIES}
+ #EED31jan2013     ${BOOST_LIBRARIES}
     )
   #----------------------------------------------------------------------------
 

diff --git a/lib/src1/bruker2dicom.h b/lib/src1/bruker2dicom.h
index 2fd2c3b..2260572 100644 (file)
--- a/lib/src1/bruker2dicom.h
+++ b/lib/src1/bruker2dicom.h
@@ -46,7 +46,7 @@
 
 
 
-class creaBruker_EXPORT Bruker2Dicom {
+class /*creaBruker_EXPORT*/ Bruker2Dicom {
 
 public:
  /*! \brief Constructor

diff --git a/lib/src1/bruker2dicom2.h b/lib/src1/bruker2dicom2.h
index 8ae972c..483d408 100644 (file)
--- a/lib/src1/bruker2dicom2.h
+++ b/lib/src1/bruker2dicom2.h
@@ -69,7 +69,8 @@
 #endif
 
 //class __declspec( dllexport ) Bruker2Dicom {
-class creaBruker_EXPORT  Bruker2Dicom {
+class /*creaBruker_EXPORT*/  Bruker2Dicom 
+{
 
 public:
  /*! \brief Constructor

diff --git a/lib/src1/brukerFieldData.h b/lib/src1/brukerFieldData.h
index 6a2ac64..74d358d 100644 (file)
--- a/lib/src1/brukerFieldData.h
+++ b/lib/src1/brukerFieldData.h
@@ -36,7 +36,8 @@
 \class  BrukerFieldData
     \brief This class is an atom to generate a BrukerDataSet
    */
-class creaBruker_EXPORT BrukerFieldData {
+class /*creaBruker_EXPORT*/ BrukerFieldData 
+{
 friend class BrukerDataSet;
 public:
  /*! \brief Constructor

diff --git a/lib/src1/brukerdataset.h b/lib/src1/brukerdataset.h
index aeb75e4..980fb81 100644 (file)
--- a/lib/src1/brukerdataset.h
+++ b/lib/src1/brukerdataset.h
@@ -71,7 +71,8 @@
 \brief This class purpose is to extract information from a bruker experiment and setup the extracted information for an easy use
 */
 
-class creaBruker_EXPORT BrukerDataSet{
+class /*creaBruker_EXPORT*/ BrukerDataSet
+{
 friend class BrukerKspaceObject;
     typedef std::map<std::string, BrukerFieldData> BrukMapType;
     //typedef BrukMapType::iterator iterator;

diff --git a/lib/src1/brukerexception.h b/lib/src1/brukerexception.h
index 7034360..f9a1eef 100644 (file)
--- a/lib/src1/brukerexception.h
+++ b/lib/src1/brukerexception.h
@@ -33,7 +33,7 @@
 #include <string>
 
 
-class creaBruker_EXPORT BrukerSizeException: public std::exception
+class /*creaBruker_EXPORT*/ BrukerSizeException: public std::exception
 {
 public:
     BrukerSizeException( const std::string& message,

diff --git a/lib/src1/brukerimage.h b/lib/src1/brukerimage.h
index f3398e7..bfce9cf 100644 (file)
--- a/lib/src1/brukerimage.h
+++ b/lib/src1/brukerimage.h
@@ -47,7 +47,8 @@ This class centralizes the informations "needed" to exploit a bruker image file
        @author Denis Grenier
        @file brukerimage.h
 */
-class creaBruker_EXPORT BrukerImage{
+class /*creaBruker_EXPORT*/ BrukerImage
+{
 public:
    BrukerImage(BrukerDataSet &TheOrigAcqp, BrukerDataSet &TheOrigReco);
    ~BrukerImage();

diff --git a/lib/src1/brukerimageset.h b/lib/src1/brukerimageset.h
index 9ae807e..3a420cd 100644 (file)
--- a/lib/src1/brukerimageset.h
+++ b/lib/src1/brukerimageset.h
@@ -36,7 +36,8 @@
 typedef bool (*BOOL_FUNCTION_PFILE_PFILE_POINTER)(File *, File *);
 typedef std::map<std::string, BrukerImageSet> CoherentBrukerImageSetMap;
    
-class BRUKER_EXPORT BrukerImageSet : public std::vector<BrukerImage> {
+//class creaBruker_EXPORT BrukerImageSet : public std::vector<BrukerImage> {
+class  BrukerImageSet : public std::vector<BrukerImage> {
 public:
    BrukerImageSet();
    ~BrukerImageSet();

diff --git a/lib/src1/brukerkspaceobject.h b/lib/src1/brukerkspaceobject.h
index a55161f..5370a2a 100644 (file)
--- a/lib/src1/brukerkspaceobject.h
+++ b/lib/src1/brukerkspaceobject.h
@@ -43,7 +43,7 @@
 #include "brukerdataset.h"
 
 
-class creaBruker_EXPORT BrukerKspaceObject{
+class /*creaBruker_EXPORT*/ BrukerKspaceObject{
 public:
    BrukerKspaceObject(BrukerDataSet DataSet);
    ~BrukerKspaceObject();

diff --git a/lib/src1/brukerobjectvaryingproperties.h b/lib/src1/brukerobjectvaryingproperties.h
index f698b1d..0573808 100644 (file)
--- a/lib/src1/brukerobjectvaryingproperties.h
+++ b/lib/src1/brukerobjectvaryingproperties.h
@@ -53,7 +53,7 @@
 /**
        @author denis grenier <denis.grenier@creatis.univ-lyon1.fr>
 */
-class  creaBruker_EXPORT BrukerObjectVaryingProperties{
+class  /*creaBruker_EXPORT*/ BrukerObjectVaryingProperties{
 public:        
    BrukerObjectVaryingProperties();
    ~BrukerObjectVaryingProperties();