diff --git a/Source/TriggerEditor/TEEngine/UndoManager/TEUndoManager.cpp b/Source/TriggerEditor/TEEngine/UndoManager/TEUndoManager.cpp index f673defc8..3166e3207 100644 --- a/Source/TriggerEditor/TEEngine/UndoManager/TEUndoManager.cpp +++ b/Source/TriggerEditor/TEEngine/UndoManager/TEUndoManager.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #include "teundomanager.h" -#include #include bool TEUndoManager::Bunch::addAction(TEUndoManager::Action const& action) diff --git a/Source/TriggerEditor/TEEngine/UndoManager/TEUndoManager.h b/Source/TriggerEditor/TEEngine/UndoManager/TEUndoManager.h index e804a779d..2e4074f31 100644 --- a/Source/TriggerEditor/TEEngine/UndoManager/TEUndoManager.h +++ b/Source/TriggerEditor/TEEngine/UndoManager/TEUndoManager.h @@ -2,12 +2,12 @@ #include #include -#include +#include class TEUndoManager { public: - typedef boost::function0 Action; + typedef std::function Action; private: typedef std::pair DOREDOPair; typedef std::list DOREDOContainer; diff --git a/XLibs.Net/Additional/qls.hpp b/XLibs.Net/Additional/qls.hpp index f1388158c..574742d98 100644 --- a/XLibs.Net/Additional/qls.hpp +++ b/XLibs.Net/Additional/qls.hpp @@ -2,8 +2,8 @@ #define ACHILLES_H_ #include -#include #include +#include namespace Loki { @@ -66,18 +66,18 @@ namespace qls Iter find(Iter from, Iter to, const ValueType& val) { typedef std::iterator_traits::iterator_category Category; - enum { isBidir = boost::is_same< + enum { isBidir = std::is_same< Category, std::bidirectional_iterator_tag>::value }; - enum { isRand = boost::is_same< + enum { isRand = std::is_same< Category, std::random_access_iterator_tag>::value }; typedef std::iterator_traits::pointer PointerType; - typedef boost::remove_pointer::type + typedef std::remove_pointer::type IteratedType; - enum { isMutableSeq = !boost::is_const< + enum { isMutableSeq = !std::is_const< IteratedType>::value }; typedef std::iterator_traits::value_type ValueType; - enum { isPod = boost::is_POD::value }; + enum { isPod = std::is_pod::value }; enum { selector = (isBidir || isRand) && isPod && isMutableSeq ? 2 : (isRand ? 1 : 0) }; @@ -100,4 +100,4 @@ namespace qls } } -#endif \ No newline at end of file +#endif