Changed Slice parser to disallow leading underscore for identifiers.

    Changed Slice parser to reject identifiers beginning with "Ice", unless
    the --ice option is used. Changed Slice parser to disallow identifiers
    that have a trailing "Operations", "Holder", "Helper", "Prx", or "Ptr",
    to avoid clashes with language mappings. Fixed tests and remaining code
    base to work correctly with the changed rules.

1 files changed, 8 insertions, 8 deletions

diff --git a/cpp/src/IcePack/AdapterManagerI.cpp b/cpp/src/IcePack/AdapterManagerI.cpp
index f5bfc92a7f4..13c0bf73e26 100644
--- a/cpp/src/IcePack/AdapterManagerI.cpp
+++ b/cpp/src/IcePack/AdapterManagerI.cpp
@@ -87,7 +87,7 @@ IcePack::AdapterI::~AdapterI()
 AdapterDescription
 IcePack::AdapterI::getAdapterDescription(const Current&)
 {
-    return _description;
+    return description;
 }
 
 ObjectPrx
@@ -95,16 +95,16 @@ IcePack::AdapterI::getDirectProxy(bool activate, const Current&)
 {
     ::IceUtil::Monitor< ::IceUtil::Mutex>::Lock sync(*this);
 
-    if(!activate || !_description.server || _active)
+    if(!activate || !description.server || _active)
     {
-	return _proxy;
+	return proxy;
     }
 
     //
     // If there's a server associated to this adapter, try to start
     // the server and wait for the adapter state to change.
     //
-    if(_description.server && _description.server->start())
+    if(description.server && description.server->start())
     {
 	//
 	// Wait for this adapter to be marked as active or the
@@ -120,14 +120,14 @@ IcePack::AdapterI::getDirectProxy(bool activate, const Current&)
 	}
     }
     
-    return _proxy;
+    return proxy;
 }
 
 void
 IcePack::AdapterI::setDirectProxy(const ObjectPrx& proxy, const Current&)
 {
     ::IceUtil::Monitor< ::IceUtil::Mutex>::Lock sync(*this);
-    _proxy = proxy;
+    this->proxy = proxy;
 }
 
 void
@@ -194,8 +194,8 @@ IcePack::AdapterManagerI::create(const AdapterDescription& description, const Cu
     }
     
     AdapterPtr adapterI = new AdapterI(_waitTime);
-    adapterI->_description = description;
-    adapterI->_proxy = 0;
+    adapterI->description = description;
+    adapterI->proxy = 0;
 
     //
     // Add this adapter name to our adapter names internal set.