summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/AsyncResult.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2015-12-28 19:42:21 +0100
committerJose <jose@zeroc.com>2015-12-28 19:42:21 +0100
commit6e006573d5fb7bff5ec602c616b68a523d32b18d (patch)
tree6bf9bb78232b7eedaa0fa7410d0cf268d078f68d /cpp/src/Ice/AsyncResult.cpp
parentDon't run tests with bluetooth on non-Linux platforms (diff)
downloadice-6e006573d5fb7bff5ec602c616b68a523d32b18d.tar.bz2
ice-6e006573d5fb7bff5ec602c616b68a523d32b18d.tar.xz
ice-6e006573d5fb7bff5ec602c616b68a523d32b18d.zip
Remove C++11 extensions to C++98 mapping
Diffstat (limited to 'cpp/src/Ice/AsyncResult.cpp')
-rw-r--r--cpp/src/Ice/AsyncResult.cpp57
1 files changed, 0 insertions, 57 deletions
diff --git a/cpp/src/Ice/AsyncResult.cpp b/cpp/src/Ice/AsyncResult.cpp
index 69ba7d0b5ab..8eb8c862f1f 100644
--- a/cpp/src/Ice/AsyncResult.cpp
+++ b/cpp/src/Ice/AsyncResult.cpp
@@ -556,63 +556,6 @@ public:
//
CallbackBasePtr IceInternal::__dummyCallback = ICE_MAKE_SHARED(DummyCallback);
-#ifndef ICE_CPP11_MAPPING
-# ifdef ICE_CPP11_COMPILER
-
-Ice::CallbackPtr
-Ice::newCallback(const ::IceInternal::Function<void (const AsyncResultPtr&)>& completed,
- const ::IceInternal::Function<void (const AsyncResultPtr&)>& sent)
-{
- class Cpp11CB : public GenericCallbackBase
- {
- public:
-
- Cpp11CB(const ::std::function<void (const AsyncResultPtr&)>& completed,
- const ::std::function<void (const AsyncResultPtr&)>& sent) :
- _completed(completed),
- _sent(sent)
- {
- checkCallback(true, completed != nullptr);
- }
-
- virtual void
- completed(const AsyncResultPtr& result) const
- {
- _completed(result);
- }
-
- virtual CallbackBasePtr
- verify(const LocalObjectPtr&)
- {
- return this; // Nothing to do, the cookie is not type-safe.
- }
-
- virtual void
- sent(const AsyncResultPtr& result) const
- {
- if(_sent != nullptr)
- {
- _sent(result);
- }
- }
-
- virtual bool
- hasSentCallback() const
- {
- return _sent != nullptr;
- }
-
- private:
-
- ::std::function< void (const AsyncResultPtr&)> _completed;
- ::std::function< void (const AsyncResultPtr&)> _sent;
- };
-
- return new Cpp11CB(completed, sent);
-}
-# endif
-#endif
-
void
IceInternal::CallbackBase::checkCallback(bool obj, bool cb)
{