diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2013-07-24 18:29:47 -0700 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@redhat.com> | 2013-07-24 18:29:47 -0700 |
| commit | 2bb177bb8f8d813cbcfc12396ac2a068c1bbcb4b (patch) | |
| tree | 8e99aca60521631d8be6238b40d294e70b69d927 | |
| parent | 3a5e88c81fe62083d80b4d302194878c9cee4337 (diff) | |
| download | gcc-2bb177bb8f8d813cbcfc12396ac2a068c1bbcb4b.tar.gz | |
libstdc++
2013-07-23 Benjamin Kosnik <bkoz@redhat.com>
* libsupc++/vtv_stubs.cc: Include cstddef.
libvtv
2013-07-23 Benjamin Kosnik <bkoz@redhat.com>
* vtv_rts.h: Format.
* vtv_utils.h: Adjust include path.
| -rw-r--r-- | libstdc++-v3/ChangeLog.vtv | 4 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/vtv_stubs.cc | 2 | ||||
| -rw-r--r-- | libvtv/ChangeLog | 5 | ||||
| -rw-r--r-- | libvtv/vtv_rts.h | 27 | ||||
| -rw-r--r-- | libvtv/vtv_utils.h | 2 |
5 files changed, 26 insertions, 14 deletions
diff --git a/libstdc++-v3/ChangeLog.vtv b/libstdc++-v3/ChangeLog.vtv index 5a5ffae5562..8cd30a2dc3d 100644 --- a/libstdc++-v3/ChangeLog.vtv +++ b/libstdc++-v3/ChangeLog.vtv @@ -1,3 +1,7 @@ +2013-07-23 Benjamin Kosnik <bkoz@redhat.com> + + * libsupc++/vtv_stubs.cc: Include cstddef. + 2013-07-15 Benjamin Kosnik <bkoz@redhat.com> * acinclude.m4 (GLIBCXX_ENABLE_VTABLE_VERIFY):Adjust VTV_CXXFLAGS diff --git a/libstdc++-v3/libsupc++/vtv_stubs.cc b/libstdc++-v3/libsupc++/vtv_stubs.cc index 7dbff10713f..fba1e276991 100644 --- a/libstdc++-v3/libsupc++/vtv_stubs.cc +++ b/libstdc++-v3/libsupc++/vtv_stubs.cc @@ -35,6 +35,8 @@ the real verification functions with a set of functions that do nothing (so no more verification failures/aborts). */ +#include <cstddef> + // Declare as weak for libsupc++. extern "C" void diff --git a/libvtv/ChangeLog b/libvtv/ChangeLog index ed13b6cce66..404ad57bc32 100644 --- a/libvtv/ChangeLog +++ b/libvtv/ChangeLog @@ -1,3 +1,8 @@ +2013-07-23 Benjamin Kosnik <bkoz@redhat.com> + + * vtv_rts.h: Format. + * vtv_utils.h: Adjust include path. + 2013-07-15 Benjamin Kosnik <bkoz@redhat.com> * vtv_stubs.cc: Move to libsupc++. diff --git a/libvtv/vtv_rts.h b/libvtv/vtv_rts.h index df14d84ec0f..0e2763cb404 100644 --- a/libvtv/vtv_rts.h +++ b/libvtv/vtv_rts.h @@ -27,23 +27,24 @@ #include <cstdlib> -/* These prototypes needs to be kept in sync with the compiler- - generated declarations in vtable-class-hierarchy.c. */ +// These prototypes needs to be kept in sync with the compiler-generated declarations in vtable-class-hierarchy.c +extern void +__VLTRegisterSet(void**, const void*, std::size_t, std::size_t, void**); +extern void +__VLTRegisterSetDebug(void**, const void*, std::size_t, std::size_t, void**); +extern void +__VLTRegisterPair(void**, const void*, size_t, const void*); -extern void __VLTRegisterSet (void **, const void *, std::size_t, - std::size_t, void **); -extern void __VLTRegisterSetDebug (void **, const void *, std::size_t, - std::size_t, void **); +extern void +__VLTRegisterPairDebug(void**, const void*, size_t, const void*, + const char*, const char*); -extern void __VLTRegisterPair (void **, const void *, size_t, - const void *); -extern void __VLTRegisterPairDebug (void **, const void *, size_t, - const void *, const char *, const char *); +extern const void* +__VLTVerifyVtablePointer(void**, const void*); -extern const void *__VLTVerifyVtablePointer (void **, const void *); -extern const void *__VLTVerifyVtablePointerDebug (void **, const void *, - const char *, const char *); +extern const void* +__VLTVerifyVtablePointerDebug(void**, const void*, const char*, const char*); #endif /* _VTV_RTS_H */ diff --git a/libvtv/vtv_utils.h b/libvtv/vtv_utils.h index 65600d23354..f20d0b562e9 100644 --- a/libvtv/vtv_utils.h +++ b/libvtv/vtv_utils.h @@ -26,7 +26,7 @@ #define _VTV_UTILS_H 1 #include <stdlib.h> -#include "../../include/vtv-change-permission.h" +#include "../include/vtv-change-permission.h" static inline void VTV_not_an_error (void) |