From c599f1b83462dccfe023884a7b4fd05fd11b85a0 Mon Sep 17 00:00:00 2001 From: khizmax Date: Sun, 22 Jan 2017 12:36:29 +0300 Subject: [PATCH] Fixed win32 dll-export --- cds/gc/dhp.h | 5 ++--- cds/gc/hp.h | 4 ++-- projects/Win/vc14/cds.sln | 8 ++++++++ src/dhp.cpp | 4 ++-- src/hp.cpp | 4 ++-- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/cds/gc/dhp.h b/cds/gc/dhp.h index 9f0387cd..2cf4645e 100644 --- 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 aedc47b0..33a2d05c 100644 --- 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 3266280a..c1761154 100644 --- 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}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stress-map-del3", "stress-map-del3.vcxproj", "{729E28BB-F36F-4462-8434-9C252C286525}" + ProjectSection(ProjectDependencies) = postProject + {A34CED07-A442-4FA1-81C4-F8B9CD3C832B} = {A34CED07-A442-4FA1-81C4-F8B9CD3C832B} + {408FE9BC-44F0-4E6A-89FA-D6F952584239} = {408FE9BC-44F0-4E6A-89FA-D6F952584239} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stress-set-del3", "stress-set-del3.vcxproj", "{E91A1938-BB89-4676-9C9F-69AA697CB488}" + ProjectSection(ProjectDependencies) = postProject + {A34CED07-A442-4FA1-81C4-F8B9CD3C832B} = {A34CED07-A442-4FA1-81C4-F8B9CD3C832B} + {408FE9BC-44F0-4E6A-89FA-D6F952584239} = {408FE9BC-44F0-4E6A-89FA-D6F952584239} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/dhp.cpp b/src/dhp.cpp index 6a0ec71a..462de952 100644 --- 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 50dd6053..6481a2cc 100644 --- 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; } -- 2.34.1