diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2011-11-27 04:21:38 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2011-11-27 04:21:38 (GMT) |
| commit | 610ab20ddba6d07e9b6e0b7565a44913854e467b (patch) | |
| tree | 81c75e9ce9b68490bc5a81293290b96bb49d9510 /src/CGAL_Nef_polyhedron.h | |
| parent | 2376814f2c4dd6e34a765ca37275b136785b26fd (diff) | |
| parent | 04c340b35d8809b595ebb3ce53b7a00313d00a9b (diff) | |
Merge remote branch 'upstream/master' into cakebaby
Conflicts:
doc/testing.txt
tests/CMakeLists.txt
tests/system-gl.cc
tests/system-gl.h
Diffstat (limited to 'src/CGAL_Nef_polyhedron.h')
| -rw-r--r-- | src/CGAL_Nef_polyhedron.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/CGAL_Nef_polyhedron.h b/src/CGAL_Nef_polyhedron.h index fda4bc5..f93905f 100644 --- a/src/CGAL_Nef_polyhedron.h +++ b/src/CGAL_Nef_polyhedron.h @@ -8,8 +8,8 @@ class CGAL_Nef_polyhedron { public: CGAL_Nef_polyhedron() : dim(0) {} - CGAL_Nef_polyhedron(CGAL_Nef_polyhedron2 *p) : dim(2), p2(p) {} - CGAL_Nef_polyhedron(CGAL_Nef_polyhedron3 *p) : dim(3), p3(p) {} + CGAL_Nef_polyhedron(CGAL_Nef_polyhedron2 *p); + CGAL_Nef_polyhedron(CGAL_Nef_polyhedron3 *p); ~CGAL_Nef_polyhedron() {} bool empty() const { return (dim == 0 || (!p2 && !p3)); } |