diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-05-12 10:21:51 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-05-12 10:21:51 -0400 |
| commit | 6ea27c2fc2478cea6a42bad30e746f7ebf9c69af (patch) | |
| tree | a52106addf73a73fbeb5e33c26ff9f8908b62a24 /cpp/src/IceUtil | |
| parent | UWP test suite fixes (diff) | |
| download | ice-6ea27c2fc2478cea6a42bad30e746f7ebf9c69af.tar.bz2 ice-6ea27c2fc2478cea6a42bad30e746f7ebf9c69af.tar.xz ice-6ea27c2fc2478cea6a42bad30e746f7ebf9c69af.zip | |
Renamed ICE_UTIL_API to ICE_API and other cleanups
Diffstat (limited to 'cpp/src/IceUtil')
| -rw-r--r-- | cpp/src/IceUtil/ArgVector.h | 2 | ||||
| -rw-r--r-- | cpp/src/IceUtil/Makefile.mk | 8 | ||||
| -rw-r--r-- | cpp/src/IceUtil/Unicode.h | 6 | ||||
| -rw-r--r-- | cpp/src/IceUtil/UtilException.cpp | 4 |
4 files changed, 7 insertions, 13 deletions
diff --git a/cpp/src/IceUtil/ArgVector.h b/cpp/src/IceUtil/ArgVector.h index fa8fe1592fa..634dec94e63 100644 --- a/cpp/src/IceUtil/ArgVector.h +++ b/cpp/src/IceUtil/ArgVector.h @@ -17,7 +17,7 @@ namespace IceUtilInternal { -class ICE_UTIL_API ArgVector +class ICE_API ArgVector { public: diff --git a/cpp/src/IceUtil/Makefile.mk b/cpp/src/IceUtil/Makefile.mk index a8b13e209cd..9a7c3d97079 100644 --- a/cpp/src/IceUtil/Makefile.mk +++ b/cpp/src/IceUtil/Makefile.mk @@ -9,17 +9,11 @@ $(project)_libraries = IceUtil -IceUtil_targetdir := $(libdir) -IceUtil_cppflags := -DICE_UTIL_API_EXPORTS -IceUtil_system_libs := $(ICEUTIL_OS_LIBS) +IceUtil_targetdir := $(libdir) # Always enable the static configuration for the IceUtil library IceUtil_always_enable_configs := static -ifeq ($(DEFAULT_MUTEX_PROTOCOL), PrioInherit) - IceUtil_cppflags += -DICE_PRIO_INHERIT -endif - ifeq ($(libbacktrace),yes) IceUtil_cppflags += -DICE_LIBBACKTRACE endif diff --git a/cpp/src/IceUtil/Unicode.h b/cpp/src/IceUtil/Unicode.h index d5c3b235ddb..c061ec51da0 100644 --- a/cpp/src/IceUtil/Unicode.h +++ b/cpp/src/IceUtil/Unicode.h @@ -45,15 +45,15 @@ convertUTF8ToUTFWstring(const IceUtil::Byte*& sourceStart, const IceUtil::Byte* std::wstring& target, IceUtil::ConversionFlags flags); -ICE_UTIL_API ConversionResult +ICE_API ConversionResult convertUTF8ToUTF16(const std::vector<unsigned char>&, std::vector<unsigned short>&, IceUtil::ConversionFlags); -ICE_UTIL_API ConversionResult +ICE_API ConversionResult convertUTF8ToUTF32(const std::vector<unsigned char>&, std::vector<unsigned int>&, IceUtil::ConversionFlags); -ICE_UTIL_API ConversionResult +ICE_API ConversionResult convertUTF32ToUTF8(const std::vector<unsigned int>&, std::vector<unsigned char>&, IceUtil::ConversionFlags); diff --git a/cpp/src/IceUtil/UtilException.cpp b/cpp/src/IceUtil/UtilException.cpp index b0c25c75324..450174ec274 100644 --- a/cpp/src/IceUtil/UtilException.cpp +++ b/cpp/src/IceUtil/UtilException.cpp @@ -74,8 +74,8 @@ using namespace std; namespace IceUtilInternal { -bool ICE_UTIL_API printStackTraces = false; -bool ICE_UTIL_API nullHandleAbort = false; +bool ICE_API printStackTraces = false; +bool ICE_API nullHandleAbort = false; StackTraceImpl stackTraceImpl() |