From 4d4f9adb55cbf6357760c7101d4558cc3b231177 Mon Sep 17 00:00:00 2001 From: Marc Glisse Date: Fri, 27 Jul 2012 12:05:53 +0000 Subject: [PATCH 1/3] Missing standard includes. --- Polynomial/include/CGAL/Polynomial/Polynomial_type.h | 3 ++- .../include/CGAL/Parameterization_mesh_patch_3.h | 1 + Surface_mesh_parameterization/include/CGAL/Taucs_matrix.h | 5 +++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Polynomial/include/CGAL/Polynomial/Polynomial_type.h b/Polynomial/include/CGAL/Polynomial/Polynomial_type.h index 68ae9f8528c..fcbebf14700 100644 --- a/Polynomial/include/CGAL/Polynomial/Polynomial_type.h +++ b/Polynomial/include/CGAL/Polynomial/Polynomial_type.h @@ -41,6 +41,7 @@ typename CGAL::internal::Innermost_coefficient_type::Type , 2>::Type #include +#include #include #include @@ -1330,7 +1331,7 @@ void Polynomial::output_maple(std::ostream& os) const { static const char *varnames[] = { "x", "y", "z" }; varname = varnames[Polynomial_traits_d::d]; } else { - sprintf(vnbuf, "w%d", Polynomial_traits_d::d - 2); + std::sprintf(vnbuf, "w%d", Polynomial_traits_d::d - 2); varname = vnbuf; } diff --git a/Surface_mesh_parameterization/include/CGAL/Parameterization_mesh_patch_3.h b/Surface_mesh_parameterization/include/CGAL/Parameterization_mesh_patch_3.h index 69bbdb16e0c..bad3d1a86ce 100644 --- a/Surface_mesh_parameterization/include/CGAL/Parameterization_mesh_patch_3.h +++ b/Surface_mesh_parameterization/include/CGAL/Parameterization_mesh_patch_3.h @@ -22,6 +22,7 @@ #ifndef CGAL_PARAMETERIZATION_MESH_PATCH_3_H #define CGAL_PARAMETERIZATION_MESH_PATCH_3_H +#include #include #include #include diff --git a/Surface_mesh_parameterization/include/CGAL/Taucs_matrix.h b/Surface_mesh_parameterization/include/CGAL/Taucs_matrix.h index 90c3c93327b..f8cabd3da5c 100644 --- a/Surface_mesh_parameterization/include/CGAL/Taucs_matrix.h +++ b/Surface_mesh_parameterization/include/CGAL/Taucs_matrix.h @@ -27,6 +27,7 @@ #include #include +#include #include namespace CGAL { @@ -322,9 +323,9 @@ public: int nb_elements = m_columns[col].size(); // Number of non null elements of the column // Fast copy of column indices and values - memcpy(&m_matrix->rowind[first_index], &m_columns[col].m_indices[0], nb_elements*sizeof(int)); + std::memcpy(&m_matrix->rowind[first_index], &m_columns[col].m_indices[0], nb_elements*sizeof(int)); T* taucs_values = (T*) m_matrix->values.v; - memcpy(&taucs_values[first_index], &m_columns[col].m_values[0], nb_elements*sizeof(T)); + std::memcpy(&taucs_values[first_index], &m_columns[col].m_values[0], nb_elements*sizeof(T)); // Start of next column will be: m_matrix->colptr[col+1] = first_index + nb_elements; From 94916934177bf13be5a63704eebe3db579304391 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 27 Jul 2012 13:16:55 +0000 Subject: [PATCH 2/3] Fix an issue when BUILD_SHARED_LIBS is toggled When the value of the Boolean cache variable BUILD_SHARED_LIBS is modified, there was a bug that the variable CGAL_LIBRARY_NAME, CGAL_Core_LIBRARY_NAME, CGAL_Qt4_LIBRARY_NAME, and so on, were not updated. As a consequence, the file CGALConfig.cmake produced in the installation directory was not correct: it was referring to .so files whereas the installed binaries were .a files, or the reverse. This patch fixes the issue. --- Installation/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt index 6b1692bf608..8e7647e029d 100644 --- a/Installation/CMakeLists.txt +++ b/Installation/CMakeLists.txt @@ -771,10 +771,10 @@ endif() # Set CGAL_LIBRARY_NAME, CGAL_Qt3_LIBRARY_NAME and so on. Those variables # are the name of CGAL libraries, without the path. Used in the generation # of the installed CGALConfig.cmake -get_filename_component(CGAL_LIBRARY_NAME "${CGAL_LIBRARY}" NAME CACHE) +get_filename_component(CGAL_LIBRARY_NAME "${CGAL_LIBRARY}" NAME) hide_variable(CGAL_LIBRARY_NAME) foreach(lib ${CGAL_CONFIGURED_LIBRARIES}) - get_filename_component(CGAL_${lib}_LIBRARY_NAME "${CGAL_${lib}_LIBRARY}" NAME CACHE) + get_filename_component(CGAL_${lib}_LIBRARY_NAME "${CGAL_${lib}_LIBRARY}" NAME) hide_variable(CGAL_${lib}_LIBRARY_NAME) endforeach() From 0b8cff4f1ad8603a62b1f9bab96214d5ea21762d Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 27 Jul 2012 14:14:36 +0000 Subject: [PATCH 3/3] My $HOME/CGAL/trunk is a symlink to next, but still... --- .../infrastructure/cgal.geometryfactory.com/bin/dump_crontab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Maintenance/infrastructure/cgal.geometryfactory.com/bin/dump_crontab b/Maintenance/infrastructure/cgal.geometryfactory.com/bin/dump_crontab index 9e3aafefbaf..06504b6f5cb 100755 --- a/Maintenance/infrastructure/cgal.geometryfactory.com/bin/dump_crontab +++ b/Maintenance/infrastructure/cgal.geometryfactory.com/bin/dump_crontab @@ -1,6 +1,6 @@ #!/bin/zsh -cd $HOME/CGAL/trunk/Maintenance/infrastructure/cgal.geometryfactory.com/ +cd $HOME/CGAL/next/Maintenance/infrastructure/cgal.geometryfactory.com/ crontab -l >| crontab svn add -q crontab [ -n "`svn st crontab`" ] && svn ci -m 'updated crontab (automated commit)' crontab