Make ivar rewrite C++ friendly (since C++ forces a unified namespace for...

Make ivar rewrite C++ friendly (since C++ forces a unified namespace for typedefs/structures). The previous version of the rewriter generated both a type def and structure def for each class (which doesn't fly in C++).

llvm-svn: 48266