Fix mismatched class/struct definition warnings [-Wmismatched-tags]
Fixes the following Clang 7 warnings: ``` core/object.cpp:44:1: warning: '_ObjectDebugLock' defined as a struct here but previously declared as a class [-Wmismatched-tags] core/variant_call.cpp:43:1: warning: '_VariantCall' defined as a struct here but previously declared as a class [-Wmismatched-tags] drivers/gles3/rasterizer_storage_gles3.h:765:2: warning: 'MultiMesh' defined as a struct here but previously declared as a class [-Wmismatched-tags] editor/editor_node.h:794:1: warning: 'EditorProgress' defined as a struct here but previously declared as a class [-Wmismatched-tags] modules/bullet/rigid_body_bullet.h:230:17: warning: class 'KinematicUtilities' was previously declared as a struct [-Wmismatched-tags] modules/bullet/space_bullet.h:60:1: warning: class 'btSoftBodyWorldInfo' was previously declared as a struct [-Wmismatched-tags] scene/resources/world_2d.cpp:40:1: warning: 'SpatialIndexer2D' defined as a struct here but previously declared as a class [-Wmismatched-tags] scene/resources/world.cpp:39:1: warning: 'SpatialIndexer' defined as a struct here but previously declared as a class [-Wmismatched-tags] servers/audio/reverb_sw.cpp:60:1: warning: 'ReverbParamsSW' defined as a struct here but previously declared as a class [-Wmismatched-tags] thirdparty/bullet/BulletSoftBody/btSoftBody.h:43:1: warning: 'btSoftBodyWorldInfo' defined as a struct here but previously declared as a class [-Wmismatched-tags] ```
This commit is contained in:
@ -422,7 +422,7 @@ private:
|
|||||||
};
|
};
|
||||||
|
|
||||||
#ifdef DEBUG_ENABLED
|
#ifdef DEBUG_ENABLED
|
||||||
friend class _ObjectDebugLock;
|
friend struct _ObjectDebugLock;
|
||||||
#endif
|
#endif
|
||||||
friend bool predelete_handler(Object *);
|
friend bool predelete_handler(Object *);
|
||||||
friend void postinitialize_handler(Object *);
|
friend void postinitialize_handler(Object *);
|
||||||
|
|||||||
@ -116,7 +116,7 @@ public:
|
|||||||
};
|
};
|
||||||
|
|
||||||
private:
|
private:
|
||||||
friend class _VariantCall;
|
friend struct _VariantCall;
|
||||||
// Variant takes 20 bytes when real_t is float, and 36 if double
|
// Variant takes 20 bytes when real_t is float, and 36 if double
|
||||||
// it only allocates extra memory for aabb/matrix.
|
// it only allocates extra memory for aabb/matrix.
|
||||||
|
|
||||||
|
|||||||
@ -691,7 +691,7 @@ public:
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
class MultiMesh;
|
struct MultiMesh;
|
||||||
|
|
||||||
struct Mesh : public GeometryOwner {
|
struct Mesh : public GeometryOwner {
|
||||||
|
|
||||||
|
|||||||
@ -37,10 +37,10 @@
|
|||||||
#include "scene/main/timer.h"
|
#include "scene/main/timer.h"
|
||||||
#include "scene/resources/texture.h"
|
#include "scene/resources/texture.h"
|
||||||
|
|
||||||
class EditorProgress;
|
|
||||||
class FileAccess;
|
class FileAccess;
|
||||||
class EditorExportPlatform;
|
class EditorExportPlatform;
|
||||||
class EditorFileSystemDirectory;
|
class EditorFileSystemDirectory;
|
||||||
|
struct EditorProgress;
|
||||||
|
|
||||||
class EditorExportPreset : public Reference {
|
class EditorExportPreset : public Reference {
|
||||||
|
|
||||||
|
|||||||
@ -227,7 +227,7 @@ public:
|
|||||||
|
|
||||||
void init_kinematic_utilities();
|
void init_kinematic_utilities();
|
||||||
void destroy_kinematic_utilities();
|
void destroy_kinematic_utilities();
|
||||||
_FORCE_INLINE_ class KinematicUtilities *get_kinematic_utilities() const { return kinematic_utilities; }
|
_FORCE_INLINE_ KinematicUtilities *get_kinematic_utilities() const { return kinematic_utilities; }
|
||||||
|
|
||||||
_FORCE_INLINE_ btRigidBody *get_bt_rigid_body() { return btBody; }
|
_FORCE_INLINE_ btRigidBody *get_bt_rigid_body() { return btBody; }
|
||||||
|
|
||||||
|
|||||||
@ -57,7 +57,7 @@ class btDiscreteDynamicsWorld;
|
|||||||
class btEmptyShape;
|
class btEmptyShape;
|
||||||
class btGhostPairCallback;
|
class btGhostPairCallback;
|
||||||
class btSoftRigidDynamicsWorld;
|
class btSoftRigidDynamicsWorld;
|
||||||
class btSoftBodyWorldInfo;
|
struct btSoftBodyWorldInfo;
|
||||||
class ConstraintBullet;
|
class ConstraintBullet;
|
||||||
class CollisionObjectBullet;
|
class CollisionObjectBullet;
|
||||||
class RigidBodyBullet;
|
class RigidBodyBullet;
|
||||||
|
|||||||
@ -36,9 +36,9 @@
|
|||||||
#include "servers/physics_server.h"
|
#include "servers/physics_server.h"
|
||||||
#include "servers/visual_server.h"
|
#include "servers/visual_server.h"
|
||||||
|
|
||||||
class SpatialIndexer;
|
|
||||||
class Camera;
|
class Camera;
|
||||||
class VisibilityNotifier;
|
class VisibilityNotifier;
|
||||||
|
struct SpatialIndexer;
|
||||||
|
|
||||||
class World : public Resource {
|
class World : public Resource {
|
||||||
GDCLASS(World, Resource);
|
GDCLASS(World, Resource);
|
||||||
|
|||||||
@ -29,13 +29,13 @@
|
|||||||
/*************************************************************************/
|
/*************************************************************************/
|
||||||
|
|
||||||
#include "world_2d.h"
|
#include "world_2d.h"
|
||||||
#include "servers/physics_2d_server.h"
|
|
||||||
#include "servers/visual_server.h"
|
|
||||||
//#include "servers/spatial_sound_2d_server.h"
|
|
||||||
#include "core/project_settings.h"
|
#include "core/project_settings.h"
|
||||||
#include "scene/2d/camera_2d.h"
|
#include "scene/2d/camera_2d.h"
|
||||||
#include "scene/2d/visibility_notifier_2d.h"
|
#include "scene/2d/visibility_notifier_2d.h"
|
||||||
#include "scene/main/viewport.h"
|
#include "scene/main/viewport.h"
|
||||||
|
#include "servers/physics_2d_server.h"
|
||||||
|
#include "servers/visual_server.h"
|
||||||
|
|
||||||
struct SpatialIndexer2D {
|
struct SpatialIndexer2D {
|
||||||
|
|
||||||
|
|||||||
@ -35,9 +35,9 @@
|
|||||||
#include "core/resource.h"
|
#include "core/resource.h"
|
||||||
#include "servers/physics_2d_server.h"
|
#include "servers/physics_2d_server.h"
|
||||||
|
|
||||||
class SpatialIndexer2D;
|
|
||||||
class VisibilityNotifier2D;
|
class VisibilityNotifier2D;
|
||||||
class Viewport;
|
class Viewport;
|
||||||
|
struct SpatialIndexer2D;
|
||||||
|
|
||||||
class World2D : public Resource {
|
class World2D : public Resource {
|
||||||
|
|
||||||
|
|||||||
@ -29,33 +29,21 @@
|
|||||||
/*************************************************************************/
|
/*************************************************************************/
|
||||||
|
|
||||||
#include "reverb_sw.h"
|
#include "reverb_sw.h"
|
||||||
|
|
||||||
#include "core/print_string.h"
|
#include "core/print_string.h"
|
||||||
#include "stdlib.h"
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
#define SETMIN(x, y) (x) = MIN((x), (y))
|
#define SETMIN(x, y) (x) = MIN((x), (y))
|
||||||
|
|
||||||
#define rangeloop(c, min, max) \
|
#define rangeloop(c, min, max) \
|
||||||
for ((c) = (min); (c) < (max); (c)++)
|
for ((c) = (min); (c) < (max); (c)++)
|
||||||
|
|
||||||
#define ABSDIFF(x, y) \
|
#define ABSDIFF(x, y) \
|
||||||
(((x) < (y)) ? ((y) - (x)) : ((x) - (y)))
|
(((x) < (y)) ? ((y) - (x)) : ((x) - (y)))
|
||||||
|
|
||||||
#ifdef bleh_MSC_VER
|
|
||||||
|
|
||||||
#if _MSC_VER >= 1400
|
|
||||||
_FORCE_INLINE_ int32_tMULSHIFT_S32(
|
|
||||||
int32_t Factor1,
|
|
||||||
int32_t Factor2,
|
|
||||||
uint8_t Bits) {
|
|
||||||
|
|
||||||
return __ll_rshift(
|
|
||||||
__emul(Factor1, Factor2),
|
|
||||||
Bits);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#else
|
|
||||||
#define MULSHIFT_S32(Factor1, Factor2, Bits) \
|
#define MULSHIFT_S32(Factor1, Factor2, Bits) \
|
||||||
((int)(((int64_t)(Factor1) * (Factor2)) >> (Bits)))
|
((int)(((int64_t)(Factor1) * (Factor2)) >> (Bits)))
|
||||||
#endif
|
|
||||||
|
|
||||||
struct ReverbParamsSW {
|
struct ReverbParamsSW {
|
||||||
unsigned int BufferSize; // Required buffer size
|
unsigned int BufferSize; // Required buffer size
|
||||||
|
|||||||
@ -34,7 +34,7 @@
|
|||||||
#include "core/os/memory.h"
|
#include "core/os/memory.h"
|
||||||
#include "core/typedefs.h"
|
#include "core/typedefs.h"
|
||||||
|
|
||||||
class ReverbParamsSW;
|
struct ReverbParamsSW;
|
||||||
|
|
||||||
class ReverbSW {
|
class ReverbSW {
|
||||||
public:
|
public:
|
||||||
|
|||||||
Reference in New Issue
Block a user