THRIFT-1459 declare shared_ptr as boost::shared_ptr
git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1213090 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/cpp/test/Benchmark.cpp b/lib/cpp/test/Benchmark.cpp
old mode 100644
new mode 100755
index 36da0bd..413802d
--- a/lib/cpp/test/Benchmark.cpp
+++ b/lib/cpp/test/Benchmark.cpp
@@ -70,7 +70,7 @@
ooe.zomg_unicode = "\xd7\n\a\t";
ooe.base64 = "\1\2\3\255";
- shared_ptr<TMemoryBuffer> buf(new TMemoryBuffer());
+ boost::shared_ptr<TMemoryBuffer> buf(new TMemoryBuffer());
int num = 1000000;
@@ -96,7 +96,7 @@
for (int i = 0; i < num; i ++) {
OneOfEach ooe2;
- shared_ptr<TMemoryBuffer> buf2(new TMemoryBuffer(data, datasize));
+ boost::shared_ptr<TMemoryBuffer> buf2(new TMemoryBuffer(data, datasize));
//buf2->resetBuffer(data, datasize);
TBinaryProtocolT<TBufferBase> prot(buf2);
ooe2.read(&prot);
diff --git a/lib/cpp/test/RWMutexStarveTest.cpp b/lib/cpp/test/RWMutexStarveTest.cpp
index ca04e6e..8042d49 100644
--- a/lib/cpp/test/RWMutexStarveTest.cpp
+++ b/lib/cpp/test/RWMutexStarveTest.cpp
@@ -36,7 +36,7 @@
class Locker : public Runnable
{
protected:
- Locker(shared_ptr<ReadWriteMutex> rwlock, bool writer) :
+ Locker(boost::shared_ptr<ReadWriteMutex> rwlock, bool writer) :
rwlock_(rwlock), writer_(writer),
started_(false), gotLock_(false), signaled_(false) { }
@@ -61,7 +61,7 @@
void signal() { signaled_ = true; }
protected:
- shared_ptr<ReadWriteMutex> rwlock_;
+ boost::shared_ptr<ReadWriteMutex> rwlock_;
bool writer_;
volatile bool started_;
volatile bool gotLock_;
@@ -71,13 +71,13 @@
class Reader : public Locker
{
public:
- Reader(shared_ptr<ReadWriteMutex> rwlock) : Locker(rwlock, false) { }
+ Reader(boost::shared_ptr<ReadWriteMutex> rwlock) : Locker(rwlock, false) { }
};
class Writer : public Locker
{
public:
- Writer(shared_ptr<ReadWriteMutex> rwlock) : Locker(rwlock, true) { }
+ Writer(boost::shared_ptr<ReadWriteMutex> rwlock) : Locker(rwlock, true) { }
};
void test_starve(PosixThreadFactory::POLICY policy)
@@ -88,15 +88,15 @@
PosixThreadFactory factory(policy);
factory.setDetached(false);
- shared_ptr<ReadWriteMutex> rwlock(new NoStarveReadWriteMutex());
+ boost::shared_ptr<ReadWriteMutex> rwlock(new NoStarveReadWriteMutex());
- shared_ptr<Reader> reader1(new Reader(rwlock));
- shared_ptr<Reader> reader2(new Reader(rwlock));
- shared_ptr<Writer> writer(new Writer(rwlock));
+ boost::shared_ptr<Reader> reader1(new Reader(rwlock));
+ boost::shared_ptr<Reader> reader2(new Reader(rwlock));
+ boost::shared_ptr<Writer> writer(new Writer(rwlock));
- shared_ptr<Thread> treader1 = factory.newThread(reader1);
- shared_ptr<Thread> treader2 = factory.newThread(reader2);
- shared_ptr<Thread> twriter = factory.newThread(writer);
+ boost::shared_ptr<Thread> treader1 = factory.newThread(reader1);
+ boost::shared_ptr<Thread> treader2 = factory.newThread(reader2);
+ boost::shared_ptr<Thread> twriter = factory.newThread(writer);
// launch a reader and make sure he has the lock
treader1->start();
diff --git a/lib/cpp/test/TPipedTransportTest.cpp b/lib/cpp/test/TPipedTransportTest.cpp
index 5708fd2..e1e372c 100644
--- a/lib/cpp/test/TPipedTransportTest.cpp
+++ b/lib/cpp/test/TPipedTransportTest.cpp
@@ -23,15 +23,14 @@
#include <transport/TTransportUtils.h>
#include <transport/TBufferTransports.h>
using namespace std;
-using boost::shared_ptr;
using apache::thrift::transport::TTransportException;
using apache::thrift::transport::TPipedTransport;
using apache::thrift::transport::TMemoryBuffer;
int main() {
- shared_ptr<TMemoryBuffer> underlying(new TMemoryBuffer);
- shared_ptr<TMemoryBuffer> pipe(new TMemoryBuffer);
- shared_ptr<TPipedTransport> trans(new TPipedTransport(underlying, pipe));
+ boost::shared_ptr<TMemoryBuffer> underlying(new TMemoryBuffer);
+ boost::shared_ptr<TMemoryBuffer> pipe(new TMemoryBuffer);
+ boost::shared_ptr<TPipedTransport> trans(new TPipedTransport(underlying, pipe));
uint8_t buffer[4];
diff --git a/lib/cpp/test/ZlibTest.cpp b/lib/cpp/test/ZlibTest.cpp
index 9df9dc4..605e9db 100644
--- a/lib/cpp/test/ZlibTest.cpp
+++ b/lib/cpp/test/ZlibTest.cpp
@@ -142,8 +142,8 @@
*/
void test_write_then_read(const uint8_t* buf, uint32_t buf_len) {
- shared_ptr<TMemoryBuffer> membuf(new TMemoryBuffer());
- shared_ptr<TZlibTransport> zlib_trans(new TZlibTransport(membuf));
+ boost::shared_ptr<TMemoryBuffer> membuf(new TMemoryBuffer());
+ boost::shared_ptr<TZlibTransport> zlib_trans(new TZlibTransport(membuf));
zlib_trans->write(buf, buf_len);
zlib_trans->finish();
@@ -161,8 +161,8 @@
// it isn't there. The original implementation complained that
// the stream was not complete. I'm about to go fix that.
// It worked. Awesome.
- shared_ptr<TMemoryBuffer> membuf(new TMemoryBuffer());
- shared_ptr<TZlibTransport> zlib_trans(new TZlibTransport(membuf));
+ boost::shared_ptr<TMemoryBuffer> membuf(new TMemoryBuffer());
+ boost::shared_ptr<TZlibTransport> zlib_trans(new TZlibTransport(membuf));
zlib_trans->write(buf, buf_len);
zlib_trans->finish();
string tmp_buf;
@@ -181,8 +181,8 @@
void test_incomplete_checksum(const uint8_t* buf, uint32_t buf_len) {
// Make sure we still get that "not complete" error if
// it really isn't complete.
- shared_ptr<TMemoryBuffer> membuf(new TMemoryBuffer());
- shared_ptr<TZlibTransport> zlib_trans(new TZlibTransport(membuf));
+ boost::shared_ptr<TMemoryBuffer> membuf(new TMemoryBuffer());
+ boost::shared_ptr<TZlibTransport> zlib_trans(new TZlibTransport(membuf));
zlib_trans->write(buf, buf_len);
zlib_trans->finish();
string tmp_buf;
@@ -205,11 +205,11 @@
}
void test_read_write_mix(const uint8_t* buf, uint32_t buf_len,
- const shared_ptr<SizeGenerator>& write_gen,
- const shared_ptr<SizeGenerator>& read_gen) {
+ const boost::shared_ptr<SizeGenerator>& write_gen,
+ const boost::shared_ptr<SizeGenerator>& read_gen) {
// Try it with a mix of read/write sizes.
- shared_ptr<TMemoryBuffer> membuf(new TMemoryBuffer());
- shared_ptr<TZlibTransport> zlib_trans(new TZlibTransport(membuf));
+ boost::shared_ptr<TMemoryBuffer> membuf(new TMemoryBuffer());
+ boost::shared_ptr<TZlibTransport> zlib_trans(new TZlibTransport(membuf));
unsigned int tot;
tot = 0;
@@ -244,8 +244,8 @@
void test_invalid_checksum(const uint8_t* buf, uint32_t buf_len) {
// Verify checksum checking.
- shared_ptr<TMemoryBuffer> membuf(new TMemoryBuffer());
- shared_ptr<TZlibTransport> zlib_trans(new TZlibTransport(membuf));
+ boost::shared_ptr<TMemoryBuffer> membuf(new TMemoryBuffer());
+ boost::shared_ptr<TZlibTransport> zlib_trans(new TZlibTransport(membuf));
zlib_trans->write(buf, buf_len);
zlib_trans->finish();
string tmp_buf;
@@ -282,8 +282,8 @@
void test_write_after_flush(const uint8_t* buf, uint32_t buf_len) {
// write some data
- shared_ptr<TMemoryBuffer> membuf(new TMemoryBuffer());
- shared_ptr<TZlibTransport> zlib_trans(new TZlibTransport(membuf));
+ boost::shared_ptr<TMemoryBuffer> membuf(new TMemoryBuffer());
+ boost::shared_ptr<TZlibTransport> zlib_trans(new TZlibTransport(membuf));
zlib_trans->write(buf, buf_len);
// call finish()
@@ -318,7 +318,7 @@
void test_no_write() {
// Verify that no data is written to the underlying transport if we
// never write data to the TZlibTransport.
- shared_ptr<TMemoryBuffer> membuf(new TMemoryBuffer());
+ boost::shared_ptr<TMemoryBuffer> membuf(new TMemoryBuffer());
{
// Create a TZlibTransport object, and immediately destroy it
// when it goes out of scope.
@@ -352,8 +352,8 @@
ADD_TEST_CASE(suite, name, test_invalid_checksum, buf, buf_len);
ADD_TEST_CASE(suite, name, test_write_after_flush, buf, buf_len);
- shared_ptr<SizeGenerator> size_32k(new ConstantSizeGenerator(1<<15));
- shared_ptr<SizeGenerator> size_lognormal(new LogNormalSizeGenerator(20, 30));
+ boost::shared_ptr<SizeGenerator> size_32k(new ConstantSizeGenerator(1<<15));
+ boost::shared_ptr<SizeGenerator> size_lognormal(new LogNormalSizeGenerator(20, 30));
ADD_TEST_CASE(suite, name << "-constant",
test_read_write_mix, buf, buf_len,
size_32k, size_32k);
@@ -373,8 +373,8 @@
// Because the SizeGenerator makes a copy of the random number generator,
// both SizeGenerators should return the exact same set of values, since they
// both start with random number generators in the same state.
- shared_ptr<SizeGenerator> write_size_gen(new LogNormalSizeGenerator(20, 30));
- shared_ptr<SizeGenerator> read_size_gen(new LogNormalSizeGenerator(20, 30));
+ boost::shared_ptr<SizeGenerator> write_size_gen(new LogNormalSizeGenerator(20, 30));
+ boost::shared_ptr<SizeGenerator> read_size_gen(new LogNormalSizeGenerator(20, 30));
ADD_TEST_CASE(suite, name << "-lognormal-same-distribution",
test_read_write_mix, buf, buf_len,
write_size_gen, read_size_gen);