[dmd-internals] [D-Programming-Language/dmd] 479c97: Fix broken master

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/D-Programming-Language/dmd
  Commit: 479c97a83c12fdebdd84692349aad5b1cc4e093d
      https://github.com/D-Programming-Language/dmd/commit/479c97a83c12fdebdd84692349aad5b1cc4e093d
  Author: k-hara <k.hara.pg at gmail.com>
  Date:   2014-02-27 (Thu, 27 Feb 2014)

  Changed paths:
    M src/attrib.c
    M src/cast.c
    M src/declaration.h
    M src/dsymbol.h
    M src/expression.c
    M src/template.h
    M test/runnable/aliasthis.d
    M test/runnable/xtest46.d

  Log Message:
  -----------
  Fix broken master

2.065 branch does not have its own changes - all of commits should be
(modified) cherry-picks. So, the merge result should be exact same as the
git-head.


  Commit: 371595b2c8b1e3442d046476988a5050a01ab763
      https://github.com/D-Programming-Language/dmd/commit/371595b2c8b1e3442d046476988a5050a01ab763
  Author: AndrewEdwards <edwards.ac at gmail.com>
  Date:   2014-02-27 (Thu, 27 Feb 2014)

  Changed paths:
    M src/attrib.c
    M src/cast.c
    M src/declaration.h
    M src/dsymbol.h
    M src/expression.c
    M src/template.h
    M test/runnable/aliasthis.d
    M test/runnable/xtest46.d

  Log Message:
  -----------
  Merge pull request #3341 from 9rnsr/master

Fix broken master


Compare: https://github.com/D-Programming-Language/dmd/compare/8b8591aed46e...371595b2c8b1