boost/ublas
2
0
Fork 0
mirror of https://github.com/boostorg/ublas.git synced 2026-02-14 01:02:16 +00:00
Code Issues Projects Releases Wiki Activity

Changed Macro defaults for GCC ICC and MSVC awaiting regression results

Browse Source 
svn path=/trunk/boost/boost/numeric/ublas/; revision=24404
This commit is contained in:
Michael Stevens
2004-08-11 13:50:19 +00:00
parent 3ee4ec229b
commit 89699f93f6
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/boost/numeric/ublas/config.hpp
View File

@@ -69,6 +69,7 @@
#define BOOST_UBLAS_NO_LONG_DOUBLE
#ifdef NDEBUG
//TODO Make these MSVC version specific if appropriate
// MSVC has special inlining options
#pragma inline_recursion (on)
#pragma inline_depth (255)
@@ -104,12 +105,12 @@
// One of these workarounds is needed for MSVC 7.1 AFAIK
// (thanks to John Maddock and Martin Lauer).
// The second workaround looks like BOOST_UBLAS_QUALIFIED_TYPENAME.
#if !(defined(BOOST_UBLAS_NO_NESTED_CLASS_RELATION) || defined(BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION))
#define BOOST_UBLAS_NO_NESTED_CLASS_RELATION
// #define BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION
#endif
#endif
#endif
@@ -120,12 +121,12 @@
#define BOOST_UBLAS_USING using
#define BOOST_UBLAS_USE_STREAM
// GCC 2.95.3 allows to use iterator_base_traits.
// GCC allows to use iterator_base_traits.
#define BOOST_UBLAS_USE_ITERATOR_BASE_TRAITS
// GCC 2.95.3 needs BOOST_UBLAS_REVERSE_ITERATOR_OVERLOADS (this seems to be arguable).
#define BOOST_UBLAS_REVERSE_ITERATOR_OVERLOADS
#if __GNUC__ <= 2 && __GNUC_MINOR__ <= 95
// GCC 2.95.3 needs BOOST_UBLAS_REVERSE_ITERATOR_OVERLOADS (this seems to be arguable).
#define BOOST_UBLAS_REVERSE_ITERATOR_OVERLOADS
#define BOOST_UBLAS_NO_MEMBER_FRIENDS
#define BOOST_UBLAS_NO_PROXY_SHORTCUTS
#endif
@@ -152,11 +153,15 @@
#define BOOST_UBLAS_USING using
#define BOOST_UBLAS_USE_STREAM
//TODO When is this true?
// ICC sometimes needs qualified type names.
#define BOOST_UBLAS_QUALIFIED_TYPENAME
//#define BOOST_UBLAS_QUALIFIED_TYPENAME
#define BOOST_UBLAS_USE_SIMD
// ICC allows to use iterator_base_traits.
#define BOOST_UBLAS_USE_ITERATOR_BASE_TRAITS
// Needed for ICC on Itanium?
#ifdef BOOST_UBLAS_ICC_DEFINE_SWAP
namespace boost { namespace numeric { namespace ublas {
template<class C, class IC>
@@ -171,7 +176,6 @@ namespace boost { namespace numeric { namespace ublas {
namespace std {
// Needed for Intel on Itanium?
template<class C, class IC>
inline
void iter_swap (boost::numeric::ublas::indexed_iterator<C, IC> it1,
@@ -191,6 +195,7 @@ namespace std {
}
}
#endif
#endif