Remove some of the many warnings creeping into SMTK.

smtk/bridge/polygon/internal/Entity.h

@@ -44,7 +44,7 @@ protected:
     : m_parent(NULL)
     { }
   entity(const Id& uid, entity* p)
-    : m_id(uid), m_parent(p)
+    : m_parent(p), m_id(uid)
     { }
   virtual ~entity()
     {

smtk/bridge/polygon/internal/Model.cxx

@@ -359,8 +359,9 @@ bool pmodel::splitModelEdgeAtModelVertex(
 
   // Remove edgeToSplit from its endpoint vertices so that creation
   // of new edges can succeed (otherwise it will fail when trying
-  // to insert a coincident edge at the existing edge endpoints). 
+  // to insert a coincident edge at the existing edge endpoints).
   std::pair<Id,Id> adjacentFaces = this->removeModelEdgeFromEndpoints(mgr, edgeToSplit);
+  (void)adjacentFaces;
 
   // Now we can create the new model edges.
   this->createModelEdgeFromSegments(mgr, segs.begin(), segSplit);
@@ -374,7 +375,7 @@ bool pmodel::splitModelEdgeAtModelVertex(
 
 // TODO: Remove edgeToSplit so that creation can succeed (otherwise
 //       it will fail when trying to insert a coincident edge at the
-//       existing edge endpoints. 
+//       existing edge endpoints.
 std::pair<Id,Id> pmodel::removeModelEdgeFromEndpoints(smtk::model::ManagerPtr mgr, EdgePtr edg)
 {
   std::pair<Id,Id> result;

smtk/mesh/Collection.cxx

@@ -74,10 +74,10 @@ Collection::Collection():
   m_name(),
   m_readLocation(),
   m_writeLocation(),
-  m_internals( new InternalImpl() ),
   m_floatData(new MeshFloatData),
   m_stringData(new MeshStringData),
-  m_integerData(new MeshIntegerData)
+  m_integerData(new MeshIntegerData),
+  m_internals( new InternalImpl() )
 {
 
 }
@@ -89,10 +89,10 @@ Collection::Collection(const smtk::common::UUID& collectionID,
   m_name(),
   m_readLocation(),
   m_writeLocation(),
-  m_internals( new InternalImpl(mngr) ),
   m_floatData(new MeshFloatData),
   m_stringData(new MeshStringData),
-  m_integerData(new MeshIntegerData)
+  m_integerData(new MeshIntegerData),
+  m_internals( new InternalImpl(mngr) )
 {
 }
 
@@ -104,10 +104,10 @@ Collection::Collection( const smtk::common::UUID& collectionID,
   m_name(),
   m_readLocation(),
   m_writeLocation(),
-  m_internals( new InternalImpl(mngr, interface) ),
   m_floatData(new MeshFloatData),
   m_stringData(new MeshStringData),
-  m_integerData(new MeshIntegerData)
+  m_integerData(new MeshIntegerData),
+  m_internals( new InternalImpl(mngr, interface) )
 {
 
 }

smtk/mesh/ForEachTypes.h

@@ -50,10 +50,10 @@ public:
   bool wantsCoordinates() const
     { return this->m_wantsCoordinates; }
 
-  const smtk::mesh::Handle* const pointIds() const
+  const smtk::mesh::Handle* pointIds() const
     { return this->m_pointIds; }
 
-  smtk::mesh::Handle const pointId(int index) const
+  smtk::mesh::Handle pointId(int index) const
     { return this->m_pointIds[index]; }
 
   const std::vector<double>& coordinates() const

smtk/mesh/Interface.h

@@ -27,7 +27,7 @@ namespace smtk {
 namespace mesh {
 
 //forward declare classes we use
-struct ContainsFunctor;
+class ContainsFunctor;
 class PointConnectivity;
 
 //----------------------------------------------------------------------------