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, 4 insertions, 4 deletions

diff --git a/cpp/src/IceSSL/SslConnectionOpenSSL.cpp b/cpp/src/IceSSL/SslConnectionOpenSSL.cpp
index d7edd9b2dde..32de83aa15a 100644
--- a/cpp/src/IceSSL/SslConnectionOpenSSL.cpp
+++ b/cpp/src/IceSSL/SslConnectionOpenSSL.cpp
@@ -202,8 +202,8 @@ IceSSL::OpenSSL::Connection::shutdown(int timeout)
 
                 ProtocolException protocolEx(__FILE__, __LINE__);
 
-                protocolEx._message = "encountered a violation of the ssl protocol during shutdown\n";
-                protocolEx._message += sslGetErrors();
+                protocolEx.message = "encountered a violation of the ssl protocol during shutdown\n";
+                protocolEx.message += sslGetErrors();
 
                 throw protocolEx;
             }
@@ -671,8 +671,8 @@ IceSSL::OpenSSL::Connection::read(Buffer& buf, int timeout)
             {
                 ProtocolException protocolEx(__FILE__, __LINE__);
 
-                protocolEx._message = "encountered a violation of the ssl protocol\n";
-                protocolEx._message += sslGetErrors();
+                protocolEx.message = "encountered a violation of the ssl protocol\n";
+                protocolEx.message += sslGetErrors();
 
                 throw protocolEx;
             }