godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix const warnings in FBX (build failure on macOS) 

Fixes several instances of error: 'const' type qualifier on return type has no effect [-Werror,-Wignored-qualifiers]

This looks like it was fixed in 6607fc7da9
when FBX was merged into the 4.0 master branch:

"- fixed const correctness with C++/C version change"
This commit is contained in:
Andy Maloney 2021-01-21 11:18:44 -05:00
parent 9d1d4d1f6a
commit 77f045db99
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/fbx/fbx_parser/FBXDocument.h
View File

@ -107,7 +107,7 @@ public:
return (flags & FAILED_TO_CONSTRUCT) != 0;
}
const ElementPtr GetElement() const {
ElementPtr GetElement() const {
return element;
}
@ -136,7 +136,7 @@ public:
virtual ~Object();
const ElementPtr SourceElement() const {
ElementPtr SourceElement() const {
return element;
}

10
modules/fbx/fbx_parser/FBXParser.cpp
View File

@ -1186,8 +1186,8 @@ std::string ParseTokenAsString(const TokenPtr t) {
// ------------------------------------------------------------------------------------------------
// extract a required element from a scope, abort if the element cannot be found
const ElementPtr GetRequiredElement(const ScopePtr sc, const std::string &index, const ElementPtr element /*= NULL*/) {
const ElementPtr el = sc->GetElement(index);
ElementPtr GetRequiredElement(const ScopePtr sc, const std::string &index, const ElementPtr element /*= NULL*/) {
ElementPtr el = sc->GetElement(index);
TokenPtr token = el->KeyToken();
ERR_FAIL_COND_V(!token, nullptr);
if (!el) {
@ -1207,14 +1207,14 @@ bool HasElement(const ScopePtr sc, const std::string &index) {
// ------------------------------------------------------------------------------------------------
// extract a required element from a scope, abort if the element cannot be found
const ElementPtr GetOptionalElement(const ScopePtr sc, const std::string &index, const ElementPtr element /*= NULL*/) {
const ElementPtr el = sc->GetElement(index);
ElementPtr GetOptionalElement(const ScopePtr sc, const std::string &index, const ElementPtr element /*= NULL*/) {
ElementPtr el = sc->GetElement(index);
return el;
}
// ------------------------------------------------------------------------------------------------
// extract required compound scope
const ScopePtr GetRequiredScope(const ElementPtr el) {
ScopePtr GetRequiredScope(const ElementPtr el) {
if (el) {
ScopePtr s = el->Compound();
TokenPtr token = el->KeyToken();

10
modules/fbx/fbx_parser/FBXParser.h
View File

@ -191,7 +191,7 @@ public:
Parser(const TokenList &tokens, bool is_binary);
~Parser();
const ScopePtr GetRootScope() const {
ScopePtr GetRootScope() const {
return root;
}
@ -247,11 +247,11 @@ void ParseVectorDataArray(std::vector<int64_t> &out, const ElementPtr el);
bool HasElement(const ScopePtr sc, const std::string &index);
// extract a required element from a scope, abort if the element cannot be found
const ElementPtr GetRequiredElement(const ScopePtr sc, const std::string &index, const ElementPtr element = nullptr);
const ScopePtr GetRequiredScope(const ElementPtr el); // New in 2020. (less likely to destroy application)
const ElementPtr GetOptionalElement(const ScopePtr sc, const std::string &index, const ElementPtr element = nullptr);
ElementPtr GetRequiredElement(const ScopePtr sc, const std::string &index, const ElementPtr element = nullptr);
ScopePtr GetRequiredScope(const ElementPtr el); // New in 2020. (less likely to destroy application)
ElementPtr GetOptionalElement(const ScopePtr sc, const std::string &index, const ElementPtr element = nullptr);
// extract required compound scope
const ScopePtr GetRequiredScope(const ElementPtr el);
ScopePtr GetRequiredScope(const ElementPtr el);
// get token at a particular index
TokenPtr GetRequiredToken(const ElementPtr el, unsigned int index);

2
modules/fbx/fbx_parser/FBXProperties.h
View File

@ -143,7 +143,7 @@ public:
PropertyPtr Get(const std::string &name) const;
// PropertyTable's need not be coupled with FBX elements so this can be NULL
const ElementPtr GetElement() const {
ElementPtr GetElement() const {
return element;
}