Commit 1f6fb82e authored by Mike Kremer's avatar Mike Kremer

Put vector into geometry namespace

git-svn-id: http://www.openvolumemesh.org/svnrepo/OpenVolumeMesh/trunk@41 66977474-1d4b-4f09-8fe9-267525286df2
parent 89aec34a
......@@ -55,6 +55,8 @@ namespace IO {
*/
class FileManager {
private:
typedef OpenVolumeMesh::Geometry::Vec3d Vec3d;
public:
/// Default constructor
......
......@@ -285,6 +285,12 @@ bool FileManager::isHexahedralMesh(const std::string& _filename) const {
std::ifstream iff(_filename.c_str(), std::ios::in);
if(!iff.good()) {
std::cerr << "Could not open file " << _filename << " for reading!" << std::endl;
iff.close();
return false;
}
std::string s;
unsigned int n = 0u;
......
......@@ -71,9 +71,9 @@
//== NAMESPACES ===============================================================
namespace OpenVolumeMesh {
namespace Geometry {
//== CLASS DEFINITION =========================================================
......@@ -334,6 +334,7 @@ typedef VectorT<float,6> Vec6f;
typedef VectorT<double,6> Vec6d;
//=============================================================================
} // namespace Geometry
} // namespace OpenVolumeMesh
//=============================================================================
#endif // OPENVOLUMEMESH_VECTOR_HH defined
......
......@@ -8,14 +8,14 @@
#include <OpenVolumeMesh/Geometry/VectorT.hh>
// Vector defines
typedef OpenVolumeMesh::Vec3d Vec3d;
typedef OpenVolumeMesh::Vec3f Vec3f;
typedef OpenVolumeMesh::Geometry::Vec3d Vec3d;
typedef OpenVolumeMesh::Geometry::Vec3f Vec3f;
/*
* Simple test setting for polyhedral meshes
*/
typedef OpenVolumeMesh::PolyhedralMesh<OpenVolumeMesh::Vec3d> PolyhedralMesh;
typedef OpenVolumeMesh::PolyhedralMesh<Vec3d> PolyhedralMesh;
class PolyhedralMeshBase: public testing::Test {
......@@ -53,7 +53,7 @@ protected:
* Simple test setting for hexahedral meshes
*/
typedef OpenVolumeMesh::HexahedralMesh<OpenVolumeMesh::Vec3d> HexahedralMesh;
typedef OpenVolumeMesh::HexahedralMesh<Vec3d> HexahedralMesh;
class HexahedralMeshBase: public testing::Test {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment