aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ada/gcc-interface/decl.cc11
-rw-r--r--gcc/vec.h22
2 files changed, 18 insertions, 15 deletions
diff --git a/gcc/ada/gcc-interface/decl.cc b/gcc/ada/gcc-interface/decl.cc
index 494b24e..ee913a0 100644
--- a/gcc/ada/gcc-interface/decl.cc
+++ b/gcc/ada/gcc-interface/decl.cc
@@ -163,17 +163,6 @@ struct GTY((for_user)) tree_entity_vec_map
vec<Entity_Id, va_gc_atomic> *to;
};
-void
-gt_pch_nx (Entity_Id &)
-{
-}
-
-void
-gt_pch_nx (Entity_Id *x, gt_pointer_operator op, void *cookie)
-{
- op (x, NULL, cookie);
-}
-
struct dummy_type_hasher : ggc_cache_ptr_hash<tree_entity_vec_map>
{
static inline hashval_t
diff --git a/gcc/vec.h b/gcc/vec.h
index 3691891..6f7b048 100644
--- a/gcc/vec.h
+++ b/gcc/vec.h
@@ -1390,6 +1390,13 @@ gt_pch_nx (vec<T, A, vl_embed> *v)
gt_pch_nx ((*v)[i]);
}
+template<typename T>
+void
+gt_pch_nx (vec<T, va_gc_atomic, vl_embed> *)
+{
+ /* No pointers to note. */
+}
+
template<typename T, typename A>
void
gt_pch_nx (vec<T *, A, vl_embed> *v, gt_pointer_operator op, void *cookie)
@@ -1407,6 +1414,13 @@ gt_pch_nx (vec<T, A, vl_embed> *v, gt_pointer_operator op, void *cookie)
gt_pch_nx (&((*v)[i]), op, cookie);
}
+template<typename T>
+void
+gt_pch_nx (vec<T, va_gc_atomic, vl_embed> *, gt_pointer_operator, void *)
+{
+ /* No pointers to note. */
+}
+
/* Space efficient vector. These vectors can grow dynamically and are
allocated together with their control data. They are suited to be
@@ -2286,12 +2300,12 @@ public:
array_slice (vec<OtherT> &v)
: m_base (v.address ()), m_size (v.length ()) {}
- template<typename OtherT>
- array_slice (const vec<OtherT, va_gc> *v)
+ template<typename OtherT, typename A>
+ array_slice (const vec<OtherT, A, vl_embed> *v)
: m_base (v ? v->address () : nullptr), m_size (v ? v->length () : 0) {}
- template<typename OtherT>
- array_slice (vec<OtherT, va_gc> *v)
+ template<typename OtherT, typename A>
+ array_slice (vec<OtherT, A, vl_embed> *v)
: m_base (v ? v->address () : nullptr), m_size (v ? v->length () : 0) {}
iterator begin () { return m_base; }