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

Jump to bottom

Fix warning related to missing-variable-declarations. #5070

Merged
merged 7 commits into from
Apr 26, 2023
Merged

Fix warning related to missing-variable-declarations. #5070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c0947b7
Fix warning related to missing-variable-declarations, remove unused g…
Jackie9527 Apr 19, 2023
739cf15
Fix warning related to missing-variable-declarations, remove unused g…
Jackie9527 Apr 19, 2023
5738b3d
Fix warning related to missing-variable-declarations, add static to g…
Jackie9527 Apr 19, 2023
1244e58
Fix warning related to missing-variable-declarations, add static to g…
Jackie9527 Apr 19, 2023
46677b8
Fix warning related to missing-variable-declarations, add static to g…
Jackie9527 Apr 19, 2023
ff17f1f
Remove -Wno-missing-variable-declarations.
Jackie9527 Apr 19, 2023
230bee2
Merge branch 'master' into msvc-clang-missing-variable-declarations
kimkulling Apr 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/AssetLib/Assjson/cencode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ For details, see http://sourceforge.net/projects/libb64

#include "cencode.h" // changed from <B64/cencode.h>

const int CHARS_PER_LINE = 72;
static const int CHARS_PER_LINE = 72;

#ifdef _MSC_VER
#pragma warning(push)
Expand Down
3 changes: 2 additions & 1 deletion code/AssetLib/Blender/BlenderCustomData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ struct CustomDataTypeDescription {
* other (like CD_ORCO, ...) uses arrays of rawtypes or even arrays of Structures
* use a special readfunction for that cases
*/
std::array<CustomDataTypeDescription, CD_NUMTYPES> customDataTypeDescriptions = { { DECL_STRUCT_CUSTOMDATATYPEDESCRIPTION(MVert),
static std::array<CustomDataTypeDescription, CD_NUMTYPES> customDataTypeDescriptions = { {
DECL_STRUCT_CUSTOMDATATYPEDESCRIPTION(MVert),
DECL_UNSUPPORTED_CUSTOMDATATYPEDESCRIPTION,
DECL_UNSUPPORTED_CUSTOMDATATYPEDESCRIPTION,
DECL_STRUCT_CUSTOMDATATYPEDESCRIPTION(MEdge),
Expand Down
14 changes: 0 additions & 14 deletions code/AssetLib/FBX/FBXMaterial.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,20 +138,6 @@ Material::Material(uint64_t id, const Element& element, const Document& doc, con
// ------------------------------------------------------------------------------------------------
Material::~Material() = default;

aiVector2D uvTrans;
aiVector2D uvScaling;
ai_real uvRotation;

std::string type;
std::string relativeFileName;
std::string fileName;
std::string alphaSource;
std::shared_ptr<const PropertyTable> props;

unsigned int crop[4]{};

const Video* media;

// ------------------------------------------------------------------------------------------------
Texture::Texture(uint64_t id, const Element& element, const Document& doc, const std::string& name) :
Object(id,element,name),
Expand Down
2 changes: 1 addition & 1 deletion code/AssetLib/SIB/SIBImporter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ static const aiImporterDesc desc = {
struct SIBChunk {
uint32_t Tag;
uint32_t Size;
} PACK_STRUCT;
};

enum {
POS,
Expand Down
1 change: 1 addition & 0 deletions code/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1234,6 +1234,7 @@ IF (ASSIMP_WARNINGS_AS_ERRORS)
-Wno-header-hygiene
-Wno-tautological-value-range-compare
-Wno-tautological-type-limit-compare
-Wno-missing-noreturn
-Wno-missing-variable-declarations
-Wno-extra-semi
-Wno-nonportable-system-include-path
Expand Down
2 changes: 1 addition & 1 deletion contrib/unzip/unzip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
# pragma warning(disable : 4131 4244 4189 4245)
#endif // _MSC_VER

const char unz_copyright[] =
static const char unz_copyright[] =
" unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";

/* unz_file_info_internal contain internal info about a file in zipfile*/
Expand Down