From c40a49124afdbf1223357c2c0724271fab7dc873 Mon Sep 17 00:00:00 2001
From: Sylvain Thery <thery@unistra.fr>
Date: Wed, 30 Jul 2014 12:22:52 +0200
Subject: [PATCH] remove some warnings

---
 Apps/Examples/volumeExplorer.cpp            | 9 ++++-----
 include/Algo/Geometry/volume.hpp            | 2 +-
 include/Geometry/vector_gen.hpp             | 2 +-
 include/Topology/generic/attributeHandler.h | 2 +-
 src/Container/attributeContainer.cpp        | 2 +-
 src/Topology/generic/genericmap.cpp         | 4 ++--
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Apps/Examples/volumeExplorer.cpp b/Apps/Examples/volumeExplorer.cpp
index cbb6952f..023213b3 100644
--- a/Apps/Examples/volumeExplorer.cpp
+++ b/Apps/Examples/volumeExplorer.cpp
@@ -169,7 +169,6 @@ void MyQT::cb_Open()
 	color = myMap.addAttribute<VEC3, VOLUME, MAP>("color");
 
 	TraversorCell<MAP, VOLUME> tra(myMap);
-	float maxV = 0.0f;
 	for (Dart d = tra.begin(); d != tra.end(); d = tra.next())
 	{
 //		float v = Algo::Geometry::tetrahedronVolume<PFP>(myMap, d, position);
@@ -503,11 +502,11 @@ int main(int argc, char **argv)
 
 	Utils::Chrono ch;
 
-	Vertex v(myMap.begin());
-	VEC3 p = Algo::Volume::Geometry::vertexNeighborhoodCentroid<PFP>(myMap,v,position);
+//	Vertex v(myMap.begin());
+//	VEC3 p = Algo::Volume::Geometry::vertexNeighborhoodCentroid<PFP>(myMap,v,position);
 
-	Vol w(myMap.begin());
-	VEC3 q = Algo::Surface::Geometry::volumeCentroid<PFP>(myMap,w,position);
+//	Vol w(myMap.begin());
+//	VEC3 q = Algo::Surface::Geometry::volumeCentroid<PFP>(myMap,w,position);
 
 	ch.start();
 	float vol = Algo::Geometry::Parallel::totalVolume<PFP>(myMap, position);
diff --git a/include/Algo/Geometry/volume.hpp b/include/Algo/Geometry/volume.hpp
index 35321953..b97a9905 100644
--- a/include/Algo/Geometry/volume.hpp
+++ b/include/Algo/Geometry/volume.hpp
@@ -158,7 +158,7 @@ typename PFP::REAL totalVolume(typename PFP::MAP& map, const VertexAttribute<typ
 
 	// compute the sum of volumes
 	typename PFP::REAL total(0);
-	for (unsigned int i=0; i< CGoGN::Parallel::NumberOfThreads-1; ++i )
+	for (int i=0; i< CGoGN::Parallel::NumberOfThreads-1; ++i )
 		total += vols[i];
 
 	return total;
diff --git a/include/Geometry/vector_gen.hpp b/include/Geometry/vector_gen.hpp
index ca289b2e..b24ced32 100644
--- a/include/Geometry/vector_gen.hpp
+++ b/include/Geometry/vector_gen.hpp
@@ -57,7 +57,7 @@ Vector<DIM, T>::Vector(typename std::initializer_list<T> args)
 		m_data[i] = *iter;
 
 	// finish with 0 if necessary
-	for (int j=i;j<DIM;++j)
+	for (unsigned int j=i;j<DIM;++j)
 		m_data[j] = 0;
 }
 
diff --git a/include/Topology/generic/attributeHandler.h b/include/Topology/generic/attributeHandler.h
index 4c4342d5..e203c605 100644
--- a/include/Topology/generic/attributeHandler.h
+++ b/include/Topology/generic/attributeHandler.h
@@ -335,7 +335,7 @@ void foreach_attribute(ATTR& attribute, FUNC func, unsigned int nbth = NumberOfT
 template<unsigned int ORBIT>
 inline bool checkAttributeHandlerOrbit(const AttributeHandlerGen& att)
 {
-	return (dynamic_cast<const AttributeHandlerOrbit<ORBIT>*>(&att)!=NULL) != NULL;
+	return dynamic_cast<const AttributeHandlerOrbit<ORBIT>*>(&att) != NULL;
 }
 
 } // namespace CGoGN
diff --git a/src/Container/attributeContainer.cpp b/src/Container/attributeContainer.cpp
index c7547307..58309b39 100644
--- a/src/Container/attributeContainer.cpp
+++ b/src/Container/attributeContainer.cpp
@@ -271,7 +271,7 @@ void AttributeContainer::compact(std::vector<unsigned int>& mapOldNew)
 	}
 
 	// free memory and resize
-	for (int i = m_holesBlocks.size() - 1; i > nbb; --i)
+	for (int i = m_holesBlocks.size() - 1; i > int(nbb); --i)
 		delete m_holesBlocks[i];
 	m_holesBlocks.resize(nbb);
 
diff --git a/src/Topology/generic/genericmap.cpp b/src/Topology/generic/genericmap.cpp
index 8a62b2a3..abdcf98f 100644
--- a/src/Topology/generic/genericmap.cpp
+++ b/src/Topology/generic/genericmap.cpp
@@ -55,8 +55,8 @@ std::vector<GenericMap*>*  GenericMap::s_instances=NULL;
 
 
 GenericMap::GenericMap():
-	m_manipulator(NULL),
-	m_nextMarkerId(0)
+	m_nextMarkerId(0),
+	m_manipulator(NULL)
 {
 	if(m_attributes_registry_map == NULL)
 	{
-- 
2.22.0