|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r81892 - in sandbox/SOC/2007/visualization: boost/svg_plot/detail boost/svg_plot/impl libs/svg_plot/example
From: pbristow_at_[hidden]
Date: 2012-12-13 06:24:06
Author: pbristow
Date: 2012-12-13 06:24:05 EST (Thu, 13 Dec 2012)
New Revision: 81892
URL: http://svn.boost.org/trac/boost/changeset/81892
Log:
More warnings suppressed - using -std=c++11
Text files modified:
sandbox/SOC/2007/visualization/boost/svg_plot/detail/svg_tag.hpp | 16 ++++++++--------
sandbox/SOC/2007/visualization/boost/svg_plot/impl/svg_1d_plot.ipp | 13 +++++--------
sandbox/SOC/2007/visualization/libs/svg_plot/example/Jamfile.v2 | 10 +++++-----
3 files changed, 18 insertions(+), 21 deletions(-)
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 2012-12-13 06:24:05 EST (Thu, 13 Dec 2012)
@@ -235,11 +235,11 @@
/details Straight line from SVG location (x1, y1) to (x2, y2).
*/
- public:
+ public:
// private:
double x1_; //!< Line from (x1_, x2_) to (y1_, y2_)
- double x2_; //!< Line from (x1_, x2_) to (y1_, y2_)
double y1_; //!< Line from (x1_, x2_) to (y1_, y2_)
+ double x2_; //!< Line from (x1_, x2_) to (y1_, y2_)
double y2_; //!< Line from (x1_, x2_) to (y1_, y2_)
public:
@@ -255,7 +255,7 @@
const std::string& id_name = "",
const std::string& class_name = "",
const std::string& clip_name = "")
- : x1_(x1), x2_(x2), y1_(y1), y2_(y2),
+ : x1_(x1), y1_(y1), x2_(x2),y2_(y2),
svg_element(style_info, id_name, class_name, clip_name)
{ //! Constructor assigning all line_element private data,
//! and also inherited svg_element data.
@@ -263,7 +263,7 @@
void write(std::ostream& rhs)
{ /*! output line from (x1_, y1_) to (x2_, y2_) by
- writeing XML SVG command to draw a straight line.
+ writing XML SVG command to draw a straight line.
*/
/* \verbatim Example: <line x1="5" y1="185" x2="340" y2="185"/> \endverbatim */
rhs << "<line x1=\"" << x1_ << "\" y1=\"" << y1_
@@ -505,7 +505,7 @@
const std::string& id_name="", //!< ID of group, for example: PLOT_X_TICKS_VALUES.
const std::string& class_name="", //!< Name of SVG class, for example: "grid_style".
const std::string& clip_name="") //!< name of clip path.
- :
+ :
svg_element(style_info, id_name, class_name, clip_name),
cx_(cx), cy_(cy), rx_(rx), ry_(ry), rotate_(0.)
{ //!< Constructor sets ellipse and its style (defaults define all private data).
@@ -518,7 +518,7 @@
const std::string& class_name = "", //!< Name of SVG class."grid_style"
const std::string& clip_name = "") //!< name of clip path.
: cx_(cx), cy_(cy), rx_(4), ry_(8), // 4 and 8 are the same defaults used above.
-
+
svg_element(style_info, id_name, class_name, clip_name),
rotate_(0.) // Horizontal.
{ //!< Constructor that also includes style, id, class and clip.
@@ -899,7 +899,7 @@
tspan_element::tspan_element(const tspan_element& rhs)
:
text_length_(rhs.text_length_), use_x_(rhs.use_x_), use_y_(rhs.use_y_),
- use_text_length_(rhs.use_text_length_),
+ use_text_length_(rhs.use_text_length_),
text_parent(rhs), style_(rhs.style_),
x_(rhs.x_), y_(rhs.y_), dx_(rhs.dx_), dy_(rhs.dy_), rotate_(rhs.rotate_)
@@ -1245,7 +1245,7 @@
m_path(double x, double y, bool relative = false)
: path_point(relative),
- x(x), y(y)
+ x(x), y(y)
{ //! Construct a move to
}
}; // struct m_path
Modified: sandbox/SOC/2007/visualization/boost/svg_plot/impl/svg_1d_plot.ipp
==============================================================================
--- sandbox/SOC/2007/visualization/boost/svg_plot/impl/svg_1d_plot.ipp (original)
+++ sandbox/SOC/2007/visualization/boost/svg_plot/impl/svg_1d_plot.ipp 2012-12-13 06:24:05 EST (Thu, 13 Dec 2012)
@@ -56,11 +56,9 @@
{ // Might be useful to have defaults for begin and end? But unclear how.
//double temp = *i; // assume type is just double.
//boost::svg::unc temp = *i; // Assumes unc type.
+ //unc<false> temp = *i; // Should provide double, unc, meas ... type.
// So use auto to automatically make temp the right type.
-
- unc<false> temp = *i; // Should provide double, unc, meas ... type.
-// TODO will
- //auto temp = *i; // Should provide double, unc, meas ... type.
+ auto temp = *i; // Should provide double, unc, meas ... type.
//std::cout << "typeid(temp).name() = " << typeid(temp).name() << std::endl;
// typeid(temp).name() = class Meas
// typeid(temp).name() = class boost::svg::unc
@@ -739,7 +737,7 @@
return serieses_[serieses_.size() - 1]; // Reference to data series just added.
} // plot
-#ifdef _MSC_VER
+
template <typename T, typename U>
/*!
\tparam T floating-point type of the data (which must be convertible to double).
@@ -764,9 +762,8 @@
);
return serieses_[serieses_.size() - 1]; // Reference to data series just added.
} // plot
-#endif // _MSC_VER
-#ifdef _MSC_VER
+
template <typename T, typename U>
/*!
\tparam T floating-point type of the data (which must be convertible to double).
@@ -792,7 +789,7 @@
);
return serieses_[serieses_.size() - 1]; //!< \return Reference to data series just added.
} // plot
-#endif // _MSC_VER
+
// End Definitions of svg_plot_series Public Member Functions.
} // namespace svg
Modified: sandbox/SOC/2007/visualization/libs/svg_plot/example/Jamfile.v2
==============================================================================
--- sandbox/SOC/2007/visualization/libs/svg_plot/example/Jamfile.v2 (original)
+++ sandbox/SOC/2007/visualization/libs/svg_plot/example/Jamfile.v2 2012-12-13 06:24:05 EST (Thu, 13 Dec 2012)
@@ -27,16 +27,16 @@
# GCC
<toolset>gcc:<cxxflags>-w # Inhibit all warning messages.
<toolset>gcc:<cxxflags>-Wno-missing-braces
- #<toolset>gcc:<cxxflags>-std=c++0x
+ <toolset>gcc:<cxxflags>-std=c++11
# Darwin
#<toolset>darwin:<cxxflags>-Wno-missing-braces
#<toolset>acc:<cxxflags>+W2068,2461,2236,4070
#<toolset>intel:<cxxflags>-Qwd264,239
# Clang
- <toolset>clang:<cxxflags>-w # Inhibit all warning messages.
- <toolset>clang:<cxxflags>-fpermissive
- #<toolset>clang:<cxxflags>-Wno-reorder
- #<toolset>clang:<cxxflags>-Wno-unused-variable
+ #<toolset>clang:<cxxflags>-w # Inhibit all warning messages.
+ <toolset>clang:<cxxflags>-std=c++11
+ <toolset>clang:<cxxflags>-Wno-reorder
+ <toolset>clang:<cxxflags>-Wno-unused-variable
#<toolset>clang:<link>static
# MSVC
#<toolset>msvc:<link>static
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk