[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53897] branches/soc-2008-mxcurioni/source /blender/freestyle/intern/geometry/SweepLine.h: Suppressed MSVC warning C4521: multiple copy constructors specified.

[Tamito Kajiyama]

Revision: 53897
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53897
Author:   kjym3
Date:     2013-01-18 22:10:20 +0000 (Fri, 18 Jan 2013)
Log Message:
-----------
Suppressed MSVC warning C4521: multiple copy constructors specified.

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/SweepLine.h

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/SweepLine.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/SweepLine.h	2013-01-18 21:05:37 UTC (rev 53896)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/SweepLine.h	2013-01-18 22:10:20 UTC (rev 53897)
@@ -81,6 +81,10 @@
 	real tB; // parameter defining the intersection point with respect to the segment EdgeB.
 };
 
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4521) // disable warning C4521: multiple copy constructors specified
+#endif
 
 template<class T, class Point>
 class Segment
@@ -183,6 +187,10 @@
 	bool _order; // true if A and B are in the same order than _edge.A and _edge.B. false otherwise.
 };
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 /*! defines a binary function that can be overload by the user to specify at each condition the intersection
  *  between 2 edges must be computed
  */