From 0711416b471b8986d053407f69ac0ec60446b07c Mon Sep 17 00:00:00 2001
From: Todd Fiala <todd.fiala@gmail.com>
Date: Wed, 10 Aug 2016 01:37:27 +0000
Subject: [PATCH] Undid LLVM macro usage in test suite test subject files.

llvm-svn: 278197
---
 .../lldbsuite/test/functionalities/breakpoint/cpp/main.cpp | 14 +++++++-------
 .../Python/lldbsuite/test/lang/cpp/diamond/main.cpp        |  8 ++++----
 .../Python/lldbsuite/test/lang/cpp/virtual/main.cpp        | 14 +++++++-------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/main.cpp
index 72ceb64..01f6791 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/main.cpp
@@ -16,15 +16,15 @@ namespace a {
         ~c();
         void func1() 
         {
-            puts (LLVM_PRETTY_FUNCTION);
+            puts (__PRETTY_FUNCTION__);
         }
         void func2() 
         {
-            puts (LLVM_PRETTY_FUNCTION);
+            puts (__PRETTY_FUNCTION__);
         }
         void func3() 
         {
-            puts (LLVM_PRETTY_FUNCTION);
+            puts (__PRETTY_FUNCTION__);
         }
     };
 
@@ -39,11 +39,11 @@ namespace b {
         ~c();
         void func1() 
         {
-            puts (LLVM_PRETTY_FUNCTION);
+            puts (__PRETTY_FUNCTION__);
         }
         void func3() 
         {
-            puts (LLVM_PRETTY_FUNCTION);
+            puts (__PRETTY_FUNCTION__);
         }
     };
 
@@ -58,11 +58,11 @@ namespace c {
         ~d() {}
         void func2() 
         {
-            puts (LLVM_PRETTY_FUNCTION);
+            puts (__PRETTY_FUNCTION__);
         }
         void func3() 
         {
-            puts (LLVM_PRETTY_FUNCTION);
+            puts (__PRETTY_FUNCTION__);
         }
     };
 }
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/main.cpp
index 8065057..bfe098a 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/main.cpp
@@ -17,7 +17,7 @@ public:
     virtual ~VBase() {}
     void Print() 
     {
-        printf("%p: %s\n%p: m_value = 0x%8.8x\n", this, LLVM_PRETTY_FUNCTION, &m_value, m_value);
+        printf("%p: %s\n%p: m_value = 0x%8.8x\n", this, __PRETTY_FUNCTION__, &m_value, m_value);
     }
     int m_value;
 };
@@ -28,7 +28,7 @@ public:
     Derived1() {};
     void Print ()
     {
-        printf("%p: %s\n", this, LLVM_PRETTY_FUNCTION);
+        printf("%p: %s\n", this, __PRETTY_FUNCTION__);
         VBase::Print();
     }
 
@@ -41,7 +41,7 @@ public:
     
     void Print ()
     {
-        printf("%p: %s\n", this, LLVM_PRETTY_FUNCTION);
+        printf("%p: %s\n", this, __PRETTY_FUNCTION__);
         VBase::Print();
     }
 };
@@ -56,7 +56,7 @@ public:
     {
         printf("%p: %s \n%p: m_joiner1 = 0x%8.8x\n%p: m_joiner2 = 0x%8.8x\n",
                this,
-               LLVM_PRETTY_FUNCTION,
+               __PRETTY_FUNCTION__,
                &m_joiner1,
                m_joiner1,
                &m_joiner2,
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual/main.cpp
index 04c665d..0adf415 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual/main.cpp
@@ -10,17 +10,17 @@ public:
     
     virtual const char * a()
     {
-        return LLVM_PRETTY_FUNCTION;
+        return __PRETTY_FUNCTION__;
     }
 
     virtual const char * b()
     {
-        return LLVM_PRETTY_FUNCTION;
+        return __PRETTY_FUNCTION__;
     }
 
     virtual const char * c()
     {
-        return LLVM_PRETTY_FUNCTION;
+        return __PRETTY_FUNCTION__;
     }
 protected:
     char m_pad;
@@ -34,7 +34,7 @@ public:
 
     virtual const char * aa()
     {
-        return LLVM_PRETTY_FUNCTION;
+        return __PRETTY_FUNCTION__;
     }
   
 protected:
@@ -50,12 +50,12 @@ public:
     
     virtual const char * a()
     {
-        return LLVM_PRETTY_FUNCTION;
+        return __PRETTY_FUNCTION__;
     }
 
     virtual const char * b()
     {
-        return LLVM_PRETTY_FUNCTION;
+        return __PRETTY_FUNCTION__;
     }
 protected:
     char m_pad;
@@ -70,7 +70,7 @@ public:
     
     virtual const char * a()
     {
-        return LLVM_PRETTY_FUNCTION;
+        return __PRETTY_FUNCTION__;
     }
 protected:
     char m_pad;
-- 
2.7.4