From: Roger Meier <roger@apache.org>
Date: Thu, 28 Jul 2011 18:04:30 +0000 (+0000)
Subject: THRIFT-1244 using 'using' to disambiguate between functions in different bases does... 
X-Git-Tag: 0.7.0~22
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=d2f8da4bb8d0c48bbbc0bf0cbe97b3dc1c84188c;p=common%2Fthrift.git

THRIFT-1244 using 'using' to disambiguate between functions in different bases does not conform to C++ standard and will not compile on certain compilers
Patch: Anatoly Fayngelerin

git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1151945 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/lib/cpp/src/transport/TBufferTransports.h b/lib/cpp/src/transport/TBufferTransports.h
index 92492d7e..5f8257e4 100644
--- a/lib/cpp/src/transport/TBufferTransports.h
+++ b/lib/cpp/src/transport/TBufferTransports.h
@@ -275,7 +275,9 @@ class TBufferedTransport
    * TVirtualTransport provides a default implementation of readAll().
    * We want to use the TBufferBase version instead.
    */
-  using TBufferBase::readAll;
+  uint32_t readAll(uint8_t* buf, uint32_t len) {
+    return TBufferBase::readAll(buf, len);
+  }
 
  protected:
   void initPointers() {
@@ -384,7 +386,9 @@ class TFramedTransport
    * TVirtualTransport provides a default implementation of readAll().
    * We want to use the TBufferBase version instead.
    */
-  using TBufferBase::readAll;
+  uint32_t readAll(uint8_t* buf, uint32_t len) {
+    return TBufferBase::readAll(buf,len);
+  }
 
  protected:
   /**
@@ -681,7 +685,9 @@ class TMemoryBuffer : public TVirtualTransport<TMemoryBuffer, TBufferBase> {
    * TVirtualTransport provides a default implementation of readAll().
    * We want to use the TBufferBase version instead.
    */
-  using TBufferBase::readAll;
+  uint32_t readAll(uint8_t* buf, uint32_t len) {
+    return TBufferBase::readAll(buf,len);
+  }
 
  protected:
   void swap(TMemoryBuffer& that) {