these VALGRIND allocator annotations never worked for me, just busted memcheck

1 files changed, 0 insertions, 31 deletions

diff --git a/sal/rtl/source/alloc_impl.hxx b/sal/rtl/source/alloc_impl.hxx
index 4452f19e320c..4d6e27bd1fb3 100644
--- a/sal/rtl/source/alloc_impl.hxx
+++ b/sal/rtl/source/alloc_impl.hxx
@@ -235,37 +235,6 @@ typedef CRITICAL_SECTION rtl_memory_lock_type;
 #define RTL_CACHE_FLAG_NOMAGAZINE   (1 << 13) /* w/o magazine layer */
 #define RTL_CACHE_FLAG_QUANTUMCACHE (2 << 13) /* used as arena quantum cache */
 
-
-/** Valgrind support macros.
- */
-#if !defined(HAVE_MEMCHECK_H) || (OSL_DEBUG_LEVEL == 0)
-#if !defined(NVALGRIND)
-#define NVALGRIND 1
-#endif /* ! NVALGRIND */
-#endif /* ! HAVE_MEMCHECK_H || (OSL_DEBUG_LEVEL == 0) */
-
-#if defined(NVALGRIND)
-#define VALGRIND_MAKE_MEM_UNDEFINED(addr, size)
-#define VALGRIND_MAKE_MEM_DEFINED(addr, size)
-#define VALGRIND_MALLOCLIKE_BLOCK(addr, sizeB, rzB, is_zeroed)
-#define VALGRIND_FREELIKE_BLOCK(addr, rzB)
-#define VALGRIND_CREATE_MEMPOOL(pool, rzB, is_zeroed)
-#define VALGRIND_DESTROY_MEMPOOL(pool)
-#define VALGRIND_MEMPOOL_ALLOC(pool, addr, size)
-#define VALGRIND_MEMPOOL_FREE(pool, addr)
-#define RTL_VALGRIND_IGNORE_VAL
-#elif defined(HAVE_MEMCHECK_H)
-#include <memcheck.h>
-/* valgrind macros contain unused variables... */
-#define GCC_VERSION (__GNUC__ * 10000 \
-                     + __GNUC_MINOR__ * 100 \
-                     + __GNUC_PATCHLEVEL__)
-#if GCC_VERSION >= 40600 && !defined __clang__
-#pragma GCC diagnostic warning "-Wunused-but-set-variable"
-#endif
-#define RTL_VALGRIND_IGNORE_VAL (void)
-#endif /* NVALGRIND || HAVE_MEMCHECK_H */
-
 typedef enum { AMode_CUSTOM, AMode_SYSTEM, AMode_UNSET } AllocMode;
 
 extern AllocMode alloc_mode;