mirror of https://github.com/odrling/Aegisub
Remove a bunch of unused crap from lagi_pre.h
This commit is contained in:
parent
50f2e550e2
commit
650cfcb043
|
@ -18,7 +18,6 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <cstring>
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
|
@ -14,10 +14,11 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <boost/container/map.hpp>
|
#include <boost/config.hpp>
|
||||||
|
#include <map>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
namespace agi { namespace signal {
|
namespace agi { namespace signal {
|
||||||
class Connection;
|
class Connection;
|
||||||
|
@ -127,7 +128,7 @@ namespace detail {
|
||||||
template<typename... Args>
|
template<typename... Args>
|
||||||
class Signal final : private detail::SignalBase {
|
class Signal final : private detail::SignalBase {
|
||||||
using Slot = std::function<void(Args...)>;
|
using Slot = std::function<void(Args...)>;
|
||||||
boost::container::map<detail::ConnectionToken*, Slot> slots; /// Signals currently connected to this slot
|
std::map<detail::ConnectionToken*, Slot> slots; /// Signals currently connected to this slot
|
||||||
|
|
||||||
void Disconnect(detail::ConnectionToken *tok) override {
|
void Disconnect(detail::ConnectionToken *tok) override {
|
||||||
slots.erase(tok);
|
slots.erase(tok);
|
||||||
|
|
|
@ -9,22 +9,8 @@
|
||||||
#include <cerrno>
|
#include <cerrno>
|
||||||
#include <climits>
|
#include <climits>
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include <cstdarg>
|
|
||||||
#include <cstdio>
|
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <cstring>
|
#include <ctime>
|
||||||
#include <sys/stat.h>
|
|
||||||
#ifdef HAVE_SYS_TIME_H
|
|
||||||
# include <sys/time.h>
|
|
||||||
#else
|
|
||||||
# include <ctime>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Unix C
|
|
||||||
#ifndef _WIN32
|
|
||||||
#include <sys/statvfs.h>
|
|
||||||
#include <sys/param.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Common C++
|
// Common C++
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
|
@ -38,7 +24,6 @@
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <numeric>
|
#include <numeric>
|
||||||
#include <stdexcept>
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
@ -47,7 +32,9 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Boost
|
// Boost
|
||||||
#include <boost/container/map.hpp>
|
#include <boost/range/algorithm.hpp>
|
||||||
|
#include <boost/range/irange.hpp>
|
||||||
|
#include <boost/regex.hpp>
|
||||||
#define BOOST_NO_SCOPED_ENUMS
|
#define BOOST_NO_SCOPED_ENUMS
|
||||||
#include <boost/filesystem.hpp>
|
#include <boost/filesystem.hpp>
|
||||||
#undef BOOST_NO_SCOPED_ENUMS
|
#undef BOOST_NO_SCOPED_ENUMS
|
||||||
|
|
|
@ -12,6 +12,8 @@
|
||||||
// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||||
// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
|
|
||||||
|
#include <libaegisub/util.h>
|
||||||
|
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
|
|
||||||
#ifdef _LIBCPP_VERSION
|
#ifdef _LIBCPP_VERSION
|
||||||
|
|
Loading…
Reference in New Issue