Fixed win32 dll-export

diff --git a/cds/gc/dhp.h b/cds/gc/dhp.h
index 9f0387cdcf1df768de3a05a93539b5689a1658a9..2cf4645e87f39bf9d2e7f9da65c8ab0bbca6d39d 100644 (file)
--- a/cds/gc/dhp.h
+++ b/cds/gc/dhp.h
@@ -594,7 +594,7 @@ namespace cds { namespace gc {
             static CDS_EXPORT_API void detach_thread();
 
             /// Get internal statistics
-            void statistics( stat& st );
+            CDS_EXPORT_API void statistics( stat& st );
 
         public: // for internal use only
             /// The main garbage collecting function
@@ -1520,8 +1520,7 @@ namespace cds { namespace gc {
             }
             \endcode
         */
-        static stat const& postmortem_statistics();
-
+        CDS_EXPORT_API static stat const& postmortem_statistics();
     };
 
 }} // namespace cds::gc

diff --git a/cds/gc/hp.h b/cds/gc/hp.h
index aedc47b064bada56c3a78c0ec95627d734309319..33a2d05c46f26e10346e4a135640a971f99bfea8 100644 (file)
--- a/cds/gc/hp.h
+++ b/cds/gc/hp.h
@@ -526,7 +526,7 @@ namespace cds { namespace gc {
             static CDS_EXPORT_API void detach_thread();
 
             /// Get internal statistics
-            void statistics( stat& st );
+            CDS_EXPORT_API void statistics( stat& st );
 
         public: // for internal use only
             /// The main garbage collecting function
@@ -1519,7 +1519,7 @@ namespace cds { namespace gc {
             }
             \endcode
         */
-        static stat const& postmortem_statistics();
+        CDS_EXPORT_API static stat const& postmortem_statistics();
     };
 
 }} // namespace cds::gc

diff --git a/projects/Win/vc14/cds.sln b/projects/Win/vc14/cds.sln
index 3266280a827cebfad795460ea874a524c4cf3133..c17611542f1df42aaebcbdb0d8961960f9a47e78 100644 (file)
--- a/projects/Win/vc14/cds.sln
+++ b/projects/Win/vc14/cds.sln
@@ -395,8 +395,16 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tree", "tree", "{31977D29-25C2-4FEC-9176-15247A15A9B4}"\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stress-map-del3", "stress-map-del3.vcxproj", "{729E28BB-F36F-4462-8434-9C252C286525}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A34CED07-A442-4FA1-81C4-F8B9CD3C832B} = {A34CED07-A442-4FA1-81C4-F8B9CD3C832B}\r
+               {408FE9BC-44F0-4E6A-89FA-D6F952584239} = {408FE9BC-44F0-4E6A-89FA-D6F952584239}\r
+       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stress-set-del3", "stress-set-del3.vcxproj", "{E91A1938-BB89-4676-9C9F-69AA697CB488}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A34CED07-A442-4FA1-81C4-F8B9CD3C832B} = {A34CED07-A442-4FA1-81C4-F8B9CD3C832B}\r
+               {408FE9BC-44F0-4E6A-89FA-D6F952584239} = {408FE9BC-44F0-4E6A-89FA-D6F952584239}\r
+       EndProjectSection\r
 EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r

diff --git a/src/dhp.cpp b/src/dhp.cpp
index 6a0ec71acece32ed35182737592052c48698576d..462de952549eeb029938fd910ed63ced9e2b9c2b 100644 (file)
--- a/src/dhp.cpp
+++ b/src/dhp.cpp
@@ -501,7 +501,7 @@ namespace cds { namespace gc { namespace dhp {
         scan( pThis );
     }
 
-    void smr::statistics( stat& st )
+    CDS_EXPORT_API void smr::statistics( stat& st )
     {
         st.clear();
 #   ifdef CDS_ENABLE_HPSTAT
@@ -526,7 +526,7 @@ namespace cds { namespace gc { namespace dhp {
 
 }}} // namespace cds::gc::dhp
 
-/*static*/ cds::gc::DHP::stat const& cds::gc::DHP::postmortem_statistics()
+CDS_EXPORT_API /*static*/ cds::gc::DHP::stat const& cds::gc::DHP::postmortem_statistics()
 {
     return cds::gc::dhp::s_postmortem_stat;
 }

diff --git a/src/hp.cpp b/src/hp.cpp
index 50dd605321745efd68c7f26429f68bc5a167ca54..6481a2cc5d8ad99e046386518eec3e1642885a6f 100644 (file)
--- a/src/hp.cpp
+++ b/src/hp.cpp
@@ -486,7 +486,7 @@ namespace cds { namespace gc { namespace hp {
         }
     }
 
-    void smr::statistics( stat& st )
+    CDS_EXPORT_API void smr::statistics( stat& st )
     {
         st.clear();
 #   ifdef CDS_ENABLE_HPSTAT
@@ -505,7 +505,7 @@ namespace cds { namespace gc { namespace hp {
 
 }}} // namespace cds::gc::hp
 
-/*static*/ cds::gc::HP::stat const& cds::gc::HP::postmortem_statistics()
+CDS_EXPORT_API /*static*/ cds::gc::HP::stat const& cds::gc::HP::postmortem_statistics()
 {
     return cds::gc::hp::s_postmortem_stat;
 }