FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #589 from Vic-Min/master

Browse Source 
Renamed USE_DEPRECATED_API to OSG_USE_DEPRECATED_API
This commit is contained in:
OpenSceneGraph git repository 2018-08-08 14:36:35 +01:00 committed by GitHub
commit 08ec85e3a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/osg/Matrixd
View File

@ -327,7 +327,7 @@ class OSG_EXPORT Matrixd
inline Vec4f operator* ( const Vec4f& v ) const; inline Vec4f operator* ( const Vec4f& v ) const;
inline Vec4d operator* ( const Vec4d& v ) const; inline Vec4d operator* ( const Vec4d& v ) const;
#ifdef USE_DEPRECATED_API #ifdef OSG_USE_DEPRECATED_API
inline void set(const Quat& q) { makeRotate(q); } /// deprecated, replace with makeRotate(q) inline void set(const Quat& q) { makeRotate(q); } /// deprecated, replace with makeRotate(q)
inline void get(Quat& q) const { q = getRotate(); } /// deprecated, replace with getRotate() inline void get(Quat& q) const { q = getRotate(); } /// deprecated, replace with getRotate()
#endif #endif

2
include/osg/Matrixf
View File

@ -328,7 +328,7 @@ class OSG_EXPORT Matrixf
inline Vec4f operator* ( const Vec4f& v ) const; inline Vec4f operator* ( const Vec4f& v ) const;
inline Vec4d operator* ( const Vec4d& v ) const; inline Vec4d operator* ( const Vec4d& v ) const;
#ifdef USE_DEPRECATED_API #ifdef OSG_USE_DEPRECATED_API
inline void set(const Quat& q) { makeRotate(q); } inline void set(const Quat& q) { makeRotate(q); }
inline void get(Quat& q) const { q = getRotate(); } inline void get(Quat& q) const { q = getRotate(); }
#endif #endif