diff --git a/lang/c++/impl/json/JsonIO.hh b/lang/c++/impl/json/JsonIO.hh index 499255c575f..9fdc482ed11 100644 --- a/lang/c++/impl/json/JsonIO.hh +++ b/lang/c++/impl/json/JsonIO.hh @@ -21,7 +21,6 @@ #include #include -#include #include #include #include diff --git a/lang/c++/include/avro/DataFile.hh b/lang/c++/include/avro/DataFile.hh index 7371d4e0854..dcfddf774ff 100644 --- a/lang/c++/include/avro/DataFile.hh +++ b/lang/c++/include/avro/DataFile.hh @@ -26,12 +26,11 @@ #include "ValidSchema.hh" #include "buffer/Buffer.hh" +#include #include #include #include -#include "array" -#include "boost/utility.hpp" #include namespace avro { diff --git a/lang/c++/include/avro/Generic.hh b/lang/c++/include/avro/Generic.hh index ad8a73c7e67..2eb34479998 100644 --- a/lang/c++/include/avro/Generic.hh +++ b/lang/c++/include/avro/Generic.hh @@ -19,8 +19,6 @@ #ifndef avro_Generic_hh__ #define avro_Generic_hh__ -#include - #include "Config.hh" #include "Decoder.hh" #include "Encoder.hh" diff --git a/lang/c++/include/avro/Specific.hh b/lang/c++/include/avro/Specific.hh index 247d86da720..1c4b183b5bc 100644 --- a/lang/c++/include/avro/Specific.hh +++ b/lang/c++/include/avro/Specific.hh @@ -48,7 +48,8 @@ */ namespace avro { -typedef boost::blank null; +struct null { +}; template void encode(Encoder &e, const T &t); diff --git a/lang/c++/include/avro/Stream.hh b/lang/c++/include/avro/Stream.hh index 783e4513cdf..de213404d3f 100644 --- a/lang/c++/include/avro/Stream.hh +++ b/lang/c++/include/avro/Stream.hh @@ -24,8 +24,6 @@ #include #include -#include "boost/utility.hpp" - #include "Config.hh" #include "Exception.hh" diff --git a/lang/c++/include/avro/buffer/detail/BufferDetail.hh b/lang/c++/include/avro/buffer/detail/BufferDetail.hh index 697c8f41c21..1b7663afc04 100644 --- a/lang/c++/include/avro/buffer/detail/BufferDetail.hh +++ b/lang/c++/include/avro/buffer/detail/BufferDetail.hh @@ -19,18 +19,14 @@ #ifndef avro_BufferDetail_hh__ #define avro_BufferDetail_hh__ -#include #include -#include -#include -#include -#include #ifdef HAVE_BOOST_ASIO #include #endif #include #include #include +#include /** * \file BufferDetail.hh @@ -55,7 +51,7 @@ const size_type kMinBlockSize = 4096; const size_type kMaxBlockSize = 16384; const size_type kDefaultBlockSize = kMinBlockSize; -typedef boost::function free_func; +typedef std::function free_func; /** * Simple class to hold a functor that executes on delete @@ -108,7 +104,7 @@ public: private: // reference counted object will call a functor when it's destroyed - boost::shared_ptr callOnDestroy_; + std::shared_ptr callOnDestroy_; public: /// Remove readable bytes from the front of the chunk by advancing the @@ -274,8 +270,8 @@ class BufferImpl { public: typedef std::deque ChunkList; - typedef boost::shared_ptr SharedPtr; - typedef boost::shared_ptr ConstSharedPtr; + typedef std::shared_ptr SharedPtr; + typedef std::shared_ptr ConstSharedPtr; /// Default constructor, creates a buffer without any chunks BufferImpl() : freeSpace_(0), @@ -343,7 +339,7 @@ public: /// and will compile-time assert. template void writeTo(T /*val*/, const std::false_type &) { - BOOST_STATIC_ASSERT(sizeof(T) == 0); + static_assert(sizeof(T) == 0); } /// Write a block of data to the buffer, adding new chunks if necessary.