diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2012-07-03 06:54:37 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2012-07-03 06:54:37 +0000 |
| commit | d27994699127cfb0a68b75b378e706264c0441ec (patch) | |
| tree | 92264ba3275e8085ec1b73ed44742739a3c0de49 /libstdc++/libsupc++ | |
| parent | fc6f4da7ef50661fa68ca8c1d4175122df331cf0 (diff) | |
Notes
Diffstat (limited to 'libstdc++/libsupc++')
| -rw-r--r-- | libstdc++/libsupc++/eh_personality.cc | 4 | ||||
| -rw-r--r-- | libstdc++/libsupc++/typeinfo | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/libstdc++/libsupc++/eh_personality.cc b/libstdc++/libsupc++/eh_personality.cc index 5fd25f232d9d3..12bba96b2b874 100644 --- a/libstdc++/libsupc++/eh_personality.cc +++ b/libstdc++/libsupc++/eh_personality.cc @@ -1,5 +1,5 @@ // -*- C++ -*- The GNU C++ exception personality routine. -// Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2006, 2008 Free Software Foundation, Inc. // // This file is part of GCC. // @@ -434,7 +434,7 @@ PERSONALITY_FUNCTION (int version, // Parse the LSDA header. p = parse_lsda_header (context, language_specific_data, &info); info.ttype_base = base_of_encoded_value (info.ttype_encoding, context); -#ifdef HAVE_GETIPINFO +#ifdef _GLIBCXX_HAVE_GETIPINFO ip = _Unwind_GetIPInfo (context, &ip_before_insn); #else ip = _Unwind_GetIP (context); diff --git a/libstdc++/libsupc++/typeinfo b/libstdc++/libsupc++/typeinfo index 90ac18a801f2e..cddb65eda8f54 100644 --- a/libstdc++/libsupc++/typeinfo +++ b/libstdc++/libsupc++/typeinfo @@ -99,7 +99,13 @@ namespace std #endif bool operator!=(const type_info& __arg) const { return !operator==(__arg); } - + + // Return true if this is a pointer type of some kind + virtual bool __is_pointer_p() const; + + // Return true if this is a function type + virtual bool __is_function_p() const; + // Try and catch a thrown type. Store an adjusted pointer to the // caught type in THR_OBJ. If THR_TYPE is not a pointer type, then // THR_OBJ points to the thrown object. If THR_TYPE is a pointer @@ -113,12 +119,6 @@ namespace std virtual bool __do_upcast(const __cxxabiv1::__class_type_info *__target, void **__obj_ptr) const; - // Return true if this is a pointer type of some kind - virtual bool __is_pointer_p() const; - - // Return true if this is a function type - virtual bool __is_function_p() const; - protected: const char *__name; |