From 1684a3d07f1470032d96d53c0346173024c95606 Mon Sep 17 00:00:00 2001 From: Laurent Saboret Date: Thu, 31 Aug 2006 09:35:52 +0000 Subject: [PATCH] Fixed clash with ERROR_NOT_ENOUGH_MEMORY #define in Windows header --- .../doc/concepts/ParameterizerTraits_3.h | 2 +- .../ParameterizerTraits_3.tex | 4 ++-- .../Parameterizer_traits_3.tex | 4 ++-- .../include/CGAL/Parameterizer_traits_3.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Surface_mesh_parameterization/doc/concepts/ParameterizerTraits_3.h b/Surface_mesh_parameterization/doc/concepts/ParameterizerTraits_3.h index 4a70b3c2daf..3606cfc4b05 100644 --- a/Surface_mesh_parameterization/doc/concepts/ParameterizerTraits_3.h +++ b/Surface_mesh_parameterization/doc/concepts/ParameterizerTraits_3.h @@ -39,7 +39,7 @@ public: ERROR_INVALID_BORDER, ///< Error: parameterization requires a convex border ERROR_CANNOT_SOLVE_LINEAR_SYSTEM,///< Error: cannot solve linear system ERROR_NO_1_TO_1_MAPPING, ///< Error: parameterization does not ensure a one-to-one mapping - ERROR_NOT_ENOUGH_MEMORY, ///< Error: not enough memory + ERROR_OUT_OF_MEMORY, ///< Error: not enough memory ERROR_WRONG_PARAMETER ///< Error: a method received an unexpected parameter }; diff --git a/Surface_mesh_parameterization/doc_tex/Surface_mesh_parameterization_ref/ParameterizerTraits_3.tex b/Surface_mesh_parameterization/doc_tex/Surface_mesh_parameterization_ref/ParameterizerTraits_3.tex index 534f672f234..560593507e0 100644 --- a/Surface_mesh_parameterization/doc_tex/Surface_mesh_parameterization_ref/ParameterizerTraits_3.tex +++ b/Surface_mesh_parameterization/doc_tex/Surface_mesh_parameterization_ref/ParameterizerTraits_3.tex @@ -57,7 +57,7 @@ Export the type of mesh to parameterize. % The section below is automatically generated. Do not edit! %START-AUTO(\ccConstants) -\ccEnum{enum Error_code { OK, ERROR_EMPTY_MESH, ERROR_NON_TRIANGULAR_MESH, ERROR_NO_SURFACE_MESH, ERROR_INVALID_BORDER, ERROR_CANNOT_SOLVE_LINEAR_SYSTEM, ERROR_NO_1_TO_1_MAPPING, ERROR_NOT_ENOUGH_MEMORY, ERROR_WRONG_PARAMETER };} +\ccEnum{enum Error_code { OK, ERROR_EMPTY_MESH, ERROR_NON_TRIANGULAR_MESH, ERROR_NO_SURFACE_MESH, ERROR_INVALID_BORDER, ERROR_CANNOT_SOLVE_LINEAR_SYSTEM, ERROR_NO_1_TO_1_MAPPING, ERROR_OUT_OF_MEMORY, ERROR_WRONG_PARAMETER };} { List of errors detected by this package. } @@ -72,7 +72,7 @@ List of errors detected by this package. ]Error: input mesh is not a surface. \item[\ccc{ERROR_INVALID_BORDER} ]Error: parameterization requires a convex border. \item[\ccc{ERROR_CANNOT_SOLVE_LINEAR_SYSTEM} ]Error: cannot solve linear system. \item[\ccc{ERROR_NO_1_TO_1_MAPPING} -]Error: parameterization does not ensure a one-to-one mapping. \item[\ccc{ERROR_NOT_ENOUGH_MEMORY} +]Error: parameterization does not ensure a one-to-one mapping. \item[\ccc{ERROR_OUT_OF_MEMORY} ]Error: not enough memory. \item[\ccc{ERROR_WRONG_PARAMETER} ]Error: a method received an unexpected parameter. \end{description} \end{description} diff --git a/Surface_mesh_parameterization/doc_tex/Surface_mesh_parameterization_ref/Parameterizer_traits_3.tex b/Surface_mesh_parameterization/doc_tex/Surface_mesh_parameterization_ref/Parameterizer_traits_3.tex index 5d58b6c5fab..37a17769a18 100644 --- a/Surface_mesh_parameterization/doc_tex/Surface_mesh_parameterization_ref/Parameterizer_traits_3.tex +++ b/Surface_mesh_parameterization/doc_tex/Surface_mesh_parameterization_ref/Parameterizer_traits_3.tex @@ -86,7 +86,7 @@ Export \ccc{ParameterizationMesh_3} template parameter. % The section below is automatically generated. Do not edit! %START-AUTO(\ccConstants) -\ccEnum{enum Error_code { OK, ERROR_EMPTY_MESH, ERROR_NON_TRIANGULAR_MESH, ERROR_NO_SURFACE_MESH, ERROR_INVALID_BORDER, ERROR_CANNOT_SOLVE_LINEAR_SYSTEM, ERROR_NO_1_TO_1_MAPPING, ERROR_NOT_ENOUGH_MEMORY, ERROR_WRONG_PARAMETER };} +\ccEnum{enum Error_code { OK, ERROR_EMPTY_MESH, ERROR_NON_TRIANGULAR_MESH, ERROR_NO_SURFACE_MESH, ERROR_INVALID_BORDER, ERROR_CANNOT_SOLVE_LINEAR_SYSTEM, ERROR_NO_1_TO_1_MAPPING, ERROR_OUT_OF_MEMORY, ERROR_WRONG_PARAMETER };} { List of errors detected by this package. } @@ -101,7 +101,7 @@ List of errors detected by this package. ]input mesh is not a surface \item[\ccc{ERROR_INVALID_BORDER} ]parameterization requires a convex border \item[\ccc{ERROR_CANNOT_SOLVE_LINEAR_SYSTEM} ]cannot solve linear system \item[\ccc{ERROR_NO_1_TO_1_MAPPING} -]parameterization does not ensure a one-to-one mapping \item[\ccc{ERROR_NOT_ENOUGH_MEMORY} +]parameterization does not ensure a one-to-one mapping \item[\ccc{ERROR_OUT_OF_MEMORY} ]not enough memory \item[\ccc{ERROR_WRONG_PARAMETER} ]a method received an unexpected parameter \end{description} \end{description} diff --git a/Surface_mesh_parameterization/include/CGAL/Parameterizer_traits_3.h b/Surface_mesh_parameterization/include/CGAL/Parameterizer_traits_3.h index 7a126cfa5fc..b4b8e1b8bcc 100644 --- a/Surface_mesh_parameterization/include/CGAL/Parameterizer_traits_3.h +++ b/Surface_mesh_parameterization/include/CGAL/Parameterizer_traits_3.h @@ -57,7 +57,7 @@ public: ERROR_INVALID_BORDER, ///< parameterization requires a convex border ERROR_CANNOT_SOLVE_LINEAR_SYSTEM,///< cannot solve linear system ERROR_NO_1_TO_1_MAPPING, ///< parameterization does not ensure a one-to-one mapping - ERROR_NOT_ENOUGH_MEMORY, ///< not enough memory + ERROR_OUT_OF_MEMORY, ///< not enough memory ERROR_WRONG_PARAMETER ///< a method received an unexpected parameter };