complie fix

[lyx.git] / boost / boost / crc.hpp

diff --git a/boost/boost/crc.hpp b/boost/boost/crc.hpp
index d7bff778f8cd1a719583a84c066d25a465c1937f..272482964ffb896b2d95942272d765a056f8759e 100644 (file)
--- a/boost/boost/crc.hpp
+++ b/boost/boost/crc.hpp
@@ -23,7 +23,7 @@
 // on the CRC's bit count.  This macro expresses that type in a compact
 // form, but also allows an alternate type for compilers that don't support
 // dependent types (in template value-parameters).
-#ifndef BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS
+#if !(defined(BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS) || (defined(BOOST_MSVC) && (BOOST_MSVC <= 1300)))
 #define BOOST_CRC_PARM_TYPE  typename ::boost::uint_t<Bits>::fast
 #else
 #define BOOST_CRC_PARM_TYPE  unsigned long
@@ -280,15 +280,10 @@ namespace detail
         typedef typename base_type::least  least;
         typedef typename base_type::fast   fast;
 
-#ifdef __DECCXX
-           static const least high_bit = 1ul << (Bits - 1u);
-           static const fast high_bit_fast = 1ul << (Bits - 1u);
-#else
         BOOST_STATIC_CONSTANT( least, high_bit = (least( 1u ) << ( Bits
          - 1u )) );
         BOOST_STATIC_CONSTANT( fast, high_bit_fast = (fast( 1u ) << ( Bits
          - 1u )) );
-#endif
 
     };  // boost::detail::high_uint_t
 
@@ -345,11 +340,7 @@ namespace detail
         BOOST_STATIC_CONSTANT( fast, high_bit_fast = base_type::high_bit_fast );
         #endif
 
-#ifdef __DECCXX
-           static const least sig_bits = (~( ~(0ul) << Bits));
-#else
         BOOST_STATIC_CONSTANT( least, sig_bits = (~( ~(least( 0u )) << Bits )) );
-#endif
         BOOST_STATIC_CONSTANT( fast, sig_bits_fast = fast(sig_bits) );
 
     };  // boost::detail::mask_uint_t
@@ -457,7 +448,13 @@ namespace detail
 
         typedef mask_uint_t<Bits>            masking_type;
         typedef typename masking_type::fast  value_type;
+#if defined(__BORLANDC__) && defined(_M_IX86) && (__BORLANDC__ == 0x560)
+        // for some reason Borland's command line compiler (version 0x560)
+        // chokes over this unless we do the calculation for it: 
+        typedef value_type                   table_type[ 0x100 ];
+#else
         typedef value_type                   table_type[ byte_combos ];
+#endif
 
         static  void  init_table();
 
@@ -1068,3 +1065,4 @@ augmented_crc
 
 
 #endif  // BOOST_CRC_HPP
+