2 files changed, 18 insertions, 38 deletions
diff --git a/cpp/src/Ice/LocalObject.cpp b/cpp/src/Ice/LocalObject.cpp
index 56cce93813f..b4efdd39bb9 100644
--- a/cpp/src/Ice/LocalObject.cpp
+++ b/cpp/src/Ice/LocalObject.cpp
@@ -16,37 +16,3 @@ using namespace IceInternal;
 
 void IceInternal::incRef(LocalObject* p) { p->__incRef(); }
 void IceInternal::decRef(LocalObject* p) { p->__decRef(); }
-
-Ice::LocalObjectPtrE::LocalObjectPtrE(const LocalObjectPtrE& p) :
-    _ptr(p._ptr)
-{
-}
-
-Ice::LocalObjectPtrE::LocalObjectPtrE(const LocalObjectPtr& p) :
-    _ptr(p)
-{
-}
-
-Ice::LocalObjectPtrE::operator LocalObjectPtr() const
-{
-    return LocalObjectPtr(dynamic_cast<LocalObject*>(_ptr.get()));
-}
-
-::Ice::LocalObject*
-Ice::LocalObjectPtrE::operator->() const
-{
-    return _ptr.get();
-}
-
-Ice::LocalObjectPtrE::operator bool() const
-{
-    return _ptr.get() ? true : false;
-}
-
-Ice::LocalObject::LocalObject()
-{
-}
-
-Ice::LocalObject::~LocalObject()
-{
-}
diff --git a/cpp/src/Slice/Scanner.l b/cpp/src/Slice/Scanner.l
index 8238fad4af8..0754f1cbf2c 100644
--- a/cpp/src/Slice/Scanner.l
+++ b/cpp/src/Slice/Scanner.l
@@ -297,16 +297,30 @@ using namespace Slice;
     return ICE_OP_KEYWORD;
 }
 
-[[:alpha:]_][[:alnum:]_]* {
+\\?[[:alpha:]_][[:alnum:]_]* {
     StringTokPtr ident = new StringTok;
-    ident->v = yytext;
+    if (*yytext == '\\')
+    {
+	ident->v = yytext + 1;
+    }
+    else
+    {
+	ident->v = yytext;
+    }
     *yylvalp = ident;
     return ICE_IDENTIFIER;
 }
 
-[[:alpha:]_][[:alnum:]_]*[[:space:]]*"(" {
+\\?[[:alpha:]_][[:alnum:]_]*[[:space:]]*"(" {
     StringTokPtr ident = new StringTok;
-    ident->v = yytext;
+    if (*yytext == '\\')
+    {
+	ident->v = yytext + 1;
+    }
+    else
+    {
+	ident->v = yytext;
+    }
     ident->v.erase(ident->v.find_first_of(" \t\v\n\r\f("));
     *yylvalp = ident;
     return ICE_OP_IDENTIFIER;