From 2029ff368e49fae489b8ec8fc12f7d126b182dfb Mon Sep 17 00:00:00 2001
From: Jose <jose@zeroc.com>
Date: Tue, 1 Dec 2015 17:36:19 +0100
Subject: C++11 mapping initial commit

---
 cpp/src/Ice/EventHandler.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'cpp/src/Ice/EventHandler.cpp')

diff --git a/cpp/src/Ice/EventHandler.cpp b/cpp/src/Ice/EventHandler.cpp
index 6edea2d9307..ffa7f218c92 100644
--- a/cpp/src/Ice/EventHandler.cpp
+++ b/cpp/src/Ice/EventHandler.cpp
@@ -14,7 +14,9 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(EventHandler* p) { return p; }
+#endif
 
 IceInternal::EventHandler::EventHandler() :
 #if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
-- 
cgit v1.2.3