external/mdds/mdds_0.6.0.patch

   1 --- misc/mdds_0.6.0/include/mdds/mixed_type_matrix_def.inl      2011-07-13 13:26:27.000000000 -0600
   2 +++ misc/build/mdds_0.6.0/include/mdds/mixed_type_matrix_def.inl        2011-07-20 02:02:21.164198900 -0600
   3 @@ -216,8 +216,8 @@
   4          // assignment to self.
   5          return;
   6
   7 -    size_t row_count = ::std::min(mp_storage->rows(), r.mp_storage->rows());
   8 -    size_t col_count = ::std::min(mp_storage->cols(), r.mp_storage->cols());
   9 +    size_t row_count = (::std::min)(mp_storage->rows(), r.mp_storage->rows());
  10 +    size_t col_count = (::std::min)(mp_storage->cols(), r.mp_storage->cols());
  11      for (size_t i = 0; i < row_count; ++i)
  12          for (size_t j = 0; j < col_count; ++j)
  13              mp_storage->get_element(i, j) = r.mp_storage->get_element(i, j);
  14 --- misc/mdds_0.6.0/include/mdds/mixed_type_matrix_storage_filled_linear.inl    2011-07-13 13:26:27.000000000 -0600
  15 +++ misc/build/mdds_0.6.0/include/mdds/mixed_type_matrix_storage_filled_linear.inl      2011-07-20 02:02:21.179798900 -0600
  16 @@ -354,8 +354,8 @@
  17          }
  18
  19          array_type new_array(new_size, &m_init_elem);
  20 -        size_t min_rows = ::std::min(row, m_rows);
  21 -        size_t min_cols = ::std::min(col, m_cols);
  22 +        size_t min_rows = (::std::min)(row, m_rows);
  23 +        size_t min_cols = (::std::min)(col, m_cols);
  24          for (size_t i = 0; i < min_rows; ++i)
  25          {
  26              for (size_t j = 0; j < min_cols; ++j)
  27 @@ -612,8 +612,8 @@
  28          }
  29
  30          array_type new_array(new_size, element(0.0));
  31 -        size_t min_rows = ::std::min(row, m_rows);
  32 -        size_t min_cols = ::std::min(col, m_cols);
  33 +        size_t min_rows = (::std::min)(row, m_rows);
  34 +        size_t min_cols = (::std::min)(col, m_cols);
  35          for (size_t i = 0; i < min_rows; ++i)
  36          {
  37              for (size_t j = 0; j < min_cols; ++j)
  38 --- misc/mdds_0.6.0/include/mdds/point_quad_tree.hpp    2011-07-13 13:26:27.000000000 -0600
  39 +++ misc/build/mdds_0.6.0/include/mdds/point_quad_tree.hpp      2011-07-20 02:04:36.088835900 -0600
  40 @@ -623,10 +623,10 @@
  41  template<typename _Key, typename _Data>
  42  void point_quad_tree<_Key,_Data>::insert(key_type x, key_type y, data_type data)
  43  {
  44 -    m_xrange.first  = ::std::min(m_xrange.first,  x);
  45 -    m_xrange.second = ::std::max(m_xrange.second, x);
  46 -    m_yrange.first  = ::std::min(m_yrange.first,  y);
  47 -    m_yrange.second = ::std::max(m_yrange.second, y);
  48 +    m_xrange.first  = (::std::min)(m_xrange.first,  x);
  49 +    m_xrange.second = (::std::max)(m_xrange.second, x);
  50 +    m_yrange.first  = (::std::min)(m_yrange.first,  y);
  51 +    m_yrange.second = (::std::max)(m_yrange.second, y);
  52
  53      if (!m_root)
  54      {