v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove deprecated c++11 warnings (#5576)

pull/5583/head^2
Kim Kulling 2024-05-15 10:22:03 +02:00 committed by GitHub
parent 10df90ec14
commit 942518a4ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/AssetLib/FBX/FBXParser.h
View File

@ -63,7 +63,6 @@ class Scope;
class Parser; class Parser;
class Element; class Element;
// XXX should use C++11's unique_ptr - but assimp's need to keep working with 03
using ScopeList = std::vector<Scope*>; using ScopeList = std::vector<Scope*>;
using ElementMap = std::fbx_unordered_multimap< std::string, Element*>; using ElementMap = std::fbx_unordered_multimap< std::string, Element*>;
using ElementCollection = std::pair<ElementMap::const_iterator,ElementMap::const_iterator>; using ElementCollection = std::pair<ElementMap::const_iterator,ElementMap::const_iterator>;

1
code/AssetLib/FBX/FBXProperties.cpp
View File

@ -243,7 +243,6 @@ DirectPropertyMap PropertyTable::GetUnparsedProperties() const
// Read the element's value. // Read the element's value.
// Wrap the naked pointer (since the call site is required to acquire ownership) // Wrap the naked pointer (since the call site is required to acquire ownership)
// std::unique_ptr from C++11 would be preferred both as a wrapper and a return value.
std::shared_ptr<Property> prop = std::shared_ptr<Property>(ReadTypedProperty(*currentElement.second)); std::shared_ptr<Property> prop = std::shared_ptr<Property>(ReadTypedProperty(*currentElement.second));
// Element could not be read. Skip it. // Element could not be read. Skip it.

36
contrib/draco/BUILDING.md
View File

@ -1,21 +1,23 @@
_**Contents**_ _**Contents**_
* [CMake Basics](#cmake-basics) - [Building](#building)
* [Mac OS X](#mac-os-x) - [CMake Basics](#cmake-basics)
* [Windows](#windows) - [Mac OS X](#mac-os-x)
* [CMake Build Configuration](#cmake-build-configuration) - [Windows](#windows)
* [Transcoder](#transcoder) - [CMake Build Configuration](#cmake-build-configuration)
* [Debugging and Optimization](#debugging-and-optimization) - [Transcoder](#transcoder)
* [Googletest Integration](#googletest-integration) - [Debugging and Optimization](#debugging-and-optimization)
* [Third Party Libraries](#third-party-libraries) - [Googletest Integration](#googletest-integration)
* [Javascript Encoder/Decoder](#javascript-encoderdecoder) - [Third Party Libraries](#third-party-libraries)
* [WebAssembly Decoder](#webassembly-decoder) - [WebAssembly Decoder](#webassembly-decoder)
* [WebAssembly Mesh Only Decoder](#webassembly-mesh-only-decoder) - [WebAssembly Mesh Only Decoder](#webassembly-mesh-only-decoder)
* [WebAssembly Point Cloud Only Decoder](#webassembly-point-cloud-only-decoder) - [WebAssembly Point Cloud Only Decoder](#webassembly-point-cloud-only-decoder)
* [iOS Builds](#ios-builds) - [Javascript Encoder/Decoder](#javascript-encoderdecoder)
* [Android Studio Project Integration](#android-studio-project-integration) - [iOS Builds](#ios-builds)
* [Native Android Builds](#native-android-builds) - [Native Android Builds](#native-android-builds)
* [vcpkg](#vcpkg) - [Android Studio Project Integration](#android-studio-project-integration)
- [Draco - Static Library](#draco---static-library)
- [vcpkg](#vcpkg)
Building Building
======== ========
@ -325,7 +327,7 @@ Draco - Static Library
To include Draco in an existing or new Android Studio project, reference it To include Draco in an existing or new Android Studio project, reference it
from the `cmake` file of an existing native project that has a minimum SDK from the `cmake` file of an existing native project that has a minimum SDK
version of 18 or higher. The project must support C++11. version of 18 or higher. The project must support C++11 at least.
To add Draco to your project: To add Draco to your project:
1. Create a new "Native C++" project. 1. Create a new "Native C++" project.