Commit de030d23 authored by Victor Zverovich's avatar Victor Zverovich Committed by Facebook Github Bot

Replace boost::scoped_array with std::unique_ptr

Summary:
`boost::scoped_ptr<T>` is obsolete so replace it with `std::unique_ptr<T[]>`.
This also fixes the modular build by eliminating problematic using directives.

Reviewed By: shixiao

Differential Revision: D9480193

fbshipit-source-id: 8eaa642fe16e91b8f8144f5a10f21729ed984257
parent 2cafd523
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include <folly/io/async/test/BlockingSocket.h> #include <folly/io/async/test/BlockingSocket.h>
#include <folly/portability/Sockets.h> #include <folly/portability/Sockets.h>
#include <boost/scoped_array.hpp>
#include <memory> #include <memory>
enum StateEnum { STATE_WAITING, STATE_SUCCEEDED, STATE_FAILED }; enum StateEnum { STATE_WAITING, STATE_SUCCEEDED, STATE_FAILED };
...@@ -393,7 +392,7 @@ class TestServer { ...@@ -393,7 +392,7 @@ class TestServer {
// accept a connection // accept a connection
std::shared_ptr<BlockingSocket> acceptedSocket = accept(); std::shared_ptr<BlockingSocket> acceptedSocket = accept();
// read the data and compare it to the specified buffer // read the data and compare it to the specified buffer
boost::scoped_array<uint8_t> readbuf(new uint8_t[len]); std::unique_ptr<uint8_t[]> readbuf(new uint8_t[len]);
acceptedSocket->readAll(readbuf.get(), len); acceptedSocket->readAll(readbuf.get(), len);
CHECK_EQ(memcmp(buf, readbuf.get(), len), 0); CHECK_EQ(memcmp(buf, readbuf.get(), len), 0);
// make sure we get EOF next // make sure we get EOF next
......
...@@ -35,15 +35,12 @@ ...@@ -35,15 +35,12 @@
#include <folly/synchronization/Baton.h> #include <folly/synchronization/Baton.h>
#include <folly/test/SocketAddressTestHelper.h> #include <folly/test/SocketAddressTestHelper.h>
#include <boost/scoped_array.hpp>
#include <fcntl.h> #include <fcntl.h>
#include <sys/types.h> #include <sys/types.h>
#include <iostream> #include <iostream>
#include <memory>
#include <thread> #include <thread>
using namespace boost;
using boost::scoped_array;
using std::cerr; using std::cerr;
using std::endl; using std::endl;
using std::min; using std::min;
...@@ -877,7 +874,7 @@ void testConnectOptWrite(size_t size1, size_t size2, bool close = false) { ...@@ -877,7 +874,7 @@ void testConnectOptWrite(size_t size1, size_t size2, bool close = false) {
// Tell the connect callback to perform a write when the connect succeeds // Tell the connect callback to perform a write when the connect succeeds
WriteCallback wcb2; WriteCallback wcb2;
scoped_array<char> buf2(new char[size2]); std::unique_ptr<char[]> buf2(new char[size2]);
memset(buf2.get(), 'b', size2); memset(buf2.get(), 'b', size2);
if (size2 > 0) { if (size2 > 0) {
ccb.successCallback = [&] { socket->write(&wcb2, buf2.get(), size2); }; ccb.successCallback = [&] { socket->write(&wcb2, buf2.get(), size2); };
...@@ -886,7 +883,7 @@ void testConnectOptWrite(size_t size1, size_t size2, bool close = false) { ...@@ -886,7 +883,7 @@ void testConnectOptWrite(size_t size1, size_t size2, bool close = false) {
} }
// Schedule one write() immediately, before the connect finishes // Schedule one write() immediately, before the connect finishes
scoped_array<char> buf1(new char[size1]); std::unique_ptr<char[]> buf1(new char[size1]);
memset(buf1.get(), 'a', size1); memset(buf1.get(), 'a', size1);
WriteCallback wcb1; WriteCallback wcb1;
if (size1 > 0) { if (size1 > 0) {
...@@ -1036,7 +1033,7 @@ TEST(AsyncSocketTest, WriteTimeout) { ...@@ -1036,7 +1033,7 @@ TEST(AsyncSocketTest, WriteTimeout) {
size_t writeLength = 32 * 1024 * 1024; size_t writeLength = 32 * 1024 * 1024;
uint32_t timeout = 200; uint32_t timeout = 200;
socket->setSendTimeout(timeout); socket->setSendTimeout(timeout);
scoped_array<char> buf(new char[writeLength]); std::unique_ptr<char[]> buf(new char[writeLength]);
memset(buf.get(), 'a', writeLength); memset(buf.get(), 'a', writeLength);
WriteCallback wcb; WriteCallback wcb;
socket->write(&wcb, buf.get(), writeLength); socket->write(&wcb, buf.get(), writeLength);
...@@ -1091,7 +1088,7 @@ TEST(AsyncSocketTest, WritePipeError) { ...@@ -1091,7 +1088,7 @@ TEST(AsyncSocketTest, WritePipeError) {
// write() a large chunk of data // write() a large chunk of data
size_t writeLength = 32 * 1024 * 1024; size_t writeLength = 32 * 1024 * 1024;
scoped_array<char> buf(new char[writeLength]); std::unique_ptr<char[]> buf(new char[writeLength]);
memset(buf.get(), 'a', writeLength); memset(buf.get(), 'a', writeLength);
WriteCallback wcb; WriteCallback wcb;
socket->write(&wcb, buf.get(), writeLength); socket->write(&wcb, buf.get(), writeLength);
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include <folly/portability/Sockets.h> #include <folly/portability/Sockets.h>
#include <folly/test/SocketAddressTestHelper.h> #include <folly/test/SocketAddressTestHelper.h>
using namespace boost;
using std::string; using std::string;
using std::cerr; using std::cerr;
using std::endl; using std::endl;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment