mirror of
https://github.com/boostorg/ublas.git
synced 2026-02-09 11:32:19 +00:00
remove minmax hack from win32.hpp and fix all places that could be affected by the minmax macros
svn path=/trunk/boost/boost/numeric/ublas/; revision=22394
This commit is contained in:
@@ -16,12 +16,13 @@
|
||||
|
||||
#include <boost/numeric/ublas/matrix.hpp>
|
||||
#include <boost/numeric/ublas/io.hpp>
|
||||
#include <boost/minmax.hpp>
|
||||
|
||||
int main () {
|
||||
using namespace boost::numeric::ublas;
|
||||
matrix<double> m1 (3, 3), m2 (3, 3);
|
||||
for (unsigned i = 0; i < std::min (m1.size1 (), m2.size1 ()); ++ i)
|
||||
for (unsigned j = 0; j < std::min (m1.size2 (), m2.size2 ()); ++ j)
|
||||
for (unsigned i = 0; i < std_min (m1.size1 (), m2.size1 ()); ++ i)
|
||||
for (unsigned j = 0; j < std_min (m1.size2 (), m2.size2 ()); ++ j)
|
||||
m1 (i, j) = m2 (i, j) = 3 * i + j;
|
||||
|
||||
std::cout << prod (m1, m2) << std::endl;
|
||||
|
||||
Reference in New Issue
Block a user