[cfe-commits] [libcxxabi] r149538 - in /libcxxabi/trunk/src: private_typeinfo.cpp private_typeinfo.h

[Howard Hinnant]

Author: hhinnant
Date: Wed Feb  1 15:08:30 2012
New Revision: 149538

URL: http://llvm.org/viewvc/llvm-project?rev=149538&view=rev
Log:
Removed DEBUG statements.

Modified:
    libcxxabi/trunk/src/private_typeinfo.cpp
    libcxxabi/trunk/src/private_typeinfo.h

Modified: libcxxabi/trunk/src/private_typeinfo.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/private_typeinfo.cpp?rev=149538&r1=149537&r2=149538&view=diff
==============================================================================
--- libcxxabi/trunk/src/private_typeinfo.cpp (original)
+++ libcxxabi/trunk/src/private_typeinfo.cpp Wed Feb  1 15:08:30 2012
@@ -9,10 +9,6 @@
 
 #include "private_typeinfo.h"
 
-#ifdef DEBUG
-#include <iostream>
-#endif
-
 namespace __cxxabiv1
 {
 
@@ -90,107 +86,6 @@
 
 #pragma GCC visibility push(hidden)
 
-#ifdef DEBUG
-
-void
-__fundamental_type_info::display() const
-{
-    std::cout << "__fundamental_type_info " << __type_name << '\n';
-}
-
-void
-__array_type_info::display() const
-{
-    std::cout << "__array_type_info " << __type_name << '\n';
-}
-
-void
-__function_type_info::display() const
-{
-    std::cout << "__function_type_info " << __type_name << '\n';
-}
-
-void
-__enum_type_info::display() const
-{
-    std::cout << "__enum_type_info " << __type_name << '\n';
-}
-
-void
-__class_type_info::display() const
-{
-    std::cout << "__class_type_info " << __type_name << '\n';
-}
-
-void
-__si_class_type_info::display() const
-{
-    std::cout << "__si_class_type_info " << __type_name << '\n';
-    std::cout << "derived from ";
-    __base_type->display();
-}
-
-void
-__vmi_class_type_info::display() const
-{
-    std::cout << "__vmi_class_type_info " << __type_name << '\n';
-    if (__flags & __non_diamond_repeat_mask)
-        std::cout << "__non_diamond_repeat_mask\n";
-    if (__flags & __diamond_shaped_mask)
-        std::cout << "__diamond_shaped_mask\n";
-    std::cout << "derived from\n";
-    for (const __base_class_type_info* p = __base_info; p < __base_info + __base_count; ++p)
-        p->display();
-}
-
-void
-__base_class_type_info::display() const
-{
-    if (__offset_flags & __public_mask)
-        std::cout << "public ";
-    __base_type->display();
-}
-
-void
-__pointer_type_info::display() const
-{
-    std::cout << "__pointer_type_info " << __type_name << '\n';
-    if (__flags & __const_mask)
-        std::cout << "const ";
-    if (__flags & __volatile_mask)
-        std::cout << "volatile ";
-    if (__flags & __restrict_mask)
-        std::cout << "restrict ";
-    if (__flags & __incomplete_mask)
-        std::cout << "__incomplete_mask ";
-    if (__flags & __incomplete_class_mask)
-        std::cout << "__incomplete_class_mask ";
-    std::cout << "pointer to ";
-    __pointee->display();
-}
-
-void
-__pointer_to_member_type_info::display() const
-{
-    std::cout << "__pointer_to_member_type_info " << __type_name << '\n';
-    if (__flags & __const_mask)
-        std::cout << "const ";
-    if (__flags & __volatile_mask)
-        std::cout << "volatile ";
-    if (__flags & __restrict_mask)
-        std::cout << "restrict ";
-    if (__flags & __incomplete_mask)
-        std::cout << "__incomplete_mask ";
-    if (__flags & __incomplete_class_mask)
-        std::cout << "__incomplete_class_mask ";
-    std::cout << "member pointer to class ";
-    __context->display();
-    std::cout << "and type ";
-    __pointee->display();
-}
-
-#endif
-
 // can_catch
 
 // A handler is a match for an exception object of type E if

Modified: libcxxabi/trunk/src/private_typeinfo.h
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/private_typeinfo.h?rev=149538&r1=149537&r2=149538&view=diff
==============================================================================
--- libcxxabi/trunk/src/private_typeinfo.h (original)
+++ libcxxabi/trunk/src/private_typeinfo.h Wed Feb  1 15:08:30 2012
@@ -25,9 +25,6 @@
     virtual ~__shim_type_info();
 
     virtual bool can_catch(const __shim_type_info* thrown_type, void*& adjustedPtr) const = 0;
-#ifdef DEBUG
-    virtual void display() const = 0;
-#endif
 };
 
 class __fundamental_type_info
