Re-added unique_ptr; updated README
This commit is contained in:
parent
f4850c2975
commit
55725b7796
@ -1,7 +1,7 @@
|
|||||||
Boost libraries - trimmed down for Citra
|
Boost libraries - trimmed down for Citra
|
||||||
========================================
|
========================================
|
||||||
|
|
||||||
This is a subset of Boost v1.67.0 generated using the bcp tool. To get a list of boost modules guaranteed to exist, check the build script.
|
This is a subset of Boost v1.70.0 generated using the bcp tool. To get a list of boost modules guaranteed to exist, check the build script.
|
||||||
|
|
||||||
Updating this repo (on Windows)
|
Updating this repo (on Windows)
|
||||||
===============================
|
===============================
|
||||||
@ -16,9 +16,8 @@ To update the Boost version (or to add a new library) follow these steps:
|
|||||||
```
|
```
|
||||||
|
|
||||||
- Store the boost directory in a variable for later use: `$boost_dir = $pwd`.
|
- Store the boost directory in a variable for later use: `$boost_dir = $pwd`.
|
||||||
- Add bcp to your path: `$env:Path += $boost_dir\bin.v2\tools\bcp\msvc-14.1\release\link-static\threading-multi` (The correct output path should be printed by b2 during the build.)
|
- Add bcp to your path: `$env:Path += ";$boost_dir\bin.v2\tools\bcp\msvc-14.2\release\link-static\threading-multi"` (The correct output path should be printed by b2 during the build.)
|
||||||
- `cd` to this repo's directory (`...\externals\boost\`)
|
- `cd` to this repo's directory (`...\externals\boost\`)
|
||||||
- Remove the existing boost from the repo: `rm -r boost` (This is only necessary if doing a Boost version upgrade, in case they removed any files in the new version.)
|
- Remove the existing boost from the repo: `rm -r boost` (This is only necessary if doing a Boost version upgrade, in case they removed any files in the new version.)
|
||||||
- Run `.\build.cmd $boost_dir` to build a new trimmed down distro.
|
- Run `.\build.cmd $boost_dir` to build a new trimmed down distro.
|
||||||
- Remove `libs\` and `Jamroot` if you didn't introduce any new boost dependencies that aren't header only
|
|
||||||
- Add/remove all files in git and commit.
|
- Add/remove all files in git and commit.
|
||||||
|
68
boost/serialization/unique_ptr.hpp
Normal file
68
boost/serialization/unique_ptr.hpp
Normal file
@ -0,0 +1,68 @@
|
|||||||
|
#ifndef BOOST_SERIALIZATION_UNIQUE_PTR_HPP
|
||||||
|
#define BOOST_SERIALIZATION_UNIQUE_PTR_HPP
|
||||||
|
|
||||||
|
// MS compatible compilers support #pragma once
|
||||||
|
#if defined(_MSC_VER)
|
||||||
|
# pragma once
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
|
||||||
|
// unique_ptr.hpp:
|
||||||
|
|
||||||
|
// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
|
||||||
|
// Use, modification and distribution is subject to the Boost Software
|
||||||
|
// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
|
||||||
|
// http://www.boost.org/LICENSE_1_0.txt)
|
||||||
|
|
||||||
|
// See http://www.boost.org for updates, documentation, and revision history.
|
||||||
|
#include <memory>
|
||||||
|
#include <boost/serialization/split_free.hpp>
|
||||||
|
#include <boost/serialization/nvp.hpp>
|
||||||
|
|
||||||
|
namespace boost {
|
||||||
|
namespace serialization {
|
||||||
|
|
||||||
|
/////////////////////////////////////////////////////////////
|
||||||
|
// implement serialization for unique_ptr< T >
|
||||||
|
// note: this must be added to the boost namespace in order to
|
||||||
|
// be called by the library
|
||||||
|
template<class Archive, class T>
|
||||||
|
inline void save(
|
||||||
|
Archive & ar,
|
||||||
|
const std::unique_ptr< T > &t,
|
||||||
|
const unsigned int /*file_version*/
|
||||||
|
){
|
||||||
|
// only the raw pointer has to be saved
|
||||||
|
// the ref count is rebuilt automatically on load
|
||||||
|
const T * const tx = t.get();
|
||||||
|
ar << BOOST_SERIALIZATION_NVP(tx);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Archive, class T>
|
||||||
|
inline void load(
|
||||||
|
Archive & ar,
|
||||||
|
std::unique_ptr< T > &t,
|
||||||
|
const unsigned int /*file_version*/
|
||||||
|
){
|
||||||
|
T *tx;
|
||||||
|
ar >> BOOST_SERIALIZATION_NVP(tx);
|
||||||
|
// note that the reset automagically maintains the reference count
|
||||||
|
t.reset(tx);
|
||||||
|
}
|
||||||
|
|
||||||
|
// split non-intrusive serialization function member into separate
|
||||||
|
// non intrusive save/load member functions
|
||||||
|
template<class Archive, class T>
|
||||||
|
inline void serialize(
|
||||||
|
Archive & ar,
|
||||||
|
std::unique_ptr< T > &t,
|
||||||
|
const unsigned int file_version
|
||||||
|
){
|
||||||
|
boost::serialization::split_free(ar, t, file_version);
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace serialization
|
||||||
|
} // namespace boost
|
||||||
|
|
||||||
|
|
||||||
|
#endif // BOOST_SERIALIZATION_UNIQUE_PTR_HPP
|
@ -27,4 +27,5 @@ bcp ^
|
|||||||
boost/serialization/unordered_map.hpp ^
|
boost/serialization/unordered_map.hpp ^
|
||||||
boost/serialization/unordered_set.hpp ^
|
boost/serialization/unordered_set.hpp ^
|
||||||
boost/serialization/shared_ptr.hpp ^
|
boost/serialization/shared_ptr.hpp ^
|
||||||
|
boost/serialization/unique_ptr.hpp ^
|
||||||
--boost="%1" .
|
--boost="%1" .
|
||||||
|
Loading…
x
Reference in New Issue
Block a user