Author: roger
Date: Thu Jul 28 18:04:30 2011
New Revision: 1151945
URL: http://svn.apache.org/viewvc?rev=1151945&view=rev
Log:
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
Modified:
thrift/trunk/lib/cpp/src/transport/TBufferTransports.h
Modified: thrift/trunk/lib/cpp/src/transport/TBufferTransports.h
URL:
http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/src/transport/TBufferTransports.h?rev=1151945&r1=1151944&r2=1151945&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/src/transport/TBufferTransports.h (original)
+++ thrift/trunk/lib/cpp/src/transport/TBufferTransports.h Thu Jul 28 18:04:30
2011
@@ -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 TVirtualTra
* 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) {
