summaryrefslogtreecommitdiff
path: root/glib/glibmm.h
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2011-11-23 13:42:55 +0100
committerMurray Cumming <murrayc@murrayc.com>2011-11-23 13:42:55 +0100
commit768123b31049e1164a50eb22af8b4c4b4fd46d72 (patch)
treee87494f4d8c73a7207b5f971673dfc21f157b627 /glib/glibmm.h
parentd7e3bb63fa8841cf1cd06befab3a7a769adff46a (diff)
downloadglibmm-768123b31049e1164a50eb22af8b4c4b4fd46d72.tar.gz
Add Glib::Threads::* in threads.h, deprecating everything in thread.h
* glib/src/filelist.am: * glib/src/thread.[hg|ccg]: Deprecate the whole file, adding deprecation doxygen comments to all API. * glib/src/threads.[hg|ccg]: A new Threads namespace containing equivalents for everything in thread.h, implemented using only non-deprecated glib API. This was necessary because we had to break the ABI to do this. * glib/glibmm.h: Include threads.h * glib/glibmm/main.[h|cc]: Added a wait() method overload that takes the new types, deprecating the existing wait() method. * examples/network/resolver.cc: * examples/network/socket-client.cc: * examples/network/socket-server.cc: * examples/thread/dispatcher.cc: * examples/thread/dispatcher2.cc: * examples/thread/thread.cc: * examples/thread/threadpool.cc: * glib/glibmm/dispatcher.cc: * glib/glibmm/exceptionhandler.cc: * glib/glibmm/threadpool.[h|cc]: Use the new Glib::Threads::* types instead of thread.h.
Diffstat (limited to 'glib/glibmm.h')
-rw-r--r--glib/glibmm.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/glib/glibmm.h b/glib/glibmm.h
index 7cc5ad5c..9fb35e8d 100644
--- a/glib/glibmm.h
+++ b/glib/glibmm.h
@@ -86,6 +86,8 @@
//so we can do an undef trick to still use deprecated API in the header:
#include <glibmm/thread.h>
+#include <glibmm/threads.h>
+
#include <glibmm/arrayhandle.h>
#include <glibmm/balancedtree.h>
#include <glibmm/checksum.h>