[Pingus-CVS] r3906 - trunk/pingus/src/display

[grumbel at BerliOS]

Author: grumbel
Date: 2008-07-27 03:41:38 +0200 (Sun, 27 Jul 2008)
New Revision: 3906

Modified:
   trunk/pingus/src/display/rect_merger.cpp
Log:
Comment out unportable assert()s

Modified: trunk/pingus/src/display/rect_merger.cpp
===================================================================
--- trunk/pingus/src/display/rect_merger.cpp    2008-07-27 01:39:41 UTC (rev 
3905)
+++ trunk/pingus/src/display/rect_merger.cpp    2008-07-27 01:41:38 UTC (rev 
3906)
@@ -14,7 +14,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <ext/algorithm>
+//#include <ext/algorithm>
 #include <assert.h>
 #include <iostream>
 #include "../math/vector2i.hpp"
@@ -141,7 +141,7 @@
  */
 void split_rectangles(const std::vector<Rect>& rects, std::vector<Row>& rows)
 {
-  assert(__gnu_cxx::is_sorted(rects.begin(), rects.end(), rect_y_sorter));
+  //assert(__gnu_cxx::is_sorted(rects.begin(), rects.end(), rect_y_sorter));
 
   std::vector<Rect>::const_iterator rect = rects.begin();
   for(std::vector<Row>::iterator row = rows.begin(); row != rows.end(); ++row)
@@ -237,7 +237,7 @@
 */
 void merge_vertical_rectangles(const std::vector<Rect>& rects, 
std::vector<Rect>& rects_out)
 {  
-  assert(__gnu_cxx::is_sorted(rects.begin(), rects.end(), rect_xy_sorter));
+  //assert(__gnu_cxx::is_sorted(rects.begin(), rects.end(), rect_xy_sorter));
   assert(!rects.empty());
   
   Rect rect = rects.front();