diff --git a/aegisub/libaegisub/include/libaegisub/option_value.h b/aegisub/libaegisub/include/libaegisub/option_value.h index e6f39d58b..ddbab247b 100644 --- a/aegisub/libaegisub/include/libaegisub/option_value.h +++ b/aegisub/libaegisub/include/libaegisub/option_value.h @@ -20,7 +20,6 @@ #include #include -#include #include #endif diff --git a/aegisub/libaegisub/include/libaegisub/signal.h b/aegisub/libaegisub/include/libaegisub/signal.h index eaeafb3e5..fe95a7898 100644 --- a/aegisub/libaegisub/include/libaegisub/signal.h +++ b/aegisub/libaegisub/include/libaegisub/signal.h @@ -19,13 +19,13 @@ #pragma once #ifndef LAGI_PRE +#include + #ifdef _WIN32 #include -#include #include #else #include -#include #include #endif #endif @@ -141,7 +141,7 @@ namespace detail { template class SignalBaseImpl : public SignalBase { protected: - typedef std::map SlotMap; + typedef boost::container::map SlotMap; SlotMap slots; /// Signals currently connected to this slot diff --git a/aegisub/libaegisub/lagi_pre.h b/aegisub/libaegisub/lagi_pre.h index f218859d5..53f38d7e1 100644 --- a/aegisub/libaegisub/lagi_pre.h +++ b/aegisub/libaegisub/lagi_pre.h @@ -59,6 +59,10 @@ #include #endif +// Boost +#include +#include + #ifdef __DEPRECATED // Dodge GCC warnings # undef __DEPRECATED # include diff --git a/aegisub/src/ass_file.h b/aegisub/src/ass_file.h index 2ff292075..baf3e1929 100644 --- a/aegisub/src/ass_file.h +++ b/aegisub/src/ass_file.h @@ -33,7 +33,8 @@ /// #ifndef AGI_PRE -#include +#include + #include #include @@ -55,8 +56,8 @@ typedef std::list::iterator entryIter; /// /// DOCME class AssFile { - std::list UndoStack; - std::list RedoStack; + boost::container::list UndoStack; + boost::container::list RedoStack; wxString undoDescription; /// Revision counter for undo coalescing and modified state tracking int commitId; diff --git a/aegisub/src/gl_text.h b/aegisub/src/gl_text.h index a693e9d85..2199afac1 100644 --- a/aegisub/src/gl_text.h +++ b/aegisub/src/gl_text.h @@ -33,7 +33,8 @@ /// #ifndef AGI_PRE -#include +#include + #include #include @@ -45,7 +46,7 @@ struct OpenGLTextGlyph; class OpenGLTextTexture; /// DOCME -typedef std::map glyphMap; +typedef boost::container::map glyphMap; /// DOCME /// @class OpenGLText diff --git a/aegisub/src/subs_edit_box.h b/aegisub/src/subs_edit_box.h index 86a8ecce1..4bb2dec59 100644 --- a/aegisub/src/subs_edit_box.h +++ b/aegisub/src/subs_edit_box.h @@ -34,7 +34,7 @@ #ifndef AGI_PRE #include -#include +#include #include #include @@ -136,7 +136,7 @@ class SubsEditBox : public wxPanel { /// The start and end times of the selected lines without changes made to /// avoid negative durations, so that they can be restored if future changes /// eliminate the negative durations - std::map > initialTimes; + boost::container::map > initialTimes; // Constructor helpers wxTextCtrl *MakeMarginCtrl(wxString const& tooltip, void (SubsEditBox::*handler)(wxCommandEvent&)); diff --git a/aegisub/src/tooltip_manager.h b/aegisub/src/tooltip_manager.h index e3a8274d0..685376d99 100644 --- a/aegisub/src/tooltip_manager.h +++ b/aegisub/src/tooltip_manager.h @@ -33,7 +33,7 @@ /// #ifndef AGI_PRE -#include +#include #endif struct ToolTipBinding; @@ -52,7 +52,7 @@ class ToolTipManager { ToolTipManager(ToolTipManager const&); ToolTipManager& operator=(ToolTipManager const&); - std::list tips; + boost::container::list tips; public: static void Bind(wxWindow *window, wxString tooltip, const char *context, const char *command); diff --git a/aegisub/src/video_provider_cache.cpp b/aegisub/src/video_provider_cache.cpp index 7b94fd3cd..a11a90eca 100644 --- a/aegisub/src/video_provider_cache.cpp +++ b/aegisub/src/video_provider_cache.cpp @@ -63,7 +63,7 @@ const AegiVideoFrame VideoProviderCache::GetFrame(int n) { size_t total_size = 0; // See if frame is cached - for (std::list::iterator cur = cache.begin(); cur != cache.end(); ++cur) { + for (boost::container::list::iterator cur = cache.begin(); cur != cache.end(); ++cur) { if (cur->frame_number == n) { cache.push_front(*cur); cache.erase(cur); diff --git a/aegisub/src/video_provider_cache.h b/aegisub/src/video_provider_cache.h index 27e64255a..30943d679 100644 --- a/aegisub/src/video_provider_cache.h +++ b/aegisub/src/video_provider_cache.h @@ -33,7 +33,7 @@ /// #ifndef AGI_PRE -#include +#include #endif #include "include/aegisub/video_provider.h" @@ -55,7 +55,7 @@ class VideoProviderCache : public VideoProvider { const size_t max_cache_size; /// Cache of video frames with the most recently used ones at the front - std::list cache; + boost::container::list cache; public: VideoProviderCache(VideoProvider *master); diff --git a/aegisub/src/visual_tool.h b/aegisub/src/visual_tool.h index 2045792f0..ac5126af1 100644 --- a/aegisub/src/visual_tool.h +++ b/aegisub/src/visual_tool.h @@ -161,8 +161,8 @@ template class VisualTool : public VisualToolBase { protected: typedef FeatureType Feature; - typedef typename std::list::iterator feature_iterator; - typedef typename std::list::const_iterator feature_const_iterator; + typedef typename boost::container::list::iterator feature_iterator; + typedef typename boost::container::list::const_iterator feature_const_iterator; private: struct ltaddr { @@ -172,7 +172,7 @@ private: } }; - std::list slots; + boost::container::list slots; typedef typename std::set::iterator selection_iterator; @@ -203,7 +203,7 @@ protected: feature_iterator active_feature; /// List of features which are drawn and can be clicked on /// List is used here for the iterator invalidation properties - std::list features; + boost::container::list features; /// Draw all of the features in the list void DrawAllFeatures(); diff --git a/aegisub/src/visual_tool_drag.h b/aegisub/src/visual_tool_drag.h index 25f363153..b99587e7e 100644 --- a/aegisub/src/visual_tool_drag.h +++ b/aegisub/src/visual_tool_drag.h @@ -27,7 +27,7 @@ class VisualToolDragDraggableFeature : public VisualDraggableFeature { public: int time; - std::list::iterator parent; + boost::container::list::iterator parent; VisualToolDragDraggableFeature() : VisualDraggableFeature(), time(0) { } };