songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed clash with ERROR_NOT_ENOUGH_MEMORY #define in Windows header

This commit is contained in:
Laurent Saboret 2006-08-31 09:35:52 +00:00
parent 58609563ab
commit 1684a3d07f
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Surface_mesh_parameterization/doc/concepts/ParameterizerTraits_3.h
View File

@ -39,7 +39,7 @@ public:
ERROR_INVALID_BORDER, ///< Error: parameterization requires a convex border ERROR_INVALID_BORDER, ///< Error: parameterization requires a convex border
ERROR_CANNOT_SOLVE_LINEAR_SYSTEM,///< Error: cannot solve linear system 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_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 ERROR_WRONG_PARAMETER ///< Error: a method received an unexpected parameter
}; };

4
Surface_mesh_parameterization/doc_tex/Surface_mesh_parameterization_ref/ParameterizerTraits_3.tex
View File

@ -57,7 +57,7 @@ Export the type of mesh to parameterize.
% The section below is automatically generated. Do not edit! % The section below is automatically generated. Do not edit!
%START-AUTO(\ccConstants) %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. 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: 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: 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: 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: not enough memory. \item[\ccc{ERROR_WRONG_PARAMETER}
]Error: a method received an unexpected parameter. \end{description} ]Error: a method received an unexpected parameter. \end{description}
\end{description} \end{description}

4
Surface_mesh_parameterization/doc_tex/Surface_mesh_parameterization_ref/Parameterizer_traits_3.tex
View File

@ -86,7 +86,7 @@ Export \ccc{ParameterizationMesh_3} template parameter.
% The section below is automatically generated. Do not edit! % The section below is automatically generated. Do not edit!
%START-AUTO(\ccConstants) %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. 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} ]input mesh is not a surface \item[\ccc{ERROR_INVALID_BORDER}
]parameterization requires a convex border \item[\ccc{ERROR_CANNOT_SOLVE_LINEAR_SYSTEM} ]parameterization requires a convex border \item[\ccc{ERROR_CANNOT_SOLVE_LINEAR_SYSTEM}
]cannot solve linear system \item[\ccc{ERROR_NO_1_TO_1_MAPPING} ]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} ]not enough memory \item[\ccc{ERROR_WRONG_PARAMETER}
]a method received an unexpected parameter \end{description} ]a method received an unexpected parameter \end{description}
\end{description} \end{description}

2
Surface_mesh_parameterization/include/CGAL/Parameterizer_traits_3.h
View File

@ -57,7 +57,7 @@ public:
ERROR_INVALID_BORDER, ///< parameterization requires a convex border ERROR_INVALID_BORDER, ///< parameterization requires a convex border
ERROR_CANNOT_SOLVE_LINEAR_SYSTEM,///< cannot solve linear system 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_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 ERROR_WRONG_PARAMETER ///< a method received an unexpected parameter
}; };