Added const keyword to second argument of VG_(OSetGen_Remove)().

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7436

diff --git a/coregrind/m_oset.c b/coregrind/m_oset.c
index da4ef44682d964f8f7c721361a618b0aa8ddf5ce..e45b07beb68f07d5edeab666886005478b2b2f82 100644 (file)
--- a/coregrind/m_oset.c
+++ b/coregrind/m_oset.c
@@ -684,7 +684,7 @@ static Bool avl_removeroot(AvlTree* t)
 }
 
 // Remove and return the element matching the key 'k', or NULL if not present.
-void* VG_(OSetGen_Remove)(AvlTree* t, void* k)
+void* VG_(OSetGen_Remove)(AvlTree* t, const void* k)
 {
    // Have to find the node first, then remove it.
    AvlNode* n = avl_lookup(t, k);

diff --git a/include/pub_tool_oset.h b/include/pub_tool_oset.h
index 7db0909f49555c33e7c4cdc46667b73286a3c9d7..44b1a195fb56e44479e6c8b892918bbd118de7d3 100644 (file)
--- a/include/pub_tool_oset.h
+++ b/include/pub_tool_oset.h
@@ -239,7 +239,7 @@ extern void  VG_(OSetGen_Insert)       ( OSet* os, void* elem );
 extern Bool  VG_(OSetGen_Contains)     ( const OSet* os, const void* key  );
 extern void* VG_(OSetGen_Lookup)       ( const OSet* os, const void* key  );
 extern void* VG_(OSetGen_LookupWithCmp)( OSet* os, const void* key, OSetCmp_t cmp );
-extern void* VG_(OSetGen_Remove)       ( OSet* os, void* key  );
+extern void* VG_(OSetGen_Remove)       ( OSet* os, const void* key  );
 extern void  VG_(OSetGen_ResetIter)    ( OSet* os );
 extern void* VG_(OSetGen_Next)         ( OSet* os );