summaryrefslogtreecommitdiff
path: root/examples/network
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 /examples/network
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 'examples/network')
-rw-r--r--examples/network/resolver.cc4
-rw-r--r--examples/network/socket-client.cc2
-rw-r--r--examples/network/socket-server.cc2
3 files changed, 5 insertions, 3 deletions
diff --git a/examples/network/resolver.cc b/examples/network/resolver.cc
index 7ce8cef9..1d6303ca 100644
--- a/examples/network/resolver.cc
+++ b/examples/network/resolver.cc
@@ -212,9 +212,11 @@ start_threaded_lookups (char **argv, int argc)
int i;
for (i = 0; i < argc; i++)
- Glib::Thread::create (sigc::bind (sigc::ptr_fun (lookup_thread),
+ {
+ Glib::Threads::Thread::create (sigc::bind (sigc::ptr_fun (lookup_thread),
argv[i]),
false);
+ }
}
static void
diff --git a/examples/network/socket-client.cc b/examples/network/socket-client.cc
index e6c5ae15..b1f08715 100644
--- a/examples/network/socket-client.cc
+++ b/examples/network/socket-client.cc
@@ -128,7 +128,7 @@ main (int argc,
if (cancel_timeout)
{
cancellable = Gio::Cancellable::create ();
- Glib::Thread::create (sigc::bind (sigc::ptr_fun (cancel_thread), cancellable), false);
+ Glib::Threads::Thread::create (sigc::bind (sigc::ptr_fun (cancel_thread), cancellable), false);
}
loop = Glib::MainLoop::create ();
diff --git a/examples/network/socket-server.cc b/examples/network/socket-server.cc
index bc2822b1..d99a176a 100644
--- a/examples/network/socket-server.cc
+++ b/examples/network/socket-server.cc
@@ -124,7 +124,7 @@ main (int argc,
if (cancel_timeout)
{
cancellable = Gio::Cancellable::create ();
- Glib::Thread::create (sigc::bind (sigc::ptr_fun (cancel_thread), cancellable), false);
+ Glib::Threads::Thread::create (sigc::bind (sigc::ptr_fun (cancel_thread), cancellable), false);
}
loop = Glib::MainLoop::create ();