Commit 87c84bf8 authored by Matthias Möller's avatar Matthias Möller
Browse files

fix build error for C++98 compilers

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@20771 383ad7c9-94d9-4d36-a494-682f7c89f535
parent bb5e4014
...@@ -67,7 +67,7 @@ LineNode::LineNode( LineMode _mode, ...@@ -67,7 +67,7 @@ LineNode::LineNode( LineMode _mode,
BaseNode* _parent, BaseNode* _parent,
std::string _name ) : std::string _name ) :
MaterialNode(_parent, _name, MaterialNode::BaseColor | MaterialNode::LineWidth), MaterialNode(_parent, _name, MaterialNode::BaseColor | MaterialNode::LineWidth),
picking_line_width_(NAN), picking_line_width_(std::numeric_limits<float>::infinity()),
line_mode_(_mode), line_mode_(_mode),
draw_always_on_top (false), draw_always_on_top (false),
prev_depth_(GL_LESS), prev_depth_(GL_LESS),
......
...@@ -60,6 +60,7 @@ ...@@ -60,6 +60,7 @@
#include "DrawModes.hh" #include "DrawModes.hh"
#include <ACG/GL/VertexDeclaration.hh> #include <ACG/GL/VertexDeclaration.hh>
#include <vector> #include <vector>
#include <limits>
//== NAMESPACES =============================================================== //== NAMESPACES ===============================================================
...@@ -170,7 +171,7 @@ public: ...@@ -170,7 +171,7 @@ public:
/// get line width used by the picking renderer. Defaults to line_width(). /// get line width used by the picking renderer. Defaults to line_width().
float picking_line_width() const float picking_line_width() const
{ {
return (picking_line_width_ != NAN) ? picking_line_width_ : line_width(); return (picking_line_width_ != std::numeric_limits<float>::infinity()) ? picking_line_width_ : line_width();
} }
/// number of points /// number of points
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment