diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-19 02:10:20 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-19 02:10:20 +0400 |
| commit | 806e7273700dc6a9410a0d9ee262e6475830f9cf (patch) | |
| tree | c92566ee03a319de90da7a38bf9b3076fea4b5cb /source/blender/freestyle/intern | |
| parent | 008de305ef8f6793bf72dd14d071adc752dc1b51 (diff) | |
Suppressed MSVC warning C4521: multiple copy constructors specified.
Diffstat (limited to 'source/blender/freestyle/intern')
| -rw-r--r-- | source/blender/freestyle/intern/geometry/SweepLine.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/freestyle/intern/geometry/SweepLine.h b/source/blender/freestyle/intern/geometry/SweepLine.h index df73df155c4..ec81507c5c6 100644 --- a/source/blender/freestyle/intern/geometry/SweepLine.h +++ b/source/blender/freestyle/intern/geometry/SweepLine.h @@ -81,6 +81,10 @@ public: 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 @@ private: 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 */ |