0028962: Configuration, genproj.bat - add /LARGEADDRESSAWARE option to 32-bit target...

[occt.git] / src / StlMesh / StlMesh.cxx

diff --git a/src/StlMesh/StlMesh.cxx b/src/StlMesh/StlMesh.cxx
index 65d15d3..266d458 100644 (file)
--- a/src/StlMesh/StlMesh.cxx
+++ b/src/StlMesh/StlMesh.cxx
@@ -5,8 +5,8 @@
 //
 // This file is part of Open CASCADE Technology software library.
 //
 //
 // This file is part of Open CASCADE Technology software library.
 //

-// This library is free software; you can redistribute it and / or modify it
-// under the terms of the GNU Lesser General Public version 2.1 as published
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published

 // by the Free Software Foundation, with special exception defined in the file
 // OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
 // distribution for complete text of the license and disclaimer of any warranty.
 // by the Free Software Foundation, with special exception defined in the file
 // OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
 // distribution for complete text of the license and disclaimer of any warranty.


@@ -14,16 +14,17 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 

-#include <StlMesh.ixx>
-#include <StlMesh_SequenceOfMeshTriangle.hxx>
+
+#include <StlMesh.hxx>
+#include <StlMesh_Mesh.hxx>

 #include <StlMesh_MeshTriangle.hxx>
 #include <StlMesh_MeshTriangle.hxx>

+#include <StlMesh_SequenceOfMeshTriangle.hxx>

 #include <TColgp_SequenceOfXYZ.hxx>
 
 //=======================================================================
 //function : Merge
 //purpose  : 
 //=======================================================================
 #include <TColgp_SequenceOfXYZ.hxx>
 
 //=======================================================================
 //function : Merge
 //purpose  : 
 //=======================================================================

-

 Handle(StlMesh_Mesh) StlMesh::Merge(const Handle(StlMesh_Mesh)& mesh1, const Handle(StlMesh_Mesh)& mesh2)
 {
   Handle(StlMesh_Mesh) mergeMesh = new StlMesh_Mesh;
 Handle(StlMesh_Mesh) StlMesh::Merge(const Handle(StlMesh_Mesh)& mesh1, const Handle(StlMesh_Mesh)& mesh2)
 {
   Handle(StlMesh_Mesh) mergeMesh = new StlMesh_Mesh;