diff options
| author | gingerBill <bill@gingerbill.org> | 2017-12-12 21:22:46 +0000 |
|---|---|---|
| committer | gingerBill <bill@gingerbill.org> | 2017-12-12 21:22:46 +0000 |
| commit | c980a30bad9fc98c21e4ea36b4e27568650cd601 (patch) | |
| tree | 2c337ce2fb3ffc0004f607470b7381b0eea58d59 /src/entity.cpp | |
| parent | 78b459590c5b81ece8747cc2fdbb01e2b8dbdd42 (diff) | |
| parent | 054e24103329022b1d918505cc5a61f8540c0e13 (diff) | |
Merge branch 'checker-optimizations' into explicit-overloading
# Conflicts:
# examples/demo.odin
Diffstat (limited to 'src/entity.cpp')
| -rw-r--r-- | src/entity.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/entity.cpp b/src/entity.cpp index fcc06f01e..857c5adee 100644 --- a/src/entity.cpp +++ b/src/entity.cpp @@ -66,6 +66,7 @@ struct Entity { Scope * scope; Type * type; AstNode * identifier; // Can be nullptr + DeclInfo * decl_info; DeclInfo * parent_proc_decl; // nullptr if in file/global scope // TODO(bill): Cleanup how `using` works for entities |