LLVM header files cause parse errors when compiling Objective-C++/Cocoa project

[llvmbot]

Bugzilla Link	15079
Version	3.2
OS	MacOS X
Reporter	LLVM Bugzilla Contributor

Extended Description

Objective-C++ code that includes both the Cocoa framework and the LLVM header files fails to compile. The problem is that certain function and variable names in the C++ LLVM source code conflict with macros defined on the Objective-C side.

• CommandLine.h: The variable NO conflicts with Objective-C's NO macro.

• CommandLine.h: The function check conflicts with the check macro in AssertMacros.h.

• IntegersSubsetMapping.h: The function verify conflicts with the verify macro in AssertMacros.h.

For a workaround, see http://stackoverflow.com/questions/14527423/including-c-header-files-in-objective-c-when-they-conflict-with-objective-c

In addition to fixing these individual errors, maybe using LLVM in an Objective-C++/Cocoa project could be added to the test process.

[llvmbot]

I don't see a file IntegersSubsetMapping.h in current trunk, so I think my earlier patch completely addresses this bug.

[llvmbot]

Patch CommandLine.h to allow inclusion within ObjC++ .mm files. I've checked that this doesn't introduce any regressions with 'make check-all'.