Add <functional> to files that use std::function

include/core/advdumper.hpp

@@ -5,6 +5,7 @@
 #include <set>
 #include <stdexcept>
 #include <iostream>
+#include <functional>
 
 #include "library/framebuffer.hpp"
 #include "library/dispatch.hpp"

include/core/memorywatch.hpp

@@ -4,6 +4,7 @@
 #include <string>
 #include <stdexcept>
 #include <set>
+#include <functional>
 #include "library/memorywatch.hpp"
 #include "library/json.hpp"
 

include/core/moviefile-common.hpp

@@ -1,6 +1,7 @@
 #ifndef _moviefile_common__hpp__included__
 #define _moviefile_common__hpp__included__
 
+#include <functional>
 #include "core/moviefile.hpp"
 #define DEFAULT_RTC_SECOND 1000000000ULL
 #define DEFAULT_RTC_SUBSECOND 0ULL

include/core/queue.hpp

@@ -4,6 +4,7 @@
 #include "library/exrethrow.hpp"
 #include "library/keyboard.hpp"
 #include "library/threads.hpp"
+#include <functional>
 #include <deque>
 
 namespace command

include/core/romimage.hpp

@@ -1,6 +1,7 @@
 #ifndef _romimage__hpp__included__
 #define _romimage__hpp__included__
 
+#include <functional>
 #include "core/rom-small.hpp"
 #include "interface/romtype.hpp"
 #include "library/fileimage.hpp"

include/library/gamepad.hpp

@@ -1,6 +1,7 @@
 #ifndef _library__gamepad__hpp__included__
 #define _library__gamepad__hpp__included__
 
+#include <functional>
 #include <cstdint>
 #include <set>
 #include "json.hpp"

include/library/httpreq.hpp

@@ -6,6 +6,7 @@
 #include <cstdlib>
 #include <map>
 #include <string>
+#include <functional>
 #include "threads.hpp"
 
 class http_request

include/library/loadlib.hpp

@@ -1,6 +1,7 @@
 #ifndef _library__loadlib__hpp__included__
 #define _library__loadlib__hpp__included__
 
+#include <functional>
 #include <string>
 #include <stdexcept>
 #include <map>

include/library/lua-class.hpp

@@ -1,6 +1,7 @@
 #ifndef _library__lua_class__hpp__included__
 #define _library__lua_class__hpp__included__
 
+#include <functional>
 #include "lua-base.hpp"
 #include "lua-pin.hpp"
 

include/library/lua-function.hpp

@@ -1,6 +1,8 @@
 #ifndef _library__lua_function__hpp__included__
 #define _library__lua_function__hpp__included__
 