@@ -36,9 +33,6 @@
 public:
     virtual ~__fundamental_type_info();
     virtual bool can_catch(const __shim_type_info*, void*&) const;
-#ifdef DEBUG
-    virtual void display() const;
-#endif
 };
 
 class __array_type_info
@@ -47,9 +41,6 @@
 public:
     virtual ~__array_type_info();
     virtual bool can_catch(const __shim_type_info*, void*&) const;
-#ifdef DEBUG
-    virtual void display() const;
-#endif
 };
 
 class __function_type_info
@@ -58,9 +49,6 @@
 public:
     virtual ~__function_type_info();
     virtual bool can_catch(const __shim_type_info*, void*&) const;
-#ifdef DEBUG
-    virtual void display() const;
-#endif
 };
 
 class __enum_type_info
@@ -69,9 +57,6 @@
 public:
     virtual ~__enum_type_info();
     virtual bool can_catch(const __shim_type_info*, void*&) const;
-#ifdef DEBUG
-    virtual void display() const;
-#endif
 };
 
 enum
@@ -146,9 +131,6 @@
     virtual void search_below_dst(__dynamic_cast_info*, const void*, int) const;
     virtual bool can_catch(const __shim_type_info*, void*&) const;
     virtual void has_unambiguous_public_base(__dynamic_cast_info*, void*, int) const;
-#ifdef DEBUG
-    virtual void display() const;
-#endif
 };
 
 // Has one non-virtual public base class at offset zero
@@ -163,9 +145,6 @@
     virtual void search_above_dst(__dynamic_cast_info*, const void*, const void*, int) const;
     virtual void search_below_dst(__dynamic_cast_info*, const void*, int) const;
     virtual void has_unambiguous_public_base(__dynamic_cast_info*, void*, int) const;
-#ifdef DEBUG
-    virtual void display() const;
-#endif
 };
 
 struct __base_class_type_info
@@ -184,9 +163,6 @@
     void search_above_dst(__dynamic_cast_info*, const void*, const void*, int) const;
     void search_below_dst(__dynamic_cast_info*, const void*, int) const;
     void has_unambiguous_public_base(__dynamic_cast_info*, void*, int) const;
-#ifdef DEBUG
-    void display() const;
-#endif
 };
 
 // Has one or more base classes
@@ -211,9 +187,6 @@
     virtual void search_above_dst(__dynamic_cast_info*, const void*, const void*, int) const;
     virtual void search_below_dst(__dynamic_cast_info*, const void*, int) const;
     virtual void has_unambiguous_public_base(__dynamic_cast_info*, void*, int) const;
-#ifdef DEBUG
-    virtual void display() const;
-#endif
 };
 
 class __pbase_type_info
@@ -242,9 +215,6 @@
 public:
     virtual ~__pointer_type_info();
     virtual bool can_catch(const __shim_type_info*, void*&) const;
-#ifdef DEBUG
-    virtual void display() const;
-#endif
 };
 
 class __pointer_to_member_type_info
@@ -254,9 +224,6 @@
     const __class_type_info* __context;
 
     virtual ~__pointer_to_member_type_info();
-#ifdef DEBUG
-    virtual void display() const;
-#endif
 };
 
 //#pragma GCC visibility pop