commit 17d35c36fbae764fcd68fa8b31624078a033aabc
author Joao Matos <ripzonetriton@gmail.com> Fri Aug 31 22:18:20 2012 +0000
committer Joao Matos <ripzonetriton@gmail.com> Fri Aug 31 22:18:20 2012 +0000
tree c7f4eba284b64b1ad1bb5bcf269d7354efdae818
parent 7aaa167abba495ecb0e99eb4f2fa155cf28c798d

Normalize line endings of r163013 (part 2).

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@163032 91177308-0d34-0410-b5e6-96231b3b80d8

lib/AST/DeclCXX.cpp

diff --git a/lib/AST/DeclCXX.cpp b/lib/AST/DeclCXX.cpp
index c68a16b..d2549ee 100644
--- a/lib/AST/DeclCXX.cpp
+++ b/lib/AST/DeclCXX.cpp
@@ -463,14 +463,14 @@
 }
 
 void CXXRecordDecl::addedMember(Decl *D) {
-  if (!D->isImplicit() &&

-      !isa<FieldDecl>(D) &&

-      !isa<IndirectFieldDecl>(D) &&

-      (!isa<TagDecl>(D) || cast<TagDecl>(D)->getTagKind() == TTK_Class ||

-        cast<TagDecl>(D)->getTagKind() == TTK_Interface))

-    data().HasOnlyCMembers = false;

-

-  // Ignore friends and invalid declarations.

+  if (!D->isImplicit() &&
+      !isa<FieldDecl>(D) &&
+      !isa<IndirectFieldDecl>(D) &&
+      (!isa<TagDecl>(D) || cast<TagDecl>(D)->getTagKind() == TTK_Class ||
+        cast<TagDecl>(D)->getTagKind() == TTK_Interface))
+    data().HasOnlyCMembers = false;
+
+  // Ignore friends and invalid declarations.
   if (D->getFriendObjectKind() || D->isInvalidDecl())
     return;
   
@@ -934,14 +934,14 @@
     if (Shadow->getDeclName().getNameKind()
           == DeclarationName::CXXConversionFunctionName)
       data().Conversions.addDecl(Shadow, Shadow->getAccess());
-}

-

-bool CXXRecordDecl::isCLike() const {

-  if (getTagKind() == TTK_Class || getTagKind() == TTK_Interface ||

-      !TemplateOrInstantiation.isNull())

-    return false;

-  if (!hasDefinition())

-    return true;

+}
+
+bool CXXRecordDecl::isCLike() const {
+  if (getTagKind() == TTK_Class || getTagKind() == TTK_Interface ||
+      !TemplateOrInstantiation.isNull())
+    return false;
+  if (!hasDefinition())
+    return true;
 
   return isPOD() && data().HasOnlyCMembers;
 }

lib/AST/MicrosoftMangle.cpp

diff --git a/lib/AST/MicrosoftMangle.cpp b/lib/AST/MicrosoftMangle.cpp
index f0041b2..bf72b50 100644
--- a/lib/AST/MicrosoftMangle.cpp
+++ b/lib/AST/MicrosoftMangle.cpp
@@ -1270,13 +1270,13 @@
 void MicrosoftCXXNameMangler::mangleType(const TagType *T) {
   switch (T->getDecl()->getTagKind()) {
     case TTK_Union:
-      Out << 'T';

-      break;

-    case TTK_Struct:

-    case TTK_Interface:

-      Out << 'U';

-      break;

-    case TTK_Class:

+      Out << 'T';
+      break;
+    case TTK_Struct:
+    case TTK_Interface:
+      Out << 'U';
+      break;
+    case TTK_Class:
       Out << 'V';
       break;
     case TTK_Enum: