From a850e6674c68f97c7d32fd29d9054640cf6b00a8 Mon Sep 17 00:00:00 2001 From: Clement Jamin Date: Tue, 20 Jun 2017 14:36:09 +0200 Subject: [PATCH] Rename convex_hull.cpp to avoid conflict with the one from Triangulation --- Envelope_2/doc/Envelope_2/Envelope_2.txt | 2 +- Envelope_2/doc/Envelope_2/examples.txt | 2 +- .../examples/Envelope_2/{convex_hull.cpp => convex_hull_2.cpp} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename Envelope_2/examples/Envelope_2/{convex_hull.cpp => convex_hull_2.cpp} (100%) diff --git a/Envelope_2/doc/Envelope_2/Envelope_2.txt b/Envelope_2/doc/Envelope_2/Envelope_2.txt index f0c9b322365..ba2bdb1ec0d 100644 --- a/Envelope_2/doc/Envelope_2/Envelope_2.txt +++ b/Envelope_2/doc/Envelope_2/Envelope_2.txt @@ -180,7 +180,7 @@ with the same line as the rightmost edge of the maximization diagram, and vice-verse. We can therefore skip the rightmost edges of both diagrams. -\cgalExample{Envelope_2/convex_hull.cpp} +\cgalExample{Envelope_2/convex_hull_2.cpp} \cgalFigureBegin{env2_figex_circ,ex_circle.png} A set of four circles, as constructed in \ref Envelope_2/envelope_circles.cpp. The lower envelope and the upper envelope are shown using thick dashed lines of different colors respectively. diff --git a/Envelope_2/doc/Envelope_2/examples.txt b/Envelope_2/doc/Envelope_2/examples.txt index d7ed067b32c..1c44aad4dcd 100644 --- a/Envelope_2/doc/Envelope_2/examples.txt +++ b/Envelope_2/doc/Envelope_2/examples.txt @@ -1,5 +1,5 @@ /*! -\example Envelope_2/convex_hull.cpp +\example Envelope_2/convex_hull_2.cpp \example Envelope_2/envelope_circles.cpp \example Envelope_2/envelope_segments.cpp */ diff --git a/Envelope_2/examples/Envelope_2/convex_hull.cpp b/Envelope_2/examples/Envelope_2/convex_hull_2.cpp similarity index 100% rename from Envelope_2/examples/Envelope_2/convex_hull.cpp rename to Envelope_2/examples/Envelope_2/convex_hull_2.cpp