From a5bd24845a2720d57a66d81effc59423d723c87c Mon Sep 17 00:00:00 2001 From: Bernard Normier Date: Tue, 5 May 2015 19:23:45 -0400 Subject: ICE-6481 pragma comment when building static libraries On windows with VS, pragma comment is now defined when building only when ICE_BUILDING_ is not defined. ICE_BUILDING_ is defined automatically when _API_EXPORTS is defined. When building static Ice libraries on Windows, please define ICE_BUILDING_. ICE_DECLSPEC_EXPORT and ICE_DECLSPEC_IMPORT are now defined all the time on Windows, and we define the various _API macros to /**/ when ICE_STATIC_LIBS is defined. Replaced various direct use of ICE_DECLSPEC_EXPORT/ICE_DECLSPEC_IMPORT by the correct _API macro. --- cpp/src/Ice/ServantManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cpp/src/Ice/ServantManager.cpp') diff --git a/cpp/src/Ice/ServantManager.cpp b/cpp/src/Ice/ServantManager.cpp index e07e78dbbc9..99b1a862176 100644 --- a/cpp/src/Ice/ServantManager.cpp +++ b/cpp/src/Ice/ServantManager.cpp @@ -18,7 +18,7 @@ using namespace std; using namespace Ice; using namespace IceInternal; -ICE_DECLSPEC_EXPORT IceUtil::Shared* IceInternal::upCast(ServantManager* p) { return p; } +ICE_API IceUtil::Shared* IceInternal::upCast(ServantManager* p) { return p; } void IceInternal::ServantManager::addServant(const ObjectPtr& object, const Identity& ident, const string& facet) -- cgit v1.2.3