Merge branch 'master' of /data/Repository/Xdmf2

XdmfTopologyType.cpp

@@ -24,7 +24,6 @@
 #include <cctype>
 #include <sstream>
 #include <utility>
-#include <vector>
 #include "XdmfError.hpp"
 #include "XdmfTopologyType.hpp"
 
@@ -563,7 +562,7 @@ XdmfTopologyType::New(const unsigned int id)
 
 XdmfTopologyType::XdmfTopologyType(const unsigned int nodesPerElement,
                                    const unsigned int facesPerElement,
-                                   std::vector<shared_ptr<const XdmfTopologyType> > faces,
+                                   const std::vector<shared_ptr<const XdmfTopologyType> > & faces,
                                    const unsigned int edgesPerElement,
                                    const std::string & name,
                                    const CellType cellType,

XdmfTopologyType.hpp

@@ -25,6 +25,7 @@
 #define XDMFTOPOLOGYTYPE_HPP_
 
 // Includes
+#include <vector>
 #include "Xdmf.hpp"
 #include "XdmfItemProperty.hpp"
 
@@ -344,7 +345,7 @@ protected:
    */
   XdmfTopologyType(const unsigned int nodesPerElement,
                    const unsigned int facesPerElement,
-                   std::vector<shared_ptr<const XdmfTopologyType> > faces,
+                   const std::vector<shared_ptr<const XdmfTopologyType> > & faces,
                    const unsigned int edgesPerElement,
                    const std::string & name,
                    const CellType cellType,

core/CMakeLists.txt

@@ -84,7 +84,7 @@ check_cxx_source_compiles("
 struct Base { virtual ~Base(){} };
 struct Derived : public Base {};
 
-int main(int ac, char * av)
+int main(int ac, char * av[])
 {
   boost::shared_ptr<Base> ptr(new Base());
   boost::shared_dynamic_cast<Derived>(ptr);