Revert "fix commit"

This reverts commit 55b9435a12d5cd16d51ce1f0426fb8fb643a41f6.

Mesh/Voronoi3D.cpp

@@ -3,19 +3,15 @@
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
 
+#include "voro++.hh"
 #include "Voronoi3D.h"
 #include "GModel.h"
 #include "MElement.h"
 #include "meshGRegion.h"
 #include <fstream>
 #include "Levy3D.h"
-#if defined(HAVE_Voro3D)
-#include "voro++.hh"
-#endif
 
-#if defined(HAVE_Voro3D)
 using namespace voro;
-#endif
 
 /*********class clip*********/
 
@@ -76,7 +72,6 @@ void clip::execute(GRegion* gr){
 }
 
 void clip::execute(std::vector<SPoint3>& vertices,std::vector<VoronoiElement>& clipped){
-#if defined(HAVE_Voro3D)
   int i;
   int j;
   int start;
@@ -270,9 +265,6 @@ void clip::execute(std::vector<SPoint3>& vertices,std::vector<VoronoiElement>& c
   //printf("%f %f\n",volume1,volume2);
 	
   for(i=0;i<pointers.size();i++) delete pointers[i];
-#else
-  Msg::Error("Gmsh needs to be compiled with Voro3D to use clip");
-#endif
 }
 
 double clip::min(double a,double b){

Mesh/meshMetric.cpp

@@ -171,7 +171,7 @@ void meshMetric::exportInfo(const char * fileendname){
 
 meshMetric::~meshMetric(){
   if (_octree) delete _octree;
-  for (unsigned int i = 0; i < _elements.size(); i++)
+  for (int i=0; i< _elements.size(); i++)
     delete _elements[i];
 }
 

Mesh/periodical.cpp

@@ -3,19 +3,15 @@
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
 
+#include "voro++.hh"
 #include "periodical.h"
 #include "GModel.h"
 #include "meshGRegion.h"
 #include <fstream>
 #include <algorithm>
 #include "MElement.h"
-#if defined(HAVE_Voro3D)
-#include "voro++.hh"
-#endif
 
-#if defined(HAVE_Voro3D)
 using namespace voro;
-#endif
 
 /*********class voroMetal3D*********/
 
@@ -62,7 +58,6 @@ void voroMetal3D::execute(GRegion* gr){
 }
 
 void voroMetal3D::execute(std::vector<SPoint3>& vertices){
-#if defined(HAVE_Voro3D)
   int i;
   int j;
   int start;
@@ -149,9 +144,6 @@ void voroMetal3D::execute(std::vector<SPoint3>& vertices){
   file << "};\n";
   	
   for(i=0;i<pointers.size();i++) delete pointers[i];
-#else
-  Msg::Error("Gmsh needs to be compiled with Voro3D to use voroMetal3D");
-#endif
 }
 
 void voroMetal3D::print_segment(SPoint3 p1,SPoint3 p2,std::ofstream& file){

Mesh/simple3D.cpp

@@ -9,9 +9,7 @@
 #include "MElementOctree.h"
 #include "meshGRegion.h"
 #include <queue>
-#if defined(HAVE_RTREE)
 #include "rtree.h"
-#endif
 #include <fstream>
 
 #define k1 0.7 //k1*h is the minimal distance between two nodes
@@ -327,7 +325,6 @@ void Filler::treat_model(){
 }
 
 void Filler::treat_region(GRegion* gr){
-#if defined(HAVE_RTREE)
   int i,j;
   int count;
   bool ok;
@@ -436,9 +433,6 @@ void Filler::treat_region(GRegion* gr){
   for(i=0;i<garbage.size();i++) delete garbage[i];
   for(i=0;i<new_vertices.size();i++) delete new_vertices[i];
   new_vertices.clear();
-#else
-  Msg::Error("Gmsh needs to be compiled with rtree to use Filler::treat_region");
-#endif
 }
 
 Metric Filler::get_metric(double x,double y,double z){