From bb4ee56a3911acaf9f6eb2f8f1b2d39afedfe5cd Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 3 Jul 2015 17:01:58 +0200 Subject: [PATCH] Make non-template methods inline Avoid linking errors such as: In function 'CGAL::operator>>(std::istream&, CGAL::No_vertex_data&)':MeshSimplicial.cpp:(.text+0x490): multiple definition of 'CGAL::operator>>(std::istream&, CGAL::No_vertex_data&)' Fix issue #158. --- Triangulation/include/CGAL/Triangulation_full_cell.h | 3 +++ Triangulation/include/CGAL/Triangulation_vertex.h | 2 ++ 2 files changed, 5 insertions(+) diff --git a/Triangulation/include/CGAL/Triangulation_full_cell.h b/Triangulation/include/CGAL/Triangulation_full_cell.h index 3177d487989..9ffc7f82c25 100644 --- a/Triangulation/include/CGAL/Triangulation_full_cell.h +++ b/Triangulation/include/CGAL/Triangulation_full_cell.h @@ -121,12 +121,15 @@ 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 &) {