summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ACE/ChangeLog8
-rw-r--r--ACE/ace/FlReactor/FlReactor.cpp2
-rw-r--r--ACE/bin/valgrind.supp6
3 files changed, 15 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 860a4af6b8c..c984cdb38ae 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,11 @@
+Fri Jan 27 09:39:57 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ace/FlReactor/FlReactor.cpp:
+ Const change
+
+ * bin/valgrind.supp:
+ Added another suppress
+
Fri Jan 27 09:01:51 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* NEWS:
diff --git a/ACE/ace/FlReactor/FlReactor.cpp b/ACE/ace/FlReactor/FlReactor.cpp
index 5dd1ec05492..12bfcb2369d 100644
--- a/ACE/ace/FlReactor/FlReactor.cpp
+++ b/ACE/ace/FlReactor/FlReactor.cpp
@@ -256,7 +256,7 @@ ACE_FlReactor::reset_timer_interval
ACE_TRACE ("ACE_FlReactor::reset_timer_interval");
ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1));
- int result =
+ int const result =
ACE_Select_Reactor::reset_timer_interval (timer_id,
interval);
diff --git a/ACE/bin/valgrind.supp b/ACE/bin/valgrind.supp
index c15e1a05327..26929748129 100644
--- a/ACE/bin/valgrind.supp
+++ b/ACE/bin/valgrind.supp
@@ -30,6 +30,12 @@
}
{
+ <Invalid read>
+ Memcheck:Addr8
+ fun:__memcpy_ssse3_back
+}
+
+{
<IIOP error>
Memcheck:Addr8
fun:__strspn_sse42