From d2f8da4bb8d0c48bbbc0bf0cbe97b3dc1c84188c Mon Sep 17 00:00:00 2001 From: Roger Meier Date: Thu, 28 Jul 2011 18:04:30 +0000 Subject: [PATCH] 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 --- lib/cpp/src/transport/TBufferTransports.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) 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 { * 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) { -- 2.17.1