mirror of https://github.com/CGAL/cgal
Port to g++ 4.1.2
This commit is contained in:
parent
2c8cd4f7b3
commit
f90fa90e3e
|
|
@ -488,7 +488,7 @@ void CPoissonDoc::update_status()
|
||||||
// write message to cerr
|
// write message to cerr
|
||||||
std::cerr << "=> " << points << " (" << selected_points << "), "
|
std::cerr << "=> " << points << " (" << selected_points << "), "
|
||||||
<< (CGAL::Memory_sizer().virtual_size()>>20) << " Mb allocated, "
|
<< (CGAL::Memory_sizer().virtual_size()>>20) << " Mb allocated, "
|
||||||
<< "largest free block=" << (long(taucs_available_memory_size())>>20) << " Mb, "
|
<< "largest free block=" << long(taucs_available_memory_size()/1048576.0) << " Mb, "
|
||||||
<< "#blocks over 100 Mb=" << CGAL::Peak_memory_sizer().count_free_memory_blocks(100*1048576)
|
<< "#blocks over 100 Mb=" << CGAL::Peak_memory_sizer().count_free_memory_blocks(100*1048576)
|
||||||
<< std::endl;
|
<< std::endl;
|
||||||
|
|
||||||
|
|
@ -510,7 +510,7 @@ void CPoissonDoc::update_status()
|
||||||
// write message to cerr
|
// write message to cerr
|
||||||
std::cerr << "=> " << vertices << ", " << tets << ", "
|
std::cerr << "=> " << vertices << ", " << tets << ", "
|
||||||
<< (CGAL::Memory_sizer().virtual_size()>>20) << " Mb allocated, "
|
<< (CGAL::Memory_sizer().virtual_size()>>20) << " Mb allocated, "
|
||||||
<< "largest free block=" << (long(taucs_available_memory_size())>>20) << " Mb, "
|
<< "largest free block=" << long(taucs_available_memory_size()/1048576.0) << " Mb, "
|
||||||
<< "#blocks over 100 Mb=" << CGAL::Peak_memory_sizer().count_free_memory_blocks(100*1048576)
|
<< "#blocks over 100 Mb=" << CGAL::Peak_memory_sizer().count_free_memory_blocks(100*1048576)
|
||||||
<< std::endl;
|
<< std::endl;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -48,7 +48,7 @@ struct Peak_memory_sizer : public Memory_sizer
|
||||||
size_type count = blocks.size();
|
size_type count = blocks.size();
|
||||||
|
|
||||||
// Free large memory blocks
|
// Free large memory blocks
|
||||||
for (int i=0; i<count; i++)
|
for (size_type i=0; i<count; i++)
|
||||||
free(blocks[i]);
|
free(blocks[i]);
|
||||||
|
|
||||||
return count;
|
return count;
|
||||||
|
|
|
||||||
|
|
@ -649,7 +649,7 @@ public:
|
||||||
|
|
||||||
CGAL_TRACE(" %ld Mb allocated, largest free memory block=%ld Mb, #blocks over 100 Mb=%ld\n",
|
CGAL_TRACE(" %ld Mb allocated, largest free memory block=%ld Mb, #blocks over 100 Mb=%ld\n",
|
||||||
long(CGAL::Memory_sizer().virtual_size())>>20,
|
long(CGAL::Memory_sizer().virtual_size())>>20,
|
||||||
long(taucs_available_memory_size())>>20,
|
long(taucs_available_memory_size()/1048576.0),
|
||||||
long(CGAL::Peak_memory_sizer().count_free_memory_blocks(100*1048576)));
|
long(CGAL::Peak_memory_sizer().count_free_memory_blocks(100*1048576)));
|
||||||
CGAL_TRACE(" Create matrix\n");
|
CGAL_TRACE(" Create matrix\n");
|
||||||
|
|
||||||
|
|
@ -692,7 +692,7 @@ public:
|
||||||
|
|
||||||
CGAL_TRACE(" %ld Mb allocated, largest free memory block=%ld Mb, #blocks over 100 Mb=%ld\n",
|
CGAL_TRACE(" %ld Mb allocated, largest free memory block=%ld Mb, #blocks over 100 Mb=%ld\n",
|
||||||
long(CGAL::Memory_sizer().virtual_size())>>20,
|
long(CGAL::Memory_sizer().virtual_size())>>20,
|
||||||
long(taucs_available_memory_size())>>20,
|
long(taucs_available_memory_size()/1048576.0),
|
||||||
long(CGAL::Peak_memory_sizer().count_free_memory_blocks(100*1048576)));
|
long(CGAL::Peak_memory_sizer().count_free_memory_blocks(100*1048576)));
|
||||||
CGAL_TRACE(" Choleschy factorization\n");
|
CGAL_TRACE(" Choleschy factorization\n");
|
||||||
|
|
||||||
|
|
@ -709,8 +709,8 @@ public:
|
||||||
|
|
||||||
CGAL_TRACE(" %ld Mb allocated, largest free memory block=%ld Mb, #blocks over 100 Mb=%ld\n",
|
CGAL_TRACE(" %ld Mb allocated, largest free memory block=%ld Mb, #blocks over 100 Mb=%ld\n",
|
||||||
long(CGAL::Memory_sizer().virtual_size())>>20,
|
long(CGAL::Memory_sizer().virtual_size())>>20,
|
||||||
long(taucs_available_memory_size())>>20,
|
long(taucs_available_memory_size()/1048576.0),
|
||||||
CGAL::Peak_memory_sizer().count_free_memory_blocks(100*1048576));
|
long(CGAL::Peak_memory_sizer().count_free_memory_blocks(100*1048576)));
|
||||||
CGAL_TRACE(" Direct solve by forward and backward substitution\n");
|
CGAL_TRACE(" Direct solve by forward and backward substitution\n");
|
||||||
|
|
||||||
// Direct solve by forward and backward substitution
|
// Direct solve by forward and backward substitution
|
||||||
|
|
@ -743,7 +743,7 @@ public:
|
||||||
|
|
||||||
CGAL_TRACE(" %ld Mb allocated, largest free memory block=%ld Mb, #blocks over 100 Mb=%ld\n",
|
CGAL_TRACE(" %ld Mb allocated, largest free memory block=%ld Mb, #blocks over 100 Mb=%ld\n",
|
||||||
long(CGAL::Memory_sizer().virtual_size())>>20,
|
long(CGAL::Memory_sizer().virtual_size())>>20,
|
||||||
long(taucs_available_memory_size())>>20,
|
long(taucs_available_memory_size()/1048576.0),
|
||||||
long(CGAL::Peak_memory_sizer().count_free_memory_blocks(100*1048576)));
|
long(CGAL::Peak_memory_sizer().count_free_memory_blocks(100*1048576)));
|
||||||
CGAL_TRACE("End of solve_poisson()\n");
|
CGAL_TRACE("End of solve_poisson()\n");
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue