diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-06-26 12:52:02 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-06-26 12:52:02 -0400 |
| commit | 150892379e730f2a441906b0959dbbbbc180dd55 (patch) | |
| tree | d8dfe88b8da8a3ce5075398d81f87b3ad12e88f0 /cpp/src/slice2java/Gen.cpp | |
| parent | slice2xxx updates + Java Freeze updates and demo (diff) | |
| parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
| download | ice-150892379e730f2a441906b0959dbbbbc180dd55.tar.bz2 ice-150892379e730f2a441906b0959dbbbbc180dd55.tar.xz ice-150892379e730f2a441906b0959dbbbbc180dd55.zip | |
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Diffstat (limited to 'cpp/src/slice2java/Gen.cpp')
| -rw-r--r-- | cpp/src/slice2java/Gen.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index c41701a79e5..016ec040ac8 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -2604,7 +2604,20 @@ Slice::Gen::TypesVisitor::visitDataMember(const DataMemberPtr& p) out << nl << " * @deprecated " << deprecateReason; out << nl << " **/"; } - out << nl << "public " << s << ' ' << name << ';'; + + // + // Access visibility for class data members can be controlled by metadata. + // If none is specified, the default is public. + // + if(contained->containedType() == Contained::ContainedTypeClass && + (p->hasMetaData("protected") || contained->hasMetaData("protected"))) + { + out << nl << "protected " << s << ' ' << name << ';'; + } + else + { + out << nl << "public " << s << ' ' << name << ';'; + } // // Getter/Setter. |