Revert "Merge remote-tracking branch 'origin/master' into SniperSprint"

This reverts commit 62653cf65d, reversing
changes made to b81bb9eeea.
This commit is contained in:
verysecrethero
2016-03-02 16:58:24 +01:00
parent 4e68f9063b
commit a20ef0504a
195 changed files with 2303 additions and 6805 deletions
+3 -4
View File
@@ -2,7 +2,6 @@
#define Util_Any_h__
#include <memory>
#include <boost/shared_array.hpp>
struct Any
{
@@ -11,7 +10,7 @@ struct Any
template <typename T>
Any(const T& value)
{
Data = boost::shared_array<char>(new char[sizeof(T)]);
Data = std::shared_ptr<char>(new char[sizeof(T)]);
Size = sizeof(T);
memcpy(Data.get(), &value, Size);
}
@@ -19,7 +18,7 @@ struct Any
template <typename T>
Any(T&& value)
{
Data = boost::shared_array<char>(new char[sizeof(T)]);
Data = std::shared_ptr<char>(new char[sizeof(T)]);
Size = sizeof(T);
memcpy(Data.get(), &value, Size);
}
@@ -36,7 +35,7 @@ struct Any
return Any(value);
}
boost::shared_array<char> Data = nullptr;
std::shared_ptr<char> Data = nullptr;
std::size_t Size = 0;
};