diff --git a/TopologicCore/include/Context.h b/TopologicCore/include/Context.h
index 8e215f7..88b73e9 100644
--- a/TopologicCore/include/Context.h
+++ b/TopologicCore/include/Context.h
@@ -51,7 +51,8 @@ namespace TopologicCore
/// Returns the associated Topology.
///
/// The associated topology
- TOPOLOGIC_API std::shared_ptr Topology() const;
+ //TOPOLOGIC_API std::shared_ptr Topology() const;
+ TOPOLOGIC_API std::shared_ptr Topology() const;
///
/// Returns the U parameter.
@@ -92,4 +93,4 @@ namespace TopologicCore
///
double m_w;
};
-}
\ No newline at end of file
+}
diff --git a/TopologicCore/include/Geometry.h b/TopologicCore/include/Geometry.h
index 66ac43d..d9cfa22 100644
--- a/TopologicCore/include/Geometry.h
+++ b/TopologicCore/include/Geometry.h
@@ -18,6 +18,8 @@
#include "Utilities.h"
+#include
+
namespace TopologicCore
{
class Geometry
@@ -29,4 +31,4 @@ namespace TopologicCore
virtual ~Geometry() = 0;
};
-}
\ No newline at end of file
+}
diff --git a/TopologicCore/include/GlobalCluster.h b/TopologicCore/include/GlobalCluster.h
index d4b2438..d9bd0c6 100644
--- a/TopologicCore/include/GlobalCluster.h
+++ b/TopologicCore/include/GlobalCluster.h
@@ -20,6 +20,8 @@
#include
#include
+#include
+#include
#include
@@ -65,4 +67,4 @@ namespace TopologicCore
TopoDS_Compound m_occtCompound;
TopoDS_Builder m_occtBuilder;
};
-}
\ No newline at end of file
+}
diff --git a/TopologicCore/include/Graph.h b/TopologicCore/include/Graph.h
index 4404954..4c3f856 100644
--- a/TopologicCore/include/Graph.h
+++ b/TopologicCore/include/Graph.h
@@ -58,7 +58,8 @@ namespace TopologicCore
virtual ~Graph();
- TOPOLOGIC_API Topology::Ptr Topology() const;
+ //TOPOLOGIC_API Topology::Ptr Topology() const;
+ TOPOLOGIC_API TopologicCore::Topology::Ptr Topology() const;
TOPOLOGIC_API void Vertices(std::list>& rVertices) const;
@@ -174,7 +175,8 @@ namespace TopologicCore
TOPOLOGIC_API void VerticesAtCoordinates(const double kX, const double kY, const double kZ, const double kTolerance, std::list>& rVertices) const;
- TOPOLOGIC_API std::shared_ptr Edge(const std::shared_ptr& kpVertex1, const std::shared_ptr& kpVertex2, const double kTolerance) const;
+ //TOPOLOGIC_API std::shared_ptr Edge(const std::shared_ptr& kpVertex1, const std::shared_ptr& kpVertex2, const double kTolerance) const;
+ TOPOLOGIC_API std::shared_ptr Edge(const std::shared_ptr& kpVertex1, const std::shared_ptr& kpVertex2, const double kTolerance) const;
void IncidentEdges(const std::shared_ptr& kpVertex, const double kTolerance, std::list>& rEdges) const;
@@ -262,4 +264,4 @@ namespace TopologicCore
GraphMap m_graphDictionary;
TopTools_MapOfShape m_occtEdges;
};
-}
\ No newline at end of file
+}
diff --git a/TopologicCore/include/TopologicalQuery.h b/TopologicCore/include/TopologicalQuery.h
index ed31195..8214e1c 100644
--- a/TopologicCore/include/TopologicalQuery.h
+++ b/TopologicCore/include/TopologicalQuery.h
@@ -32,7 +32,7 @@ namespace TopologicCore
T* pSubclassTopology = dynamic_cast(kpTopologicalQuery);
if (pSubclassTopology == nullptr)
{
- throw std::exception("Failed downcasting a topological query");
+ throw std::runtime_error("Failed downcasting a topological query");
}
return pSubclassTopology;
}
@@ -43,7 +43,7 @@ namespace TopologicCore
T const * kpSubclassTopology = dynamic_cast(kpkTopologicalQuery);
if (kpSubclassTopology == nullptr)
{
- throw std::exception("Failed downcasting topology");
+ throw std::runtime_error("Failed downcasting topology");
}
return kpSubclassTopology;
}
@@ -54,7 +54,7 @@ namespace TopologicCore
std::shared_ptr pSubclassTopology = std::dynamic_pointer_cast(rTopologicalQuery);
if (pSubclassTopology == nullptr)
{
- throw std::exception("Failed downcasting a topological query");
+ throw std::runtime_error("Failed downcasting a topological query");
}
return pSubclassTopology;
}
@@ -65,7 +65,7 @@ namespace TopologicCore
const std::shared_ptr kSubclassTopology = std::dynamic_pointer_cast(rkTopologicalQuery);
if (kSubclassTopology == nullptr)
{
- throw std::exception("Failed downcasting a topological query");
+ throw std::runtime_error("Failed downcasting a topological query");
}
return kSubclassTopology;
}
@@ -76,7 +76,7 @@ namespace TopologicCore
std::shared_ptr pSuperClassTopology = std::dynamic_pointer_cast(rTopologicalQuery);
if (pSuperClassTopology == nullptr)
{
- throw std::exception("Failed upcasting a topological query");
+ throw std::runtime_error("Failed upcasting a topological query");
}
return pSuperClassTopology;
}
@@ -87,7 +87,7 @@ namespace TopologicCore
const std::shared_ptr pSuperClassTopology = std::dynamic_pointer_cast(rkTopologicalQuery);
if (pSuperClassTopology == nullptr)
{
- throw std::exception("Failed upcasting a topological query");
+ throw std::runtime_error("Failed upcasting a topological query");
}
return pSuperClassTopology;
}
diff --git a/TopologicCore/include/Topology.h b/TopologicCore/include/Topology.h
index 4e53f1f..39deb24 100644
--- a/TopologicCore/include/Topology.h
+++ b/TopologicCore/include/Topology.h
@@ -41,6 +41,7 @@
#include
#include