[Liblas-commits] hg: Update to previous commit - use unsinged long only as std::b...

[liblas-commits at liblas.org]

changeset 6be0995dc4fe in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=6be0995dc4fe
summary: Update to previous commit - use unsinged long only as std::bitset ctor input

diffstat:

 src/lasclassification.cpp |  13 -------------
 1 files changed, 0 insertions(+), 13 deletions(-)

diffs (24 lines):

diff -r b294d1f31d1f -r 6be0995dc4fe src/lasclassification.cpp
--- a/src/lasclassification.cpp	Thu Aug 26 22:15:44 2010 +0100
+++ b/src/lasclassification.cpp	Thu Aug 26 22:22:55 2010 +0100
@@ -106,20 +106,7 @@
 {
     bitset_type bits(m_flags);
     
-    // MSVC 2010 changed this to an unsigned long long, but did not 
-    // provide the old constructor for merely an unsigned long.  AFAIK
-    // there is only std::bitset<_Bits>::bitset(_ULonglong) and 
-    // std::bitset<_Bits>::bitset(int) here.  As an aside, I see no reason
-    // to have a mask any larger than std::bitset<_Bits>::bitset(int)
-#ifdef WIN32 
-#if (_MSC_VER >= 1600)
-    bitset_type const mask(static_cast<unsigned long long>(class_table_size) - 1);
-#else
     bitset_type const mask(static_cast<unsigned long>(class_table_size) - 1);
-#endif
-#else
-    bitset_type const mask(static_cast<unsigned long>(class_table_size) - 1);
-#endif
     bits &= mask;
 
     uint32_t const index = static_cast<uint32_t>(bits.to_ulong());