Subject: [Boost-commit] svn:boost r66166 - branches/release/boost/detail
From: hartmut.kaiser_at_[hidden]
Date: 2010-10-24 18:24:55
Author: hkaiser
Date: 2010-10-24 18:24:54 EDT (Sun, 24 Oct 2010)
New Revision: 66166
URL: http://svn.boost.org/trac/boost/changeset/66166
Log:
Merging from trunk
Text files modified:
branches/release/boost/detail/sp_typeinfo.hpp | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
Modified: branches/release/boost/detail/sp_typeinfo.hpp
==============================================================================
--- branches/release/boost/detail/sp_typeinfo.hpp (original)
+++ branches/release/boost/detail/sp_typeinfo.hpp 2010-10-24 18:24:54 EDT (Sun, 24 Oct 2010)
@@ -74,7 +74,13 @@
}
};
+#if defined(__SUNPRO_CC)
+// see #4199, the Sun Studio compiler gets confused about static initialization
+// constructor arguments. But an assignment works just fine.
template<class T> sp_typeinfo sp_typeid_< T >::ti_ = sp_typeid_< T >::name();
+#else
+template<class T> sp_typeinfo sp_typeid_< T >::ti_(sp_typeid_< T >::name());
+#endif
template<class T> struct sp_typeid_< T & >: sp_typeid_< T >
{