| commit | 79c2278a66d8fc0943774d1b7c71a32f7764e1e2 | [log] [tgz] |
|---|---|---|
| author | Douglas Gregor <dgregor@apple.com> | Sat Jan 16 20:21:20 2010 +0000 |
| committer | Douglas Gregor <dgregor@apple.com> | Sat Jan 16 20:21:20 2010 +0000 |
| tree | 39d2ef92c12f76c7285ae2e3d783350fcfcabf9d | |
| parent | dfa4fa0fc5b78a91c74db84fce305771c2038229 [diff] |
When we are instantiating a member function of a local class, be sure to merge the local instantiation scope with the outer local instantiation scope, so that we can instantiate declarations from the function owning the local class. Fixes an assert while instantiating Boost.MPL's BOOST_MPL_ASSERT_MSG. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@93651 91177308-0d34-0410-b5e6-96231b3b80d8