BIND 10 master, updated. 1886c9f3083ce3e04d42b8a91e46838ee5a1e774 [master] added 'std::' to strerror. sunstudio is strict and requires this.
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Oct 3 08:03:13 UTC 2012
The branch, master has been updated
via 1886c9f3083ce3e04d42b8a91e46838ee5a1e774 (commit)
from 7eaa1760f3ed6cd57cf1b8458516fa3d457371d7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1886c9f3083ce3e04d42b8a91e46838ee5a1e774
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Wed Oct 3 07:58:32 2012 +0000
[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)
-----------------------------------------------------------------------
Summary of changes:
src/lib/util/threads/lock.cc | 8 ++++----
src/lib/util/threads/thread.cc | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/util/threads/lock.cc b/src/lib/util/threads/lock.cc
index de7bf07..6a165aa 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> 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 3382fe2..c1c9cdf 100644
--- a/src/lib/util/threads/thread.cc
+++ b/src/lib/util/threads/thread.cc
@@ -115,7 +115,7 @@ Thread::Thread(const boost::function<void ()>& 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?
More information about the bind10-changes
mailing list