[Boost-commit] svn:boost r7452

From: jakevoytko_at_[hidden]
Date: 2007-07-16 20:27:09

Author: jakevoytko
Date: 2007-07-16 20:27:08 EDT (Mon, 16 Jul 2007)
New Revision: 7452
URL: http://svn.boost.org/trac/boost/changeset/7452

Log:
GCC 4.1 bug fixes

Removed:
   sandbox/SOC/2007/visualization/boost/svg_plot/detail/svg_plot_instruction.hpp
Text files modified: 
   sandbox/SOC/2007/visualization/boost/svg_plot/detail/axis_plot_frame.hpp |     2 +-                                      
   sandbox/SOC/2007/visualization/boost/svg_plot/detail/svg_style.hpp       |     2 +-                                      
   sandbox/SOC/2007/visualization/boost/svg_plot/detail/svg_tag.hpp         |     4 ++--                                    
   sandbox/SOC/2007/visualization/boost/svg_plot/svg.hpp                    |     4 ++--                                    
   sandbox/SOC/2007/visualization/boost/svg_plot/svg_2d_plot.hpp            |     2 +-                                      
   5 files changed, 7 insertions(+), 7 deletions(-)

Modified: sandbox/SOC/2007/visualization/boost/svg_plot/detail/axis_plot_frame.hpp
==============================================================================
--- sandbox/SOC/2007/visualization/boost/svg_plot/detail/axis_plot_frame.hpp	(original)
+++ sandbox/SOC/2007/visualization/boost/svg_plot/detail/axis_plot_frame.hpp	2007-07-16 20:27:08 EDT (Mon, 16 Jul 2007)
@@ -695,7 +695,7 @@
 
     unsigned int get_image_x_size()
     {
-        return derived()image.get_x_size();
+        return derived().image.get_x_size();
     }
 
     unsigned int get_image_y_size()

Deleted: sandbox/SOC/2007/visualization/boost/svg_plot/detail/svg_plot_instruction.hpp
==============================================================================
--- sandbox/SOC/2007/visualization/boost/svg_plot/detail/svg_plot_instruction.hpp	2007-07-16 20:27:08 EDT (Mon, 16 Jul 2007)
+++ (empty file)
@@ -1,47 +0,0 @@
-// svg_plot_instruction.hpp
-
-// Copyright (C) Jacob Voytko 2007
-//
-// Distributed under the Boost Software License, Version 1.0.
-// For more information, see http://www.boost.org

-
-// ----------------------------------------------------------------- 
-
-#ifndef _BOOST_SVG_SVG_PLOT_INSTRUCTION_HPP
-#define _BOOST_SVG_SVG_PLOT_INSTRUCTION_HPP
-
-#include <iterator>
-#include "svg_style.hpp"
-
-namespace boost {
-namespace svg {
-
-// -----------------------------------------------------------------
-// This struct is the smallest amount of information necessary at
-// the moment to display a legend with enough information
-// -----------------------------------------------------------------
-struct legend_point
-{
-    svg_color stroke_color;
-    svg_color fill_color;
-    std::string text;
-
-    legend_point(const svg_color& _stroke, const svg_color& _fill,
-        std::string _text): stroke_color(_stroke), fill_color(_fill),
-        text(_text)
-    {
-
-    }
-
-    legend_point(svg_color_constant _stroke, svg_color_constant _fill,
-        std::string _text): stroke_color(constant_to_rgb(_stroke)), 
-        fill_color(constant_to_rgb(_fill)),
-        text(_text)
-    {
-
-    }
-};
-}
-}
-
-#endif

Modified: sandbox/SOC/2007/visualization/boost/svg_plot/detail/svg_style.hpp
==============================================================================
--- sandbox/SOC/2007/visualization/boost/svg_plot/detail/svg_style.hpp	(original)
+++ sandbox/SOC/2007/visualization/boost/svg_plot/detail/svg_style.hpp	2007-07-16 20:27:08 EDT (Mon, 16 Jul 2007)
@@ -319,7 +319,7 @@
     unsigned int get_stroke_width() { return stroke_width;               };
 
     
-    void svg_style::write(std::ostream& rhs)
+    void write(std::ostream& rhs)
     {
         rhs << "stroke=\"";
         stroke_color.write(rhs);

Modified: sandbox/SOC/2007/visualization/boost/svg_plot/detail/svg_tag.hpp
==============================================================================
--- sandbox/SOC/2007/visualization/boost/svg_plot/detail/svg_tag.hpp	(original)
+++ sandbox/SOC/2007/visualization/boost/svg_plot/detail/svg_tag.hpp	2007-07-16 20:27:08 EDT (Mon, 16 Jul 2007)
@@ -107,14 +107,14 @@
     double x1, x2, y1, y2, y;
 
 public:
-    line_element::line_element(double _x1, double _y1, double _x2,
+    line_element(double _x1, double _y1, double _x2,
                                  double _y2):x1(_x1), y1(_y1),
                                  x2(_x2), y2(_y2)
     {
         
     }
 
-    void line_element::write(std::ostream& rhs)
+    void write(std::ostream& rhs)
     {
         rhs<<"<line x1=\""<<x1<<"\" y1=\""<<y1<<"\" x2=\""<<x2<<"\" y2=\""
             <<y2<<"\"/>";

Modified: sandbox/SOC/2007/visualization/boost/svg_plot/svg.hpp
==============================================================================
--- sandbox/SOC/2007/visualization/boost/svg_plot/svg.hpp	(original)
+++ sandbox/SOC/2007/visualization/boost/svg_plot/svg.hpp	2007-07-16 20:27:08 EDT (Mon, 16 Jul 2007)
@@ -58,12 +58,12 @@
 
 public:
 
-    svg::svg():x_size(400), y_size(400)
+    svg():x_size(400), y_size(400)
     {
 
     }
 
-    svg::svg(const svg& rhs):x_size(rhs.x_size), y_size(rhs.y_size)
+    svg(const svg& rhs):x_size(rhs.x_size), y_size(rhs.y_size)
     {
         
     }

Modified: sandbox/SOC/2007/visualization/boost/svg_plot/svg_2d_plot.hpp
==============================================================================
--- sandbox/SOC/2007/visualization/boost/svg_plot/svg_2d_plot.hpp	(original)
+++ sandbox/SOC/2007/visualization/boost/svg_plot/svg_2d_plot.hpp	2007-07-16 20:27:08 EDT (Mon, 16 Jul 2007)
@@ -57,7 +57,7 @@
 class svg_2d_plot: public axis_plot_frame<svg_2d_plot>
 {
 private:
-    friend axis_plot_frame<svg_2d_plot>;
+    friend class axis_plot_frame<svg_2d_plot>;
     
     double x_scale, x_shift;
     double y_scale, y_shift;