From: pbristow_at_[hidden]
Date: 2008-03-05 10:52:22
Author: pbristow
Date: 2008-03-05 10:52:22 EST (Wed, 05 Mar 2008)
New Revision: 43512
URL: http://svn.boost.org/trac/boost/changeset/43512
Log:
Changed color tan to tanned to avoid a name clash with function tan.
Text files modified:
sandbox/SOC/2007/visualization/boost/svg_plot/svg_color.hpp | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
Modified: sandbox/SOC/2007/visualization/boost/svg_plot/svg_color.hpp
==============================================================================
--- sandbox/SOC/2007/visualization/boost/svg_plot/svg_color.hpp (original)
+++ sandbox/SOC/2007/visualization/boost/svg_plot/svg_color.hpp 2008-03-05 10:52:22 EST (Wed, 05 Mar 2008)
@@ -24,6 +24,7 @@
// underscore separator convention does not match the normal Boost format
// is that these names that are specified by the SVG standard.
// http://www.w3.org/TR/SVG/types.html#ColorKeywords
+// tan is also renamed to tanned to avoid clash with function tan in math.h
// -----------------------------------------------------------------
enum svg_color_constant
{
@@ -53,10 +54,12 @@
powderblue, purple, red, rosybrown, royalblue, saddlebrown,
salmon, sandybrown, seagreen, seashell, sienna, silver,
skyblue, slateblue, slategray, slategrey, snow, springgreen,
- steelblue, tan, teal, thistle, tomato, turquoise, violet,
+ steelblue, tanned,
+ // tan, // Note that tan would clash with tan in math.h
+ teal, thistle, tomato, turquoise, violet,
wheat, white, whitesmoke, yellow, yellowgreen,
blank // 'NotAColor' == 147
-};
+}; // enum svg_color_constant
// Forward declarations in this module (see svg_fwd):
struct svg_color;