From 388405d04a31bb376400eb828376aafcd2bbab6d Mon Sep 17 00:00:00 2001 From: Kp Date: Wed, 20 Aug 2014 01:50:40 +0000 Subject: [PATCH] Use std::swap instead of inline swap --- common/3d/clipper.cpp | 6 ++---- similar/main/automap.cpp | 5 +---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/common/3d/clipper.cpp b/common/3d/clipper.cpp index 39c20b1f7..2fb39e954 100644 --- a/common/3d/clipper.cpp +++ b/common/3d/clipper.cpp @@ -132,7 +132,7 @@ void clip_line(g3s_point **p0,g3s_point **p1,ubyte codes_or) if (codes_or & plane_flag) { if ((*p0)->p3_codes & plane_flag) - {g3s_point *t=*p0; *p0=*p1; *p1=t;} //swap! + std::swap(*p0, *p1); old_p1 = *p1; @@ -197,7 +197,6 @@ static int clip_plane(int plane_flag,g3s_point **src,g3s_point **dest,int *nv,g3 g3s_point **clip_polygon(g3s_point **src,g3s_point **dest,int *nv,g3s_codes *cc) { int plane_flag; - g3s_point **t; for (plane_flag=1;plane_flag<16;plane_flag<<=1) @@ -208,8 +207,7 @@ g3s_point **clip_polygon(g3s_point **src,g3s_point **dest,int *nv,g3s_codes *cc) if (cc->uand) //clipped away return dest; - t = src; src = dest; dest = t; - + std::swap(src, dest); } return src; //we swapped after we copied diff --git a/similar/main/automap.cpp b/similar/main/automap.cpp index 59daaa674..5de4cab3c 100644 --- a/similar/main/automap.cpp +++ b/similar/main/automap.cpp @@ -1059,7 +1059,6 @@ void draw_all_edges(automap *am) // Sort the bright ones using a shell sort { - int t; int i, j, incr, v1, v2; incr = nbright / 2; @@ -1073,9 +1072,7 @@ void draw_all_edges(automap *am) if (Segment_points[v1].p3_z < Segment_points[v2].p3_z) { // If not in correct order, them swap 'em - t=am->drawingListBright[j+incr]; - am->drawingListBright[j+incr]=am->drawingListBright[j]; - am->drawingListBright[j]=t; + std::swap(am->drawingListBright[j+incr], am->drawingListBright[j]); j -= incr; } else