Revert r163829. The world (or libstdc++, at least) is not ready.

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

1 files changed, 2 insertions, 2 deletions

diff --git a/test/CodeGenCXX/mangle.cpp b/test/CodeGenCXX/mangle.cpp
index b384d2ea13..ba1b3bf5ac 100644
--- a/test/CodeGenCXX/mangle.cpp
+++ b/test/CodeGenCXX/mangle.cpp
@@ -181,7 +181,7 @@ template <typename T> typename T::U ft6(const T&) { return 0; }
 template int ft6<S>(const S&);
 
 template<typename> struct __is_scalar_type {
-  static const bool __value = true;
+  enum { __value = 1 };
 };
 
 template<bool, typename> struct __enable_if { };
@@ -231,7 +231,7 @@ template void ft8<void*>();
 // PR5796
 namespace PR5796 {
 template<typename> struct __is_scalar_type {
-  static const bool __value = false;
+  enum { __value = 0 };
 };
 
 template<bool, typename> struct __enable_if {};