Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[openscenegraph] Fix '_FPOSOFF' has been deprecated #26231

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −0
Open

[openscenegraph] Fix '_FPOSOFF' has been deprecated #26231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions recipes/openscenegraph/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,9 @@ patches:
patch_source:
- https://github.com/openscenegraph/OpenSceneGraph/pull/1296
- https://github.com/openscenegraph/OpenSceneGraph/pull/951
- patch_file: patches/0012-_FPOSOFF-deprecated.patch
patch_description: _FPOSOFF identifier not found
patch_type: bugfix
patch_source:
- https://github.com/openscenegraph/OpenSceneGraph/issues/1323
- https://github.com/microsoft/vcpkg/pull/38666/files
13 changes: 13 additions & 0 deletions recipes/openscenegraph/all/patches/0012-_FPOSOFF-deprecated.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/osgPlugins/osga/OSGA_Archive.cpp b/src/osgPlugins/osga/OSGA_Archive.cpp
index b9f518a..19186a7 100644
--- a/src/osgPlugins/osga/OSGA_Archive.cpp
+++ b/src/osgPlugins/osga/OSGA_Archive.cpp
@@ -77,7 +77,7 @@ inline OSGA_Archive::pos_type ARCHIVE_POS( const std::streampos & pos )
#else // older Dinkumware (eg: one included in Win Server 2003 Platform SDK )
fpos_t position = pos.get_fpos_t();
#endif
- std::streamoff offset = pos.operator std::streamoff( ) - _FPOSOFF( position );
+ std::streamoff offset = 0;

return OSGA_Archive::pos_type( position + offset );
}