diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-09-27 08:04:02 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-09-27 08:04:02 +0000 |
| commit | 1135252f6a5169266afd9e568cb784f092f16186 (patch) | |
| tree | 5269dac4ba0dd17dd802c83c66cfbe269d6b4cf5 /gcc/cp/cp-tree.h | |
| parent | 0ce8922d324617aca4137479c9a26f99930d0337 (diff) | |
| download | gcc-1135252f6a5169266afd9e568cb784f092f16186.tar.gz | |
2011-09-24 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 179238 using svnmerge.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@179240 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/cp-tree.h')
| -rw-r--r-- | gcc/cp/cp-tree.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 573c166a08b..0f7deb66b60 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -394,7 +394,9 @@ typedef enum cpp0x_warn_str /* inline namespaces */ CPP0X_INLINE_NAMESPACES, /* override controls, override/final */ - CPP0X_OVERRIDE_CONTROLS + CPP0X_OVERRIDE_CONTROLS, + /* non-static data member initializers */ + CPP0X_NSDMI } cpp0x_warn_str; /* The various kinds of operation used by composite_pointer_type. */ @@ -4790,7 +4792,7 @@ extern void validate_conversion_obstack (void); /* in class.c */ extern tree build_vfield_ref (tree, tree); extern tree build_base_path (enum tree_code, tree, - tree, int); + tree, int, tsubst_flags_t); extern tree convert_to_base (tree, tree, bool, bool, tsubst_flags_t); extern tree convert_to_base_statically (tree, tree); @@ -5045,6 +5047,7 @@ extern tree build_throw (tree); extern int nothrow_libfn_p (const_tree); extern void check_handlers (tree); extern tree finish_noexcept_expr (tree, tsubst_flags_t); +extern bool expr_noexcept_p (tree, tsubst_flags_t); extern void perform_deferred_noexcept_checks (void); extern bool nothrow_spec_p (const_tree); extern bool type_noexcept_p (const_tree); |