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 d2cc69fd4b27eb877a937b62d06c48ae03a5526a..2f0083c68a053c12d70e0fe924069dc9a125a4ab 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 5fe19ffbced6d5ba4a869141b8c3fb5b179d3d4c..a0fb5b4cc42db17502903680673758b3e8826c5f 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 2fd2c3b4786b2d2e1ddf1e97af47fa5fc9f230fe..2260572585923b96c5a4106c914e9097ee6782ef 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 8ae972c8e9decd7e6c86dcb3ff0772e1fb2f0df5..483d408964fdb0937e4722227b492ce6b6890301 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 6a2ac6441fb4de8c0f7cd470bf45897e8c5f35ce..74d358dff4b1370da8119f867fc2b4f598a43971 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 aeb75e4fc6bcaaa1c09c5d26c0be471e94737cf9..980fb81cd6fce3084a0291817120d88323d3aa17 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 7034360ba49b82302c31ffe70b6da9b130728a97..f9a1eef9f0a46601542a4d5174924480d5c85dee 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 f3398e77a66cb2a1dd062ea66e1299e132fa4bf6..bfce9cf0ac845d319df94cea72544008c52cd39c 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 9ae807ee662d03fc664509e24571b954134fa05a..3a420cd1555f93bbacc2b4047376048947ca0367 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 a55161f7f8e75175b896df503cae296e9b094fa8..5370a2ac140c850f9223deba24182be996f95cda 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 f698b1d35666c96fa987fe106f0ab6c9149cdb54..05738080ce77729fadae5c4a2e0f5c1755d7913b 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();