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

Fix a link error "multiple definition of" 

Trivial fix for bug #158
This commit is contained in:
Laurent Rineau 2015-07-10 12:21:19 +02:00
parent 12e3bde909
commit 7e6e3f62ba
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -921,6 +921,9 @@ Triangulation/test/Triangulation/output-pcds*
Triangulation/test/Triangulation/pc Triangulation/test/Triangulation/pc
Triangulation/test/Triangulation/pcds Triangulation/test/Triangulation/pcds
Triangulation/test/Triangulation/torture 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/CMakeLists.txt
Triangulation_2/cgal_test_with_cmake Triangulation_2/cgal_test_with_cmake
Triangulation_2/demo/Triangulation_2/Makefile Triangulation_2/demo/Triangulation_2/Makefile

2
Triangulation/include/CGAL/Triangulation_full_cell.h
View File

@ -121,12 +121,14 @@ protected:
// FUNCTIONS THAT ARE NOT MEMBER FUNCTIONS: // FUNCTIONS THAT ARE NOT MEMBER FUNCTIONS:
inline
std::istream & std::istream &
operator>>(std::istream & is, No_full_cell_data &) operator>>(std::istream & is, No_full_cell_data &)
{ {
return is; return is;
} }
inline
std::ostream & std::ostream &
operator<<(std::ostream & os, const No_full_cell_data &) operator<<(std::ostream & os, const No_full_cell_data &)
{ {

2
Triangulation/include/CGAL/Triangulation_vertex.h
View File

@ -93,12 +93,14 @@ public:
// NON CLASS-MEMBER FUNCTIONS // NON CLASS-MEMBER FUNCTIONS
inline
std::istream & std::istream &
operator>>(std::istream & is, No_vertex_data &) operator>>(std::istream & is, No_vertex_data &)
{ {
return is; return is;
} }
inline
std::ostream & std::ostream &
operator<<(std::ostream & os, const No_vertex_data &) operator<<(std::ostream & os, const No_vertex_data &)
{ {