From d50ed5bc0ca30f5a6cf62cc8c9a71e81226baf88 Mon Sep 17 00:00:00 2001 From: Dmitrii V Pasechnik Date: Wed, 3 Jan 2001 18:50:52 +0000 Subject: [PATCH] Small changes for MSVC-compatibility (std:: prefixes etc) --- Packages/Viewer_3/demo/Viewer_3/demo_win.h | 4 ++++ Packages/Viewer_3/demo/Viewer_3/myhandler.h | 2 +- Packages/Viewer_3/demo/Viewer_3/text.h | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Packages/Viewer_3/demo/Viewer_3/demo_win.h b/Packages/Viewer_3/demo/Viewer_3/demo_win.h index ba79870eed6..8ad5625007a 100644 --- a/Packages/Viewer_3/demo/Viewer_3/demo_win.h +++ b/Packages/Viewer_3/demo/Viewer_3/demo_win.h @@ -1,7 +1,11 @@ #include #include #include + +#if !defined(_MSC_VER) && !defined(__BORLANDC__) #include +#endif + //#include "triang_2.h" typedef CGAL::Cartesian rep_t; diff --git a/Packages/Viewer_3/demo/Viewer_3/myhandler.h b/Packages/Viewer_3/demo/Viewer_3/myhandler.h index ad89b6148de..7b8428d22b5 100644 --- a/Packages/Viewer_3/demo/Viewer_3/myhandler.h +++ b/Packages/Viewer_3/demo/Viewer_3/myhandler.h @@ -1,6 +1,6 @@ void myhandler(int x, int y, int but, CGAL::GL_win *W) { - vector v(3); + std::vector v(3); v[0]=x*2; v[1]=y*2; v[2]=0; W->add_point_to_object(1,1,v); diff --git a/Packages/Viewer_3/demo/Viewer_3/text.h b/Packages/Viewer_3/demo/Viewer_3/text.h index 612fb8a5786..5b816be3f8f 100644 --- a/Packages/Viewer_3/demo/Viewer_3/text.h +++ b/Packages/Viewer_3/demo/Viewer_3/text.h @@ -29,8 +29,8 @@ void draw_tri_tex(double x1, double y1, double z1,double x2, double glPolygonMode(GL_FRONT,GL_FILL); glBegin(GL_TRIANGLES); - vector v1(3); - vector v2(3); + std::vector v1(3); + std::vector v2(3); v1 = CGAL::normal(x1,y1,z1,x2,y2,z2,x3,y3,z3); v2[0]= -v1[0]; v2[1]=-v1[1] ; v2[2]= -v1[2];