commit 58d4b79e36dbdf70411621235793ea7ae579e174
author Treehugger Robot <treehugger-gerrit@google.com> Wed Aug 16 00:18:40 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 16 00:18:40 2017 +0000
tree 0fc92774ffd3cb7bcd32ff473b70f0a87d8a6102
parent 8c90cc59bf93bd0c08970b4488067a33015d4a1c
parent 774ae7feaf990517ca48f2114b0dfb90273f36f4

Merge "Make NamedReference be child class for Reference"

Reference.h

diff --git a/Reference.h b/Reference.h
index 1728a91..8a73609 100644
--- a/Reference.h
+++ b/Reference.h
@@ -31,6 +31,7 @@
 template <class T>
 struct Reference {
     Reference() = default;
+    virtual ~Reference() {}
 
     Reference(const FQName& fqName, const Location& location)
         : mResolved(nullptr), mFqName(fqName), mLocation(location) {}
@@ -97,19 +98,17 @@
 };
 
 template <class T>
-struct NamedReference {
+struct NamedReference : public Reference<T> {
     NamedReference(const std::string& name, const Reference<T>& reference)
-        : mName(name), mReference(reference) {}
+        : Reference<T>(reference), mName(name) {}
 
     const std::string& name() const { return mName; }
-    const T& type() const { return *mReference.get(); }
-    const T* operator->() const { return mReference.get(); }
+
+    // TODO(b/64715470) Legacy
+    const T& type() const { return *Reference<T>::get(); }
 
    private:
     const std::string mName;
-    const Reference<T> mReference;
-
-    DISALLOW_COPY_AND_ASSIGN(NamedReference<T>);
 };
 
 }  // namespace android