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

Merge pull request #4443 from MaelRL/SMP-Fix_solver_traits_pragma_message-GF 

SMP: Fix bad usage of pragma message
This commit is contained in:
Laurent Rineau 2020-01-15 17:31:47 +01:00
parent 455f8c6351 5806b8831e
commit e872a79da3
8 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/ARAP_parameterizer_3.h
View File

@ -83,6 +83,7 @@
#include <boost/function_output_iterator.hpp>
#include <boost/functional/hash.hpp>
#include <boost/type_traits/is_same.hpp>
#include <boost/unordered_set.hpp>
#include <iostream>
@ -173,6 +174,11 @@ public:
BorderParameterizer_,
Two_vertices_parameterizer_3<TriangleMesh_> >::type Border_parameterizer;
#if !defined(CGAL_EIGEN3_ENABLED)
CGAL_static_assertion_msg(!(boost::is_same<SolverTraits_, Default>::value),
"Error: You must either provide 'SolverTraits_' or link CGAL with the Eigen library");
#endif
typedef typename Default::Get<
SolverTraits_,
#if defined(CGAL_EIGEN3_ENABLED)
@ -184,7 +190,6 @@ public:
Eigen::SparseLU<Eigen_sparse_matrix<double>::EigenType> >
#endif
#else
#pragma message("Error: You must either provide 'SolverTraits_' or link CGAL with the Eigen library")
SolverTraits_ // no parameter provided, and Eigen is not enabled: so don't compile!
#endif
>::type Solver_traits;

1
Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Barycentric_mapping_parameterizer_3.h
View File

@ -88,7 +88,6 @@ class Barycentric_mapping_parameterizer_3
Eigen::BiCGSTAB<Eigen_sparse_matrix<double>::EigenType,
Eigen::IncompleteLUT<double> > > >::type >
#else
#pragma message("Error: You must either provide 'SolverTraits_' or link CGAL with the Eigen library")
SolverTraits_>::type > // no parameter provided, and Eigen is not enabled: so don't compile!
#endif
{

1
Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Discrete_authalic_parameterizer_3.h
View File

@ -92,7 +92,6 @@ class Discrete_authalic_parameterizer_3
Eigen::BiCGSTAB<Eigen_sparse_matrix<double>::EigenType,
Eigen::IncompleteLUT<double> > > >::type >
#else
#pragma message("Error: You must either provide 'SolverTraits_' or link CGAL with the Eigen library")
SolverTraits_>::type > // no parameter provided, and Eigen is not enabled: don't compile
#endif
{

1
Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Discrete_conformal_map_parameterizer_3.h
View File

@ -92,7 +92,6 @@ class Discrete_conformal_map_parameterizer_3
Eigen::BiCGSTAB<Eigen_sparse_matrix<double>::EigenType,
Eigen::IncompleteLUT<double> > > >::type >
#else
#pragma message("Error: You must either provide 'SolverTraits_' or link CGAL with the Eigen library")
SolverTraits_>::type > // no parameter provided, and Eigen is not enabled: so don't compile!
#endif
{

7
Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Fixed_border_parameterizer_3.h
View File

@ -34,6 +34,7 @@
#endif
#include <boost/function_output_iterator.hpp>
#include <boost/type_traits/is_same.hpp>
#include <boost/unordered_set.hpp>
/// \file Fixed_border_parameterizer_3.h
@ -104,6 +105,11 @@ public:
BorderParameterizer_,
Circular_border_arc_length_parameterizer_3<TriangleMesh_> >::type Border_parameterizer;
#if !defined(CGAL_EIGEN3_ENABLED)
CGAL_static_assertion_msg(!(boost::is_same<SolverTraits_, Default>::value),
"Error: You must either provide 'SolverTraits_' or link CGAL with the Eigen library");
#endif
typedef typename Default::Get<
SolverTraits_,
#if defined(CGAL_EIGEN3_ENABLED)
@ -111,7 +117,6 @@ public:
Eigen::BiCGSTAB<Eigen_sparse_matrix<double>::EigenType,
Eigen::IncompleteLUT<double> > >
#else
#pragma message("Error: You must either provide 'SolverTraits_' or link CGAL with the Eigen library");
SolverTraits_ // no parameter provided, and Eigen is not enabled: so don't compile!
#endif
>::type Solver_traits;

1
Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/MVC_post_processor_3.h
View File

@ -89,7 +89,6 @@ public:
Eigen::BiCGSTAB<Eigen_sparse_matrix<double>::EigenType,
Eigen::IncompleteLUT<double> > >
#else
#pragma message("Error: You must either provide 'SolverTraits_' or link CGAL with the Eigen library")
SolverTraits_ // no parameter provided, and Eigen is not enabled: so don't compile!
#endif
>::type Solver_traits;

1
Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Mean_value_coordinates_parameterizer_3.h
View File

@ -90,7 +90,6 @@ class Mean_value_coordinates_parameterizer_3
Eigen::BiCGSTAB<Eigen_sparse_matrix<double>::EigenType,
Eigen::IncompleteLUT<double> > > >::type >
#else
#pragma message("Error: You must either provide 'SolverTraits_' or link CGAL with the Eigen library");
SolverTraits_>::type > // no parameter provided, and Eigen is not enabled: so don't compile!
#endif
{

7
Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Orbifold_Tutte_parameterizer_3.h
View File

@ -42,6 +42,7 @@
#include <boost/array.hpp>
#include <boost/tuple/tuple.hpp>
#include <boost/type_traits/is_same.hpp>
#include <boost/unordered_map.hpp>
#include <boost/unordered_set.hpp>
@ -383,6 +384,11 @@ class Orbifold_Tutte_parameterizer_3
{
public:
#ifndef DOXYGEN_RUNNING
#if !defined(CGAL_EIGEN3_ENABLED)
CGAL_static_assertion_msg(!(boost::is_same<SolverTraits_, Default>::value),
"Error: You must either provide 'SolverTraits_' or link CGAL with the Eigen library");
#endif
typedef typename Default::Get<
SolverTraits_,
#if defined(CGAL_EIGEN3_ENABLED)
@ -394,7 +400,6 @@ public:
Eigen::SparseLU<Eigen_sparse_matrix<double>::EigenType> >
#endif
#else
#pragma message("Error: You must either provide 'SolverTraits_' or link CGAL with the Eigen library")
SolverTraits_ // no parameter provided, and Eigen is not enabled: so don't compile!
#endif
>::type Solver_traits;