mdds/mdds_0.5.3.patch

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