+#include <functional>
+
 namespace lua
 {
 class parameters;

include/library/memorywatch-fb.hpp

@@ -1,6 +1,7 @@
 #ifndef _library__memorywatch_fb__hpp__included__
 #define _library__memorywatch_fb__hpp__included__
 
+#include <functional>
 #include "framebuffer.hpp"
 #include "memorywatch.hpp"
 #include "mathexpr.hpp"

include/library/memorywatch.hpp

@@ -2,6 +2,7 @@
 #define _library__memorywatch__hpp__included__
 
 #include "mathexpr.hpp"
+#include <functional>
 #include <list>
 #include <set>
 #include <map>

include/library/string.hpp

@@ -1,6 +1,7 @@
 #ifndef _library__string__hpp__included__
 #define _library__string__hpp__included__
 
+#include <functional>
 #include <string>
 #include <sstream>
 #include <set>

include/library/triplebuffer.hpp

@@ -1,6 +1,7 @@
 #ifndef _library_triplebuffer__hpp__included__
 #define _library_triplebuffer__hpp__included__
 
+#include <functional>
 #include <stdexcept>
 #include "threads.hpp"
 

include/platform/wxwidgets/menu_branches.hpp

@@ -2,6 +2,7 @@
 #define _plat_wxwidgets__menu_branches__hpp__included__
 
 #include "core/dispatch.hpp"
+#include <functional>
 #include <wx/string.h>
 #include <wx/wx.h>
 #include <map>

include/platform/wxwidgets/menu_loadrom.hpp

@@ -1,6 +1,7 @@
 #ifndef _plat_wxwidgets__menu_loadrom__hpp__included__
 #define _plat_wxwidgets__menu_loadrom__hpp__included__
 
+#include <functional>
 #include <wx/string.h>
 #include <wx/wx.h>
 #include "interface/romtype.hpp"

include/platform/wxwidgets/menu_projects.hpp

@@ -3,6 +3,7 @@
 
 #include "core/dispatch.hpp"
 #include "library/recentfiles.hpp"
+#include <functional>
 #include <wx/string.h>
 #include <wx/wx.h>
 #include <map>

include/platform/wxwidgets/menu_tracelog.hpp

@@ -2,6 +2,7 @@
 #define _plat_wxwidgets__menu_tracelog__hpp__included__
 
 #include "core/dispatch.hpp"
+#include <functional>
 #include <wx/string.h>
 #include <wx/wx.h>
 #include <map>

include/platform/wxwidgets/platform.hpp

@@ -11,6 +11,7 @@
 #include "core/window.hpp"
 #include "library/threads.hpp"
 
+#include <functional>
 #include <cstdlib>
 #include <cstdint>
 #include <cstddef>

include/platform/wxwidgets/settings-common.hpp

@@ -1,6 +1,7 @@
 #ifndef _platform__wxwidgets__settings_common__hpp__included__
 #define _platform__wxwidgets__settings_common__hpp__included__
 
+#include <functional>
 #include <string>
 #include "platform/wxwidgets/platform.hpp"
 #include <wx/wx.h>

src/core/advdumper.cpp

@@ -5,6 +5,7 @@
 #include "library/string.hpp"
 #include "lua/lua.hpp"
 
+#include <functional>
 #include <map>
 #include <string>
 

src/core/debug.cpp

@@ -10,6 +10,7 @@
 #include "library/directory.hpp"
 #include "library/memoryspace.hpp"
 
+#include <functional>
 #include <stdexcept>
 #include <list>
 #include <map>

src/core/fileupload.cpp

@@ -7,6 +7,7 @@
 #include "library/streamcompress.hpp"
 #include "library/string.hpp"
 
+#include <functional>
 #include <fstream>
 #include <boost/iostreams/categories.hpp>
 #include <boost/iostreams/copy.hpp>

src/core/jukebox.cpp

@@ -3,6 +3,7 @@
 #include "core/settings.hpp"
 #include "library/settingvar.hpp"
 
+#include <functional>
 #include <stdexcept>
 
 namespace

src/core/memorymanip.cpp

@@ -12,6 +12,7 @@
 #include "library/minmax.hpp"
 #include "library/string.hpp"
 
+#include <functional>
 #include <iostream>
 #include <limits>
 #include <sstream>

src/core/memorywatch.cpp

@@ -20,6 +20,7 @@
 #include "library/memorywatch-null.hpp"
 #include "library/string.hpp"
 
+#include <functional>
 #include <cstdio>
 #include <cstdlib>
 #include <list>

src/core/queue.cpp

@@ -3,6 +3,7 @@
 #include "core/random.hpp"
 #include "library/command.hpp"
 #include "library/threads.hpp"
+#include <functional>
 
 input_queue::input_queue(command::group& _command)
 	: command(_command)

src/core/romimage.cpp

@@ -7,6 +7,7 @@
 #include "core/window.hpp"
 #include "library/memtracker.hpp"
 #include "library/zip.hpp"
+#include <functional>
 
 fileimage::image rom_image::null_img;
 fileimage::hash lsnes_image_hasher;

src/core/ui-services.cpp

@@ -9,6 +9,7 @@
 #include "core/rom.hpp"
 #include "core/ui-services.hpp"
 #include "library/keyboard.hpp"
+#include <functional>
 
 namespace
 {

src/emulation/bsnes-legacy/scpu-disasm.cpp

@@ -1,6 +1,7 @@
 #include "interface/disassembler.hpp"
 #include "library/hex.hpp"
 #include "library/string.hpp"
+#include <functional>
 #include <sstream>
 #include <iomanip>
 

src/emulation/gambatte/core.cpp

@@ -16,6 +16,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "lsnes.hpp"
+#include <functional>
 #include <sstream>
 #include <iostream>
 #include <map>

src/interface/c-interface.cpp

@@ -15,6 +15,7 @@
 #include "core/audioapi.hpp"
 #include "core/instance.hpp"
 #include "core/messages.hpp"
+#include <functional>
 
 template<> int ccore_call_param_map<lsnes_core_enumerate_cores>::id = LSNES_CORE_ENUMERATE_CORES;
 template<> int ccore_call_param_map<lsnes_core_get_core_info>::id = LSNES_CORE_GET_CORE_INFO;

src/interface/disassembler.cpp

@@ -1,4 +1,5 @@
 #include "interface/disassembler.hpp"
+#include <functional>
 #include <stdexcept>
 #include <iostream>
 

src/library/assembler.cpp

@@ -2,6 +2,7 @@
 #include "serialization.hpp"
 #include "string.hpp"
 #include "hex.hpp"
+#include <functional>
 #include <cstring>
 #include <iostream>
 #include <fstream>

src/library/binarystream.cpp

@@ -2,6 +2,7 @@
 #include "serialization.hpp"
 #include "minmax.hpp"
 #include "string.hpp"
+#include <functional>
 #include <algorithm>
 #include <iostream>
 #include <iterator>

src/library/command.cpp

@@ -6,6 +6,7 @@
 #include "string.hpp"
 #include "threads.hpp"
 #include "zip.hpp"
+#include <functional>
 #include <iostream>
 #include <cstdlib>
 

src/library/exrethrow.cpp

@@ -1,4 +1,5 @@
 #include "exrethrow.hpp"
+#include <functional>
 #include <list>
 #include <iostream>
 #include <future>

src/library/fileimage.cpp

@@ -5,6 +5,7 @@
 #include "minmax.hpp"
 #include "zip.hpp"
 #include "directory.hpp"
+#include <functional>
 #include <sstream>
 
 namespace fileimage

src/library/framebuffer-font2.cpp

@@ -1,6 +1,7 @@
 #include "framebuffer-font2.hpp"
 #include "range.hpp"
 #include "serialization.hpp"
+#include <functional>
 #include <cstring>
 #include <sstream>
 #include "zip.hpp"

src/library/framebuffer.cpp

@@ -5,6 +5,7 @@
 #include "string.hpp"
 #include "minmax.hpp"
 #include "utf8.hpp"
+#include <functional>
 #include <cstring>
 #include <iostream>
 #include <list>

src/library/gamepad.cpp

@@ -1,3 +1,4 @@
+#include <functional>
 #include "gamepad.hpp"
 #include "string.hpp"
 

src/library/httpreq.cpp

@@ -9,6 +9,7 @@
 #include "threads.hpp"
 #include "streamcompress.hpp"
 #include <curl/curl.h>
+#include <functional>
 #include <cstring>
 #include <fstream>
 #include <boost/iostreams/categories.hpp>

src/library/loadlib.cpp

@@ -1,4 +1,5 @@
 #include "loadlib.hpp"
+#include <functional>
 #include <sstream>
 #include <list>
 #include <set>

src/library/lua.cpp

@@ -5,6 +5,7 @@
 #include "lua-pin.hpp"
 #include "stateobject.hpp"
 #include "threads.hpp"
+#include <functional>
 #include <iostream>
 #include <cassert>
 

src/library/mathexpr-ntype.cpp

@@ -2,6 +2,7 @@
 #include "mathexpr-error.hpp"
 #include "mathexpr-format.hpp"
 #include "string.hpp"
+#include <functional>
 #include <iostream>
 #include <map>
 

src/library/mathexpr.cpp

@@ -1,5 +1,6 @@
 #include "mathexpr.hpp"
 #include "string.hpp"
+#include <functional>
 #include <set>
 #include <map>
 

src/library/memorywatch-fb.cpp

@@ -2,6 +2,7 @@
 #include "memorywatch-fb.hpp"
 #include "utf8.hpp"
 #include "minmax.hpp"
+#include <functional>
 
 namespace memorywatch
 {

src/library/memorywatch-list.cpp

@@ -1,4 +1,5 @@
 #include "memorywatch-list.hpp"
+#include <functional>
 
 namespace memorywatch
 {

src/library/memorywatch.cpp

@@ -4,6 +4,7 @@
 #include "int24.hpp"
 #include "mathexpr-error.hpp"
 #include "mathexpr.hpp"
+#include <functional>
 #include <sstream>
 #include "string.hpp"
 

src/library/opus-ogg.cpp

@@ -1,4 +1,5 @@
 #include "opus-ogg.hpp"
+#include <functional>
 #include <cstring>
 #include "serialization.hpp"
 #include "minmax.hpp"

src/library/streamcompress.cpp

@@ -1,5 +1,6 @@
 #include "streamcompress.hpp"
 #include "string.hpp"
+#include <functional>
 #include <stdexcept>
 
 namespace streamcompress

src/library/triplebuffer.cpp

@@ -1,4 +1,5 @@
 #include "triplebuffer.hpp"
+#include <functional>
 #include <iostream>
 
 namespace triplebuffer

src/lua/gui-bitmap.cpp

@@ -12,6 +12,7 @@
 #include "library/zip.hpp"
 #include "lua/bitmap.hpp"
 #include "library/threads.hpp"
+#include <functional>
 #include <vector>
 #include <sstream>
 

src/platform/wxwidgets/editor-memorywatch.cpp

@@ -1,3 +1,4 @@
+#include <functional>
 #include <wx/wx.h>
 #include <wx/statline.h>
 #include <wx/event.h>

src/platform/wxwidgets/loadrommenu.cpp

@@ -1,3 +1,4 @@
+#include <functional>
 #include "platform/wxwidgets/menu_loadrom.hpp"
 #include "platform/wxwidgets/platform.hpp"
 #include "core/dispatch.hpp"

src/platform/wxwidgets/main.cpp

@@ -38,6 +38,7 @@
 #include "platform/wxwidgets/window_status.hpp"
 #include "platform/wxwidgets/window_mainwindow.hpp"
 
+#include <functional>
 #include <math.h>
 #include <cassert>
 

src/platform/wxwidgets/projectmenu.cpp

@@ -1,3 +1,4 @@
+#include <functional>
 #include <wx/wx.h>
 #include <wx/event.h>
 #include <wx/control.h>

src/platform/wxwidgets/scrollbar.cpp

@@ -1,6 +1,7 @@
 #include "platform/wxwidgets/scrollbar.hpp"
 #include "platform/wxwidgets/platform.hpp"
 #include "library/minmax.hpp"
+#include <functional>
 #include <iostream>
 
 scroll_bar::scroll_bar(wxWindow* parent, wxWindowID id, bool vertical)

src/platform/wxwidgets/settings-common.cpp

@@ -1,3 +1,4 @@
+#include <functional>
 #include "platform/wxwidgets/settings-common.hpp"
 #include "core/instance.hpp"
 #include "core/instance-map.hpp"

src/test/rrdata-test.cpp

@@ -1,6 +1,7 @@
 #include "rrdata.hpp"
 #include "string.hpp"
 #include "minmax.hpp"
+#include <functional>
 #include <iostream>
 #include "library/directory.hpp"
 #include <sstream>