diff options
author | Murray Cumming <murrayc@murrayc.com> | 2005-02-01 12:00:52 +0000 |
---|---|---|
committer | Murray Cumming <murrayc@src.gnome.org> | 2005-02-01 12:00:52 +0000 |
commit | f5a67fb82013883244dba94d5b1a287c8c7235bc (patch) | |
tree | 9e12678a89bbc9308a9187aee47f871bcfa410c9 | |
parent | 9b2f8a2f938e74707430110ff4c5a9662fe7d87f (diff) | |
download | glibmm-f5a67fb82013883244dba94d5b1a287c8c7235bc.tar.gz |
Removed the #ifdef for AIX, because sigc::bind now works on AIX.
2005-02-01 Murray Cumming <murrayc@murrayc.com>
* examples/threadpool.cc, dispatcher.cc, dispatcher2.cc: Removed the
#ifdef for AIX, because sigc::bind now works on AIX.
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | examples/thread/dispatcher.cc | 12 | ||||
-rw-r--r-- | examples/thread/dispatcher2.cc | 8 | ||||
-rw-r--r-- | examples/thread/threadpool.cc | 5 |
4 files changed, 5 insertions, 25 deletions
@@ -1,3 +1,8 @@ +2005-02-01 Murray Cumming <murrayc@murrayc.com> + + * examples/threadpool.cc, dispatcher.cc, dispatcher2.cc: Removed the + #ifdef for AIX, because sigc::bind now works on AIX. + 2005-01-27 Cedric Gustin <cedric.gustin@swing.be> * MSVC_Net2003/glibmm/glibmm.rc.in: Reverted to 2.4 for the diff --git a/examples/thread/dispatcher.cc b/examples/thread/dispatcher.cc index 11d6a5dc..61b8734b 100644 --- a/examples/thread/dispatcher.cc +++ b/examples/thread/dispatcher.cc @@ -143,20 +143,8 @@ Application::Application() progress_list_.push_back(progress); progress_ref_list_.push_back(Glib::RefPtr<ThreadProgress>(progress)); -// The AIX xlC compiler gives this linker error, even with the bind<1> hint. -// ld: 0711-317 ERROR: Undefined symbol: -// .sigc::bind_functor::__clXSP1TQ2_4sigc18bound_mem_functor1XTvTQ2_15dispatcher.cc-011ApplicationTPQ2_15dispatcher.cc-014ThreadProgress_TPQ2_15dispatcher.cc-014ThreadProgressTQ2_4sigc3nilTQ2_4sigc3nilTQ2_4sigc3nilTQ2_4sigc3nilTQ2_4sigc3nilTQ2_4sigc3nil_Fv -// ld: 0711-345 Use the -bloadmap or -bnoquiet option to obtain more information. -// -// Obviously this example will then be useless on AIX, but at least the build will succeed so people can install the library. -#if !defined(_AIX) progress->signal_finished().connect( sigc::bind<1>(sigc::mem_fun(*this, &Application::on_progress_finished), progress)); - //Note: The AIX xlC compiler needs us to explicitly use sigc::bind<1> instead of just sigc::bind<>. - //Otherwise it says "The call to "visit_each" has no best match." -#endif - - } } diff --git a/examples/thread/dispatcher2.cc b/examples/thread/dispatcher2.cc index d60b333a..fd7379e3 100644 --- a/examples/thread/dispatcher2.cc +++ b/examples/thread/dispatcher2.cc @@ -173,15 +173,7 @@ void ThreadTimer::thread_function() // created MainContext Glib::Dispatcher signal_finished (context); -// The AIX xlC compiler gives this linker error, even with the bind<1> hint. -// ld: 0711-317 ERROR: Undefined symbol: -// .sigc::bind_functor<1,sigc::pointer_functor1<Glib::RefPtr<Glib::MainLoop>,void>,Glib::RefPtr<Glib::MainLoop>,sigc::nil,sigc::nil,sigc::nil,sigc::nil,sigc::nil,sigc::nil>::operator()() -// ld: 0711-345 Use the -bloadmap or -bnoquiet option to obtain more information. -// -// Obviously this example will then be useless on AIX, but at least the build will succeed so people can install the library. -#if !defined(_AIX) signal_finished.connect(sigc::bind(sigc::ptr_fun(&ThreadTimer::finished_handler), mainloop)); -#endif signal_finished_ptr_ = &signal_finished; diff --git a/examples/thread/threadpool.cc b/examples/thread/threadpool.cc index ac3612b8..8b36277d 100644 --- a/examples/thread/threadpool.cc +++ b/examples/thread/threadpool.cc @@ -37,12 +37,7 @@ int main(int, char**) for(char c = 'a'; c <= 'z'; ++c) { -// The AIX xlC compiler gives a linker error, even with the bind<1> hint. -// See the comment in dispatcher.cc -// Obviously this example will then be useless on AIX, but at least the build will succeed so people can install the library. -#if !defined(_AIX) pool.push(sigc::bind<1>(sigc::ptr_fun(&print_char), c)); -#endif } pool.shutdown(); |