From: JINMEI Tatuya Date: Wed, 3 Oct 2012 07:58:32 +0000 (+0000) Subject: [master] added 'std::' to strerror. sunstudio is strict and requires this. X-Git-Tag: trac2351_base~9^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1886c9f3083ce3e04d42b8a91e46838ee5a1e774;p=thirdparty%2Fkea.git [master] added 'std::' to strerror. sunstudio is strict and requires this. this fixes build regression: http://git.bind10.isc.org/~tester/builder//BIND10/20121003052334-Solaris10-sparc-Sunstudio/logs/build.out committing at my discretion (confirmed it compiled) --- diff --git a/src/lib/util/threads/lock.cc b/src/lib/util/threads/lock.cc index de7bf072fb..6a165aa531 100644 --- a/src/lib/util/threads/lock.cc +++ b/src/lib/util/threads/lock.cc @@ -67,14 +67,14 @@ Mutex::Mutex() : case ENOMEM: throw std::bad_alloc(); default: - isc_throw(isc::InvalidOperation, strerror(result)); + isc_throw(isc::InvalidOperation, std::strerror(result)); } Deinitializer deinitializer(attributes); // TODO: Distinguish if debug mode is enabled in compilation. // If so, it should be PTHREAD_MUTEX_NORMAL or NULL result = pthread_mutexattr_settype(&attributes, PTHREAD_MUTEX_ERRORCHECK); if (result != 0) { - isc_throw(isc::InvalidOperation, strerror(result)); + isc_throw(isc::InvalidOperation, std::strerror(result)); } auto_ptr impl(new Impl); result = pthread_mutex_init(&impl->mutex, &attributes); @@ -86,7 +86,7 @@ Mutex::Mutex() : case EAGAIN: throw std::bad_alloc(); default: - isc_throw(isc::InvalidOperation, strerror(result)); + isc_throw(isc::InvalidOperation, std::strerror(result)); } } @@ -114,7 +114,7 @@ Mutex::lock() { assert(impl_ != NULL); const int result = pthread_mutex_lock(&impl_->mutex); if (result != 0) { - isc_throw(isc::InvalidOperation, strerror(result)); + isc_throw(isc::InvalidOperation, std::strerror(result)); } ++impl_->locked_count; // Only in debug mode } diff --git a/src/lib/util/threads/thread.cc b/src/lib/util/threads/thread.cc index 3382fe2b1e..c1c9cdf028 100644 --- a/src/lib/util/threads/thread.cc +++ b/src/lib/util/threads/thread.cc @@ -115,7 +115,7 @@ Thread::Thread(const boost::function& main) : case EAGAIN: throw std::bad_alloc(); default: // Other errors. They should not happen. - isc_throw(isc::InvalidOperation, strerror(result)); + isc_throw(isc::InvalidOperation, std::strerror(result)); } } @@ -139,7 +139,7 @@ Thread::wait() { const int result = pthread_join(impl_->tid_, NULL); if (result != 0) { - isc_throw(isc::InvalidOperation, strerror(result)); + isc_throw(isc::InvalidOperation, std::strerror(result)); } // Was there an exception in the thread?