Attachment #394266 for bug #526564

Lines 20-26 Link Here

(-)k3d-source-0.7.11.0/k3dsdk/expression_grammar.h~ (-2 / +2 lines)
20	// License along with this program; if not, write to the Free Software	20	// License along with this program; if not, write to the Free Software
21	// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA	21	// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
22		22
23	#include <boost/spirit/core.hpp>	23	#include <boost/spirit/include/classic_core.hpp>
24	#include <cmath>	24	#include <cmath>
25	#include <functional>	25	#include <functional>
26	#include <iostream>	26	#include <iostream>
Lines 34-40 Link Here
34	namespace expression	34	namespace expression
35	{	35	{
36		36
37	using namespace boost::spirit;	37	using namespace boost::spirit::classic;
38		38
39	/// Defines a stack for holding intermediate values during parsing	39	/// Defines a stack for holding intermediate values during parsing
40	typedef std::stack<double> stack_t;	40	typedef std::stack<double> stack_t;

Lines 34-40 Link Here

(-)k3d-source-0.7.11.0/k3dsdk/measurement.cpp~ (-1 / +1 lines)
34	namespace measurement	34	namespace measurement
35	{	35	{
36		36
37	using namespace boost::spirit;	37	using namespace boost::spirit::classic;
38		38
39	bool parse(std::istream& Stream, double&Value, std::string& Units)	39	bool parse(std::istream& Stream, double&Value, std::string& Units)
40	{	40	{

Return to bug 526564