diff options
author | Matthew Newhook <matthew@zeroc.com> | 2008-04-28 15:53:26 +0800 |
---|---|---|
committer | Matthew Newhook <matthew@zeroc.com> | 2008-04-28 15:53:26 +0800 |
commit | d638e8887f77d79802443504c4c56b26f189c9f8 (patch) | |
tree | 451bccd0caa977b4f35ac1ed89345ee2d1a8a898 /cpp/src/Ice/EventHandler.cpp | |
parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
download | ice-d638e8887f77d79802443504c4c56b26f189c9f8.tar.bz2 ice-d638e8887f77d79802443504c4c56b26f189c9f8.tar.xz ice-d638e8887f77d79802443504c4c56b26f189c9f8.zip |
- Reverted prior bug3025 fix.
- Translator, if dll-export is used, emits code to automatically export symbols.
- Removed the two steps builds from various Makefiles.
- Removed any use of _API from .cpp source files. Now ICE_DECLSPEC_EXPORT is directly used.
- Fixed bug with IceGrid test.
Squashed commit of the following:
commit 5bf039b18ac45bb781b8c8718e03d6055bb5138d
Author: U-MARCH4\matthew <matthew@march4.(none)>
Date: Sun Apr 27 22:43:27 2008 -0700
Removed another translator case where _API was used in .cpp files.
commit 6fc3b01b340ce81299c2896fd624faacea456bdc
Author: Matthew Newhook <matthew@zeroc.com>
Date: Mon Apr 28 12:19:03 2008 +0800
Update UNIX Makefiles.
commit 5847f6cf40624a7c9144f046feb3b8eff7002443
Author: U-MARCH4\matthew <matthew@march4.(none)>
Date: Sun Apr 27 20:59:27 2008 -0700
Another fix to windows Makefile.
commit d32b7f82e297c06161fb9f571e964f7178acbbe0
Author: U-MARCH4\matthew <matthew@march4.(none)>
Date: Sun Apr 27 20:14:46 2008 -0700
Translator changes. Windows Makefile cleanup.
commit cd8c8fa282165a5ce5dbf3976e2e420069a1ef02
Author: U-MARCH4\matthew <matthew@march4.(none)>
Date: Sun Apr 27 17:01:32 2008 -0700
Revert "http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=3025 - Bogus IceStorm Makefile"
This reverts commit 187ae9e788cc97969f81b38f2e292e75fbe178f8.
Diffstat (limited to 'cpp/src/Ice/EventHandler.cpp')
-rw-r--r-- | cpp/src/Ice/EventHandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/EventHandler.cpp b/cpp/src/Ice/EventHandler.cpp index 3f91732ac6e..b7cd7a34237 100644 --- a/cpp/src/Ice/EventHandler.cpp +++ b/cpp/src/Ice/EventHandler.cpp @@ -15,7 +15,7 @@ using namespace Ice; using namespace IceInternal; IceUtil::Shared* IceInternal::upCast(EventHandler* p) { return p; } -ICE_API IceUtil::Shared* IceInternal::upCast(ThreadPoolWorkItem* p) { return p; } +ICE_DECLSPEC_EXPORT IceUtil::Shared* IceInternal::upCast(ThreadPoolWorkItem* p) { return p; } InstancePtr IceInternal::EventHandler::instance() const |