summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2014-07-23 16:49:37 -0700
committerMark Spruiell <mes@zeroc.com>2014-07-23 16:49:37 -0700
commit771644c88e34713961ae998ddac507553af5cddb (patch)
tree95f404c423571069b9f790e0f7e70b681677c777 /cpp
parentMerge branch 'master' of ssh://git.zeroc.com/home/git/ice (diff)
downloadice-771644c88e34713961ae998ddac507553af5cddb.tar.bz2
ice-771644c88e34713961ae998ddac507553af5cddb.tar.xz
ice-771644c88e34713961ae998ddac507553af5cddb.zip
ICE-5515 - proxy support for ice_staticId
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/slice2php/Main.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/cpp/src/slice2php/Main.cpp b/cpp/src/slice2php/Main.cpp
index 5cd4afc6a5c..5e6a98becad 100644
--- a/cpp/src/slice2php/Main.cpp
+++ b/cpp/src/slice2php/Main.cpp
@@ -186,7 +186,14 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
_out << sp << nl << "if(!interface_exists('" << escapeName(abs) << "'))";
_out << sb;
_out << nl << "interface " << name;
- if(!bases.empty())
+ if(bases.empty())
+ {
+ if(!p->isLocal())
+ {
+ _out << " extends " << scopedToName("::Ice::Object", _ns);
+ }
+ }
+ else
{
_out << " extends ";
for(ClassList::const_iterator q = bases.begin(); q != bases.end(); ++q)
@@ -213,6 +220,7 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
}
_out << ");";
}
+
_out << eb;
}
else