Fix C++ header regressions

Author: kinke

dmd/aggregate.h

@@ -283,6 +283,7 @@ class ClassDeclaration : public AggregateDeclaration
 #endif
 
     static ClassDeclaration *create(Loc loc, Identifier *id, BaseClasses *baseclasses, Dsymbols *members, bool inObject);
+    const char *toPrettyChars(bool QualifyTypes = false);
     Dsymbol *syntaxCopy(Dsymbol *s);
     Scope *newScope(Scope *sc);
     bool isBaseOf2(ClassDeclaration *cd);

dmd/objc.h

@@ -52,6 +52,7 @@ struct ObjcFuncDeclaration
 {
     ObjcSelector* selector;
     VarDeclaration* selectorParameter;
+    bool isOptional;
 };
 
 class Objc

gen/toir.cpp

@@ -2161,7 +2161,7 @@ class ToElemVisitor : public Visitor {
     genFuncLiteral(fd, e);
     LLFunction *callee = DtoCallee(fd, false);
 
-    if (e->type->ty == Tdelegate) {
+    if (fd->isNested()) {
       LLType *dgty = DtoType(e->type);
 
       LLValue *cval = DtoNestedContext(e->loc, fd);