From 7e6e3f62bab0a405cb15aeb4a47fccefbe3992bb Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 10 Jul 2015 12:21:19 +0200 Subject: [PATCH] Fix a link error "multiple definition of" Trivial fix for bug #158 --- .gitignore | 3 +++ Triangulation/include/CGAL/Triangulation_full_cell.h | 2 ++ Triangulation/include/CGAL/Triangulation_vertex.h | 2 ++ 3 files changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index 81287a07cbd..0f0135b04e4 100644 --- a/.gitignore +++ b/.gitignore @@ -921,6 +921,9 @@ Triangulation/test/Triangulation/output-pcds* Triangulation/test/Triangulation/pc Triangulation/test/Triangulation/pcds Triangulation/test/Triangulation/torture +/Triangulation/examples/Triangulation/cgal_test_with_cmake +/Triangulation/test/Triangulation/cgal_test_with_cmake +/Triangulation/test/Triangulation/output-tds-* Triangulation_2/CMakeLists.txt Triangulation_2/cgal_test_with_cmake Triangulation_2/demo/Triangulation_2/Makefile diff --git a/Triangulation/include/CGAL/Triangulation_full_cell.h b/Triangulation/include/CGAL/Triangulation_full_cell.h index 3177d487989..1a09747858f 100644 --- a/Triangulation/include/CGAL/Triangulation_full_cell.h +++ b/Triangulation/include/CGAL/Triangulation_full_cell.h @@ -121,12 +121,14 @@ protected: // FUNCTIONS THAT ARE NOT MEMBER FUNCTIONS: +inline std::istream & operator>>(std::istream & is, No_full_cell_data &) { return is; } +inline std::ostream & operator<<(std::ostream & os, const No_full_cell_data &) { diff --git a/Triangulation/include/CGAL/Triangulation_vertex.h b/Triangulation/include/CGAL/Triangulation_vertex.h index 74d6a4928eb..2a7c75e87e8 100644 --- a/Triangulation/include/CGAL/Triangulation_vertex.h +++ b/Triangulation/include/CGAL/Triangulation_vertex.h @@ -93,12 +93,14 @@ public: // NON CLASS-MEMBER FUNCTIONS +inline std::istream & operator>>(std::istream & is, No_vertex_data &) { return is; } +inline std::ostream & operator<<(std::ostream & os, const No_vertex_data &) {