diff options
| author | kan <kan@FreeBSD.org> | 2003-02-10 05:47:54 +0000 |
|---|---|---|
| committer | kan <kan@FreeBSD.org> | 2003-02-10 05:47:54 +0000 |
| commit | 78fa66448c770aa99b6f69113061eb5d77581627 (patch) | |
| tree | 548333fba089bbaa9f6f60f38860213a7f7ccf69 /contrib/libstdc++/libsupc++ | |
| parent | 793833d7a78bb624965885760593495e7079d705 (diff) | |
| download | FreeBSD-src-78fa66448c770aa99b6f69113061eb5d77581627.zip FreeBSD-src-78fa66448c770aa99b6f69113061eb5d77581627.tar.gz | |
Gcc 3.2.2-release C++ support bits.
Diffstat (limited to 'contrib/libstdc++/libsupc++')
| -rw-r--r-- | contrib/libstdc++/libsupc++/Makefile.in | 1 | ||||
| -rw-r--r-- | contrib/libstdc++/libsupc++/eh_personality.cc | 2 | ||||
| -rw-r--r-- | contrib/libstdc++/libsupc++/tinfo.cc | 7 |
3 files changed, 6 insertions, 4 deletions
diff --git a/contrib/libstdc++/libsupc++/Makefile.in b/contrib/libstdc++/libsupc++/Makefile.in index 4badadb..9de2f5f 100644 --- a/contrib/libstdc++/libsupc++/Makefile.in +++ b/contrib/libstdc++/libsupc++/Makefile.in @@ -75,6 +75,7 @@ CMESSAGES_H = @CMESSAGES_H@ CPP = @CPP@ CPU_LIMITS_INC_SRCDIR = @CPU_LIMITS_INC_SRCDIR@ CSTDIO_H = @CSTDIO_H@ +CTIME_H = @CTIME_H@ CXXCPP = @CXXCPP@ C_INCLUDE_DIR = @C_INCLUDE_DIR@ DEBUG_FLAGS = @DEBUG_FLAGS@ diff --git a/contrib/libstdc++/libsupc++/eh_personality.cc b/contrib/libstdc++/libsupc++/eh_personality.cc index 35e93a3..58c266a 100644 --- a/contrib/libstdc++/libsupc++/eh_personality.cc +++ b/contrib/libstdc++/libsupc++/eh_personality.cc @@ -1,5 +1,5 @@ // -*- C++ -*- The GNU C++ exception personality routine. -// Copyright (C) 2001 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002 Free Software Foundation, Inc. // // This file is part of GNU CC. // diff --git a/contrib/libstdc++/libsupc++/tinfo.cc b/contrib/libstdc++/libsupc++/tinfo.cc index be04104..d2e189a 100644 --- a/contrib/libstdc++/libsupc++/tinfo.cc +++ b/contrib/libstdc++/libsupc++/tinfo.cc @@ -1,5 +1,5 @@ // Methods for type_info for -*- C++ -*- Run Time Type Identification. -// Copyright (C) 1994, 1996, 1998, 1999, 2000, 2001, 2002 +// Copyright (C) 1994, 1996, 1998, 1999, 2000, 2001, 2002, 2003 // Free Software Foundation // // This file is part of GNU CC. @@ -465,8 +465,9 @@ __do_dyncast (ptrdiff_t src2dst, result.whole2dst = __sub_kind (result.whole2dst | result2.whole2dst); } - else if ((result.dst_ptr != 0 | result_ambig) - && (result2.dst_ptr != 0 | result2_ambig)) + else if ((result.dst_ptr != 0 & result2.dst_ptr != 0) + || (result.dst_ptr != 0 & result2_ambig) + || (result2.dst_ptr != 0 & result_ambig)) { // Found two different DST_TYPE bases, or a valid one and a set of // ambiguous ones, must disambiguate. See whether SRC_PTR is |
