From 1b87d800526a9dca1a8cfc6c63a8b17b64e5b6cb Mon Sep 17 00:00:00 2001 From: Mariette Yvinec Date: Fri, 10 Dec 1999 16:10:07 +0000 Subject: [PATCH] fixed makefile to use CGAL_WINDOW_LIBPATH and CGAL_WINDOW_LDFLAGS fixed stream_iterator.C : add CGAL:: in front of copy_n --- .../Stream_support/demo/Stream_support_LEDA/makefile | 4 ++-- .../demo/Stream_support_LEDA/stream_iterator.C | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Packages/Stream_support/demo/Stream_support_LEDA/makefile b/Packages/Stream_support/demo/Stream_support_LEDA/makefile index 42dac405345..f88f9a01b96 100644 --- a/Packages/Stream_support/demo/Stream_support_LEDA/makefile +++ b/Packages/Stream_support/demo/Stream_support_LEDA/makefile @@ -23,11 +23,11 @@ CXXFLAGS = \ #---------------------------------------------------------------------# LIBPATH = \ - $(CGAL_LIBPATH) + $(CGAL_WINDOW_LIBPATH) LDFLAGS = \ $(LONG_NAME_PROBLEM_LDFLAGS) \ - $(CGAL_LDFLAGS) + $(CGAL_WINDOW_LDFLAGS) #---------------------------------------------------------------------# # target entries diff --git a/Packages/Stream_support/demo/Stream_support_LEDA/stream_iterator.C b/Packages/Stream_support/demo/Stream_support_LEDA/stream_iterator.C index 488c7e94ee5..591dc9930ea 100644 --- a/Packages/Stream_support/demo/Stream_support_LEDA/stream_iterator.C +++ b/Packages/Stream_support/demo/Stream_support_LEDA/stream_iterator.C @@ -9,14 +9,14 @@ #include #include #include -#include +#include using namespace CGAL; -typedef Cartesian TutorialR; -typedef Point_2 Point; -typedef Creator_uniform_2 Creator; -typedef Random_points_in_disc_2 Random_points_in_disc; +typedef Cartesian TutorialR; +typedef Point_2 Point; +typedef Creator_uniform_2 Creator; +typedef Random_points_in_disc_2 Random_points_in_disc; void init_window( leda_window& W) { cgalize( W); @@ -33,7 +33,7 @@ int main() // Use deterministic initialization for the random number generator. Random rnd(1); Random_points_in_disc rnd_points( 1.0, rnd); - copy_n( rnd_points, 100, points); + CGAL::copy_n( rnd_points, 100, points); // Display points in a 512x512 pixel window. leda_window W(512, 512);