diff options
| author | Bruno Martinez <brunom@fing.edu.uy> | 2005-08-01 06:41:34 +0000 |
|---|---|---|
| committer | Murray Cumming <murrayc@src.gnome.org> | 2005-08-01 06:41:34 +0000 |
| commit | c5dd3a6300dbd75c9754f2ae9772d55a89722b10 (patch) | |
| tree | 1478e76e578e603fe816165d7a5f2fdf6be5e795 | |
| parent | 7429bde089905ac58e2aa3b5598e2519bea271b3 (diff) | |
| download | sigc++-c5dd3a6300dbd75c9754f2ae9772d55a89722b10.tar.gz | |
Renamed ::sigc::is_base_and_derived::internal to
2005-08-19 Bruno Martinez <brunom@fing.edu.uy>
* sigc++/type_traits.h: Renamed
::sigc::is_base_and_derived::internal to
::sigc::is_base_and_derived::internal_class
in order to avoid conflict with
namespace internal.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | sigc++/type_traits.h | 6 |
2 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,11 @@ +2005-08-19 Bruno Martinez <brunom@fing.edu.uy> + + * sigc++/type_traits.h: Renamed + ::sigc::is_base_and_derived::internal to + ::sigc::is_base_and_derived::internal_class + in order to avoid conflict with + namespace internal. + 2005-07-13 Murray Cumming <murrayc@murrayc.com> * docs/manual/libsigc_manual.xml: Correct mentions of diff --git a/sigc++/type_traits.h b/sigc++/type_traits.h index 56b27a9..b2c1a7e 100644 --- a/sigc++/type_traits.h +++ b/sigc++/type_traits.h @@ -104,10 +104,10 @@ private: //Allow the internal inner class to access the other (big) inner //class. The Tru64 compiler needs this. murrayc. - friend struct internal; + friend struct internal_class; //Certain compilers, notably GCC 3.2, require these functions to be inside an inner class. - struct internal + struct internal_class { static big is_base_class_(...); static char is_base_class_(typename type_trait<T_base>::pointer); @@ -115,7 +115,7 @@ private: public: static const bool value = - sizeof(internal::is_base_class_(reinterpret_cast<typename type_trait<T_derived>::pointer>(0))) == + sizeof(internal_class::is_base_class_(reinterpret_cast<typename type_trait<T_derived>::pointer>(0))) == sizeof(char); #else //SIGC_SELF_REFERENCE_IN_MEMBER_INITIALIZATION |