Improve GCC7 changes.

    * ACE/protocols/ace/INet/SSLSock_IOStream.cpp:
    * ACE/protocols/ace/INet/SSLSock_IOStream.h:
    * ACE/protocols/ace/INet/Sock_IOStream.cpp:
    * ACE/protocols/ace/INet/Sock_IOStream.h:

4 files changed, 18 insertions, 9 deletions

diff --git a/ACE/protocols/ace/INet/SSLSock_IOStream.cpp b/ACE/protocols/ace/INet/SSLSock_IOStream.cpp
index 0d929ea8de4..5651f4802f5 100644
--- a/ACE/protocols/ace/INet/SSLSock_IOStream.cpp
+++ b/ACE/protocols/ace/INet/SSLSock_IOStream.cpp
@@ -81,7 +81,7 @@ namespace ACE
     void SSLSock_OStreamBase<ACE_SYNCH_USE>::set_interceptor (
           typename buffer_type::interceptor_type& interceptor)
       {
-        this->ios_base::rdbuf ()->set_interceptor (interceptor);
+        this->rdbuf ()->set_interceptor (interceptor);
       }
 
     template <ACE_SYNCH_DECL>
@@ -99,7 +99,7 @@ namespace ACE
     void SSLSock_IStreamBase<ACE_SYNCH_USE>::set_interceptor (
           typename buffer_type::interceptor_type& interceptor)
       {
-        this->ios_base::rdbuf ()->set_interceptor (interceptor);
+        this->rdbuf ()->set_interceptor (interceptor);
       }
 
     template <ACE_SYNCH_DECL>
@@ -117,7 +117,7 @@ namespace ACE
     void SSLSock_IOStreamBase<ACE_SYNCH_USE>::set_interceptor (
           typename buffer_type::interceptor_type& interceptor)
       {
-        this->ios_base::rdbuf ()->set_interceptor (interceptor);
+        this->rdbuf ()->set_interceptor (interceptor);
       }
 
   }
diff --git a/ACE/protocols/ace/INet/SSLSock_IOStream.h b/ACE/protocols/ace/INet/SSLSock_IOStream.h
index fc43fa0c89f..cec9f4f6ba9 100644
--- a/ACE/protocols/ace/INet/SSLSock_IOStream.h
+++ b/ACE/protocols/ace/INet/SSLSock_IOStream.h
@@ -95,6 +95,9 @@ namespace ACE
 
               explicit SSLSock_OStreamBase(stream_type* stream);
 
+              buffer_type* rdbuf ()
+              { return ios_base::rdbuf (); }
+
               ~SSLSock_OStreamBase();
 
               void set_interceptor (typename buffer_type::interceptor_type& interceptor);
@@ -117,6 +120,9 @@ namespace ACE
 
               explicit SSLSock_IStreamBase(stream_type* stream);
 
+              buffer_type* rdbuf ()
+              { return ios_base::rdbuf (); }
+
               ~SSLSock_IStreamBase();
 
               void set_interceptor (typename buffer_type::interceptor_type& interceptor);
@@ -139,6 +145,9 @@ namespace ACE
 
               explicit SSLSock_IOStreamBase(stream_type* stream);
 
+              buffer_type* rdbuf ()
+              { return ios_base::rdbuf (); }
+
               ~SSLSock_IOStreamBase();
 
               void set_interceptor (typename buffer_type::interceptor_type& interceptor);
diff --git a/ACE/protocols/ace/INet/Sock_IOStream.cpp b/ACE/protocols/ace/INet/Sock_IOStream.cpp
index 6a79b2f4ade..06979f90942 100644
--- a/ACE/protocols/ace/INet/Sock_IOStream.cpp
+++ b/ACE/protocols/ace/INet/Sock_IOStream.cpp
@@ -81,7 +81,7 @@ namespace ACE
     void Sock_OStreamBase<ACE_SYNCH_USE>::set_interceptor (
           typename buffer_type::interceptor_type& interceptor)
       {
-        this->ios_base::rdbuf ()->set_interceptor (interceptor);
+        this->rdbuf ()->set_interceptor (interceptor);
       }
 
     template <ACE_SYNCH_DECL>
@@ -99,7 +99,7 @@ namespace ACE
     void Sock_IStreamBase<ACE_SYNCH_USE>::set_interceptor (
           typename buffer_type::interceptor_type& interceptor)
       {
-        this->ios_base::rdbuf ()->set_interceptor (interceptor);
+        this->rdbuf ()->set_interceptor (interceptor);
       }
 
     template <ACE_SYNCH_DECL>
@@ -117,7 +117,7 @@ namespace ACE
     void Sock_IOStreamBase<ACE_SYNCH_USE>::set_interceptor (
           typename buffer_type::interceptor_type& interceptor)
       {
-        this->ios_base::rdbuf ()->set_interceptor (interceptor);
+        this->rdbuf ()->set_interceptor (interceptor);
       }
 
   }
diff --git a/ACE/protocols/ace/INet/Sock_IOStream.h b/ACE/protocols/ace/INet/Sock_IOStream.h
index 6ce8c758e85..b83297d4125 100644
--- a/ACE/protocols/ace/INet/Sock_IOStream.h
+++ b/ACE/protocols/ace/INet/Sock_IOStream.h
@@ -97,7 +97,7 @@ namespace ACE
               ~Sock_OStreamBase();
 
               buffer_type* rdbuf ()
-              { return Sock_IOSBase<ACE_SYNCH_USE>::rdbuf (); }
+              { return ios_base::rdbuf (); }
 
               void set_interceptor (typename buffer_type::interceptor_type& interceptor);
           };
@@ -120,7 +120,7 @@ namespace ACE
               explicit Sock_IStreamBase(stream_type* stream);
 
               buffer_type* rdbuf ()
-              { return Sock_IOSBase<ACE_SYNCH_USE>::rdbuf (); }
+              { return ios_base::rdbuf (); }
 
               ~Sock_IStreamBase();
 
@@ -145,7 +145,7 @@ namespace ACE
               explicit Sock_IOStreamBase(stream_type* stream);
 
               buffer_type* rdbuf ()
-              { return Sock_IOSBase<ACE_SYNCH_USE>::rdbuf (); }
+              { return io_base::rdbuf (); }
 
               ~Sock_IOStreamBase();