Skip to content

Commit 313f2c8

Browse files
committedJan 16, 2015
OVERRIDE macro breaks globeplugin (OVERRIDE is an enum value in OpenSceneGraph)
replace 'OVERRIDE' macro with 'override' keyword in code and define it an empty macro where C++11 is not available (followup 466f256)
1 parent 11d331d commit 313f2c8

File tree

404 files changed

+2600
-2603
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

404 files changed

+2600
-2603
lines changed
 

‎CMakeLists.txt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -337,12 +337,9 @@ ELSE()
337337
ENDIF()
338338

339339
#allow override keyword if available
340-
IF (USE_CXX_11)
341-
SET(OVERRIDEKEYWORD "override")
342-
ELSE()
343-
SET(OVERRIDEKEYWORD "")
340+
IF (NOT USE_CXX_11)
341+
ADD_DEFINITIONS("-Doverride=")
344342
ENDIF()
345-
ADD_DEFINITIONS("-DOVERRIDE=${OVERRIDEKEYWORD}")
346343

347344
#############################################################
348345
# enable warnings

‎src/analysis/interpolation/Bezier3D.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,34 +36,34 @@ class ANALYSIS_EXPORT Bezier3D: public ParametricLine
3636
/**Destructor*/
3737
virtual ~Bezier3D();
3838
/**Do not use this method, since a Bezier curve does not consist of other curves*/
39-
virtual void add( ParametricLine *pl ) OVERRIDE;
39+
virtual void add( ParametricLine *pl ) override;
4040
/**Calculates the first derivative and assigns it to v*/
41-
virtual void calcFirstDer( float t, Vector3D* v ) OVERRIDE;
41+
virtual void calcFirstDer( float t, Vector3D* v ) override;
4242
/**Calculates the second derivative and assigns it to v*/
43-
virtual void calcSecDer( float t, Vector3D* v ) OVERRIDE;
43+
virtual void calcSecDer( float t, Vector3D* v ) override;
4444
//virtual Point3D calcPoint(float t);
4545
/**Calculates the point on the curve and assigns it to p*/
46-
virtual void calcPoint( float t, Point3D* p ) OVERRIDE;
46+
virtual void calcPoint( float t, Point3D* p ) override;
4747
/**changes the order of control points*/
48-
virtual void changeDirection() OVERRIDE;
48+
virtual void changeDirection() override;
4949
//virtual void draw(QPainter* p);
5050
//virtual bool intersects(ParametricLine* pal);
5151
/**Do not use this method, since a Bezier curve does not consist of other curves*/
52-
virtual void remove( int i ) OVERRIDE;
52+
virtual void remove( int i ) override;
5353
/**Returns a control point*/
54-
virtual const Point3D* getControlPoint( int number ) const OVERRIDE;
54+
virtual const Point3D* getControlPoint( int number ) const override;
5555
/**Returns a pointer to the control polygon*/
5656
//! @note not available in python binding
57-
virtual const QVector<Point3D*>* getControlPoly() const OVERRIDE;
57+
virtual const QVector<Point3D*>* getControlPoly() const override;
5858
/**Returns the degree of the curve*/
59-
virtual int getDegree() const OVERRIDE;
59+
virtual int getDegree() const override;
6060
/**Returns the parent*/
61-
virtual ParametricLine* getParent() const OVERRIDE;
61+
virtual ParametricLine* getParent() const override;
6262
/** Sets the parent*/
63-
virtual void setParent( ParametricLine* par ) OVERRIDE;
63+
virtual void setParent( ParametricLine* par ) override;
6464
/**Sets the control polygon*/
6565
//! @note not available in python binding
66-
virtual void setControlPoly( QVector<Point3D*>* cp ) OVERRIDE;
66+
virtual void setControlPoly( QVector<Point3D*>* cp ) override;
6767

6868
};
6969

0 commit comments

Comments
 (0)
Failed to load comments.