Skip to content

Commit

Permalink
fix -Wextra in Path
Browse files Browse the repository at this point in the history
  • Loading branch information
wwmayer committed Sep 23, 2016
1 parent 0857827 commit 3d6b4aa
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion src/Mod/Path/libarea/PythonStuff.cpp
Expand Up @@ -160,7 +160,7 @@ boost::python::list SplitArea(const CArea& a)
return alist;
}

void dxfArea(CArea& area, const char* str)
void dxfArea(CArea& area, const char* /*str*/)
{
area = CArea();
}
Expand Down
18 changes: 9 additions & 9 deletions src/Mod/Path/libarea/dxf.h
Expand Up @@ -143,16 +143,16 @@ class CDxfRead{

bool IgnoreErrors() const { return(m_ignore_errors); }

virtual void OnReadLine(const double* s, const double* e){}
virtual void OnReadPoint(const double* s){}
virtual void OnReadText(const double* point, const double height, const char* text){}
virtual void OnReadArc(const double* s, const double* e, const double* c, bool dir){}
virtual void OnReadCircle(const double* s, const double* c, bool dir){}
virtual void OnReadEllipse(const double* c, double major_radius, double minor_radius, double rotation, double start_angle, double end_angle, bool dir){}
virtual void OnReadSpline(struct SplineData& sd){}
virtual void OnReadInsert(const double* point, const double* scale, const char* name, double rotation){}
virtual void OnReadLine(const double* /*s*/, const double* /*e*/){}
virtual void OnReadPoint(const double* /*s*/){}
virtual void OnReadText(const double* /*point*/, const double /*height*/, const char* /*text*/){}
virtual void OnReadArc(const double* /*s*/, const double* /*e*/, const double* /*c*/, bool /*dir*/){}
virtual void OnReadCircle(const double* /*s*/, const double* /*c*/, bool /*dir*/){}
virtual void OnReadEllipse(const double* /*c*/, double /*major_radius*/, double /*minor_radius*/, double /*rotation*/, double /*start_angle*/, double /*end_angle*/, bool /*dir*/){}
virtual void OnReadSpline(struct SplineData& /*sd*/){}
virtual void OnReadInsert(const double* /*point*/, const double* /*scale*/, const char* /*name*/, double /*rotation*/){}
virtual void AddGraphics() const { }

std::string LayerName() const;
std::string LayerName() const;

};
6 changes: 3 additions & 3 deletions src/Mod/Path/libarea/kurve/geometry.h
Expand Up @@ -319,12 +319,12 @@ inline bool FNEZ(double a, double tolerance = TIGHT_TOLERANCE) {return fabs(a) >

inline const Vector2d operator-(void)const{return Vector2d(-dx, -dy);} // v1 = -v0; (unary minus)

inline const double operator*(const Vector2d &v)const{return (dx * v.dx + dy * v.dy);} // dot product m0.m1.cos a = v0 * v1
inline double operator*(const Vector2d &v)const{return (dx * v.dx + dy * v.dy);} // dot product m0.m1.cos a = v0 * v1
inline Vector2d operator*(double c)const{return Vector2d(dx*c, dy*c);} // scalar product
inline const Vector2d& operator*=(double c){dx *= c; dy *= c; return *this;} // scalar product
inline Vector2d operator*(int c)const{return Vector2d(dx*(double)c, dy*(double)c);} // scalar product

inline const double operator^(const Vector2d &v)const{return (dx * v.dy - dy * v.dx);} // cross product m0.m1.sin a = v0 ^ v1
inline double operator^(const Vector2d &v)const{return (dx * v.dy - dy * v.dx);} // cross product m0.m1.sin a = v0 ^ v1
inline Vector2d operator~(void)const{return Vector2d(-dy, dx);} // perp to left

bool operator==(const Vector2d &v)const; // v1 == v2
Expand Down Expand Up @@ -387,7 +387,7 @@ inline bool FNEZ(double a, double tolerance = TIGHT_TOLERANCE) {return fabs(a) >

const Vector3d operator-(void)const{return Vector3d(-dx, -dy, -dz);} // v1 = -v0; (unary minus)

const double operator*(const Vector3d &v)const{return (dx * v.dx + dy * v.dy + dz * v.dz);} // dot product m0 m1 cos a = v0 * v1
double operator*(const Vector3d &v)const{return (dx * v.dx + dy * v.dy + dz * v.dz);} // dot product m0 m1 cos a = v0 * v1

const Vector3d& operator*=(double c){dx *= c; dy *= c; dz *= c; return *this;} // scalar products
friend const Vector3d operator*(const Vector3d &v, double c){return Vector3d(v.dx*c, v.dy*c, v.dz*c);}
Expand Down

0 comments on commit 3d6b4aa

Please sign in to comment.