mirror of
https://review.haiku-os.org/haiku
synced 2025-01-18 12:38:51 +01:00
Fix clang warning "mismatched-tags"
Change-Id: I00f26e27d8ac24a46b528ea7ed47b92c2967ff2e Reviewed-on: https://review.haiku-os.org/c/haiku/+/2390 Reviewed-by: waddlesplash <waddlesplash@gmail.com>
This commit is contained in:
parent
77f5125586
commit
8152128002
@ -16,7 +16,7 @@ class BPopUpMenu;
|
||||
class BShelf;
|
||||
|
||||
namespace BPrivate {
|
||||
class replicant_data;
|
||||
struct replicant_data;
|
||||
class ShelfContainerViewFilter;
|
||||
};
|
||||
|
||||
@ -79,7 +79,7 @@ protected:
|
||||
|
||||
private:
|
||||
friend class BPrivate::ShelfContainerViewFilter;
|
||||
friend class BPrivate::replicant_data;
|
||||
friend struct BPrivate::replicant_data;
|
||||
friend class Private;
|
||||
friend class BShelf;
|
||||
|
||||
|
@ -20,7 +20,7 @@ class _BZombieReplicantView_;
|
||||
struct entry_ref;
|
||||
|
||||
namespace BPrivate {
|
||||
class replicant_data;
|
||||
struct replicant_data;
|
||||
class ShelfContainerViewFilter;
|
||||
};
|
||||
|
||||
@ -116,10 +116,10 @@ private:
|
||||
BPoint* location, uint32 uniqueID);
|
||||
BView* _GetReplicant(BMessage* data, BView* view,
|
||||
const BPoint& point, BDragger*& dragger,
|
||||
BDragger::relation& relation);
|
||||
BDragger::relation& relation);
|
||||
_BZombieReplicantView_* _CreateZombie(BMessage *data,
|
||||
BDragger *&dragger);
|
||||
|
||||
|
||||
status_t _GetProperty(BMessage* message,
|
||||
BMessage* reply);
|
||||
static void _GetReplicantData(BMessage* message,
|
||||
@ -141,7 +141,7 @@ private:
|
||||
bool fDisplayZombies;
|
||||
bool fAllowZombies;
|
||||
bool fTypeEnforced;
|
||||
|
||||
|
||||
uint32 _reserved[8];
|
||||
};
|
||||
|
||||
|
@ -10,7 +10,7 @@ struct entry_ref;
|
||||
|
||||
class BFile;
|
||||
class BList;
|
||||
class BMidiEvent;
|
||||
struct BMidiEvent;
|
||||
|
||||
class BMidiStore : public BMidi {
|
||||
public:
|
||||
@ -63,14 +63,14 @@ public:
|
||||
uint32 EventAtDelta(uint32 time) const;
|
||||
|
||||
uint32 BeginTime() const;
|
||||
|
||||
|
||||
void SetTempo(int32 beatsPerMinute);
|
||||
int32 Tempo() const;
|
||||
|
||||
private:
|
||||
|
||||
friend class BMidiSynthFile;
|
||||
|
||||
|
||||
virtual void _ReservedMidiStore1();
|
||||
virtual void _ReservedMidiStore2();
|
||||
virtual void _ReservedMidiStore3();
|
||||
@ -126,7 +126,7 @@ private:
|
||||
bool fLooping;
|
||||
bool fPaused;
|
||||
bool fFinished;
|
||||
|
||||
|
||||
uint32 _reserved2[12];
|
||||
};
|
||||
|
||||
|
@ -16,7 +16,7 @@
|
||||
namespace BPrivate {
|
||||
|
||||
|
||||
struct KMessage;
|
||||
class KMessage;
|
||||
|
||||
|
||||
status_t get_extended_team_info(team_id teamID, uint32 flags, KMessage& info);
|
||||
|
@ -49,7 +49,7 @@ private:
|
||||
|
||||
friend class BMediaClient;
|
||||
friend class BMediaConnection;
|
||||
friend class media_connection;
|
||||
friend struct media_connection;
|
||||
} media_client;
|
||||
|
||||
|
||||
|
@ -17,7 +17,7 @@
|
||||
#define NET_DATALINK_MODULE_NAME "network/stack/datalink/v1"
|
||||
|
||||
|
||||
struct Checksum;
|
||||
class Checksum;
|
||||
struct net_protocol;
|
||||
|
||||
|
||||
@ -171,7 +171,7 @@ struct net_address_module_info {
|
||||
uint32 (*hash_address_pair)(const struct sockaddr* ourAddress,
|
||||
const struct sockaddr* peerAddress);
|
||||
|
||||
status_t (*checksum_address)(struct Checksum* checksum,
|
||||
status_t (*checksum_address)(Checksum* checksum,
|
||||
const struct sockaddr* address);
|
||||
|
||||
void (*get_loopback_address)(struct sockaddr* result);
|
||||
|
@ -87,7 +87,7 @@ public:
|
||||
virtual status_t SystemShuttingDown();
|
||||
|
||||
private:
|
||||
friend struct KeyboardDevice;
|
||||
friend class KeyboardDevice;
|
||||
// TODO: needed by the control thread to remove a dead device
|
||||
// find a better way...
|
||||
|
||||
|
@ -499,7 +499,7 @@ ipv4_hash_address_pair(const sockaddr *ourAddress, const sockaddr *peerAddress)
|
||||
the given address is not initialized
|
||||
*/
|
||||
static status_t
|
||||
ipv4_checksum_address(struct Checksum *checksum, const sockaddr *address)
|
||||
ipv4_checksum_address(Checksum *checksum, const sockaddr *address)
|
||||
{
|
||||
if (checksum == NULL || address == NULL || address->sa_len == 0)
|
||||
return B_BAD_VALUE;
|
||||
|
@ -183,7 +183,7 @@ public:
|
||||
|
||||
private:
|
||||
// for g++ 2.95
|
||||
friend class HashDefinition;
|
||||
friend struct HashDefinition;
|
||||
|
||||
Filter *fParent;
|
||||
AddressType fMulticastAddress;
|
||||
|
@ -518,7 +518,7 @@ ipv6_hash_address_pair(const sockaddr *ourAddress, const sockaddr *peerAddress)
|
||||
the given address is not initialized
|
||||
*/
|
||||
static status_t
|
||||
ipv6_checksum_address(struct Checksum *checksum, const sockaddr *address)
|
||||
ipv6_checksum_address(Checksum *checksum, const sockaddr *address)
|
||||
{
|
||||
if (checksum == NULL || address == NULL || address->sa_len == 0)
|
||||
return B_BAD_VALUE;
|
||||
|
@ -192,7 +192,7 @@ public:
|
||||
|
||||
private:
|
||||
// for g++ 2.95
|
||||
friend class HashDefinition;
|
||||
friend struct HashDefinition;
|
||||
|
||||
Filter *fParent;
|
||||
AddressType fMulticastAddress;
|
||||
|
@ -122,9 +122,9 @@ private:
|
||||
private:
|
||||
TCPEndpoint* fConnectionHashLink;
|
||||
TCPEndpoint* fEndpointHashLink;
|
||||
friend class EndpointManager;
|
||||
friend class ConnectionHashDefinition;
|
||||
friend class EndpointHashDefinition;
|
||||
friend class EndpointManager;
|
||||
friend struct ConnectionHashDefinition;
|
||||
friend class EndpointHashDefinition;
|
||||
|
||||
mutex fLock;
|
||||
EndpointManager* fManager;
|
||||
|
@ -277,7 +277,7 @@ unix_hash_address_pair(const sockaddr *ourAddress, const sockaddr *peerAddress)
|
||||
|
||||
|
||||
static status_t
|
||||
unix_checksum_address(struct Checksum *checksum, const sockaddr *_address)
|
||||
unix_checksum_address(Checksum *checksum, const sockaddr *_address)
|
||||
{
|
||||
if (checksum == NULL || _address == NULL)
|
||||
return B_BAD_VALUE;
|
||||
|
@ -49,7 +49,7 @@
|
||||
|
||||
#include <MediaDefs.h>
|
||||
|
||||
class dormant_node_info;
|
||||
struct dormant_node_info;
|
||||
|
||||
#include "cortex_defs.h"
|
||||
__BEGIN_CORTEX_NAMESPACE
|
||||
@ -63,16 +63,16 @@ class ConnectionIO :
|
||||
|
||||
public: // *** ctor/dtor
|
||||
virtual ~ConnectionIO();
|
||||
|
||||
|
||||
ConnectionIO();
|
||||
|
||||
|
||||
ConnectionIO(
|
||||
const Connection* con,
|
||||
const NodeManager* manager,
|
||||
const NodeSetIOContext* context);
|
||||
|
||||
bool exportValid() const { return m_exportValid; }
|
||||
|
||||
|
||||
public: // *** operations
|
||||
|
||||
// call when object imported to create the described
|
||||
@ -89,16 +89,16 @@ public: // *** document-type setup
|
||||
public: // *** IPersistent
|
||||
|
||||
// EXPORT:
|
||||
|
||||
|
||||
void xmlExportBegin(
|
||||
ExportContext& context) const;
|
||||
|
||||
|
||||
void xmlExportAttributes(
|
||||
ExportContext& context) const;
|
||||
|
||||
|
||||
void xmlExportContent(
|
||||
ExportContext& context) const;
|
||||
|
||||
|
||||
void xmlExportEnd(
|
||||
ExportContext& context) const;
|
||||
|
||||
@ -111,16 +111,16 @@ public: // *** IPersistent
|
||||
const char* key,
|
||||
const char* value,
|
||||
ImportContext& context);
|
||||
|
||||
|
||||
virtual void xmlImportContent(
|
||||
const char* data,
|
||||
uint32 length,
|
||||
ImportContext& context);
|
||||
|
||||
|
||||
virtual void xmlImportChild(
|
||||
IPersistent* child,
|
||||
ImportContext& context);
|
||||
|
||||
|
||||
virtual void xmlImportComplete(
|
||||
ImportContext& context);
|
||||
|
||||
@ -138,19 +138,19 @@ private: // *** implementation
|
||||
LiveNodeIO* m_inputNodeIO;
|
||||
|
||||
BString m_outputName; // original name if available
|
||||
media_format m_outputFormat;
|
||||
media_format m_outputFormat;
|
||||
|
||||
LiveNodeIO* m_outputNodeIO;
|
||||
LiveNodeIO* m_outputNodeIO;
|
||||
|
||||
BString m_inputName; // original name if available
|
||||
media_format m_inputFormat;
|
||||
|
||||
media_format m_inputFormat;
|
||||
|
||||
media_format m_requestedFormat;
|
||||
|
||||
uint32 m_flags;
|
||||
|
||||
bool m_exportValid;
|
||||
|
||||
|
||||
// import state
|
||||
enum import_state_t {
|
||||
IMPORT_NONE,
|
||||
|
@ -46,7 +46,7 @@
|
||||
#include <String.h>
|
||||
#include <Entry.h>
|
||||
|
||||
class dormant_node_info;
|
||||
struct dormant_node_info;
|
||||
|
||||
#include "cortex_defs.h"
|
||||
__BEGIN_CORTEX_NAMESPACE
|
||||
@ -58,14 +58,14 @@ class DormantNodeIO :
|
||||
|
||||
public: // *** ctor/dtor
|
||||
virtual ~DormantNodeIO();
|
||||
|
||||
|
||||
DormantNodeIO();
|
||||
DormantNodeIO(
|
||||
NodeRef* ref,
|
||||
const char* nodeKey);
|
||||
|
||||
bool exportValid() const { return m_exportValid; }
|
||||
|
||||
|
||||
const char* nodeKey() const { return m_nodeKey.String(); }
|
||||
|
||||
public: // *** operations
|
||||
@ -82,16 +82,16 @@ public: // *** document-type setup
|
||||
public: // *** IPersistent
|
||||
|
||||
// EXPORT:
|
||||
|
||||
|
||||
void xmlExportBegin(
|
||||
ExportContext& context) const;
|
||||
|
||||
|
||||
void xmlExportAttributes(
|
||||
ExportContext& context) const;
|
||||
|
||||
|
||||
void xmlExportContent(
|
||||
ExportContext& context) const;
|
||||
|
||||
|
||||
void xmlExportEnd(
|
||||
ExportContext& context) const;
|
||||
|
||||
@ -104,19 +104,19 @@ public: // *** IPersistent
|
||||
const char* key,
|
||||
const char* value,
|
||||
ImportContext& context);
|
||||
|
||||
|
||||
virtual void xmlImportContent(
|
||||
const char* data,
|
||||
uint32 length,
|
||||
ImportContext& context);
|
||||
|
||||
|
||||
virtual void xmlImportChild(
|
||||
IPersistent* child,
|
||||
ImportContext& context);
|
||||
|
||||
|
||||
virtual void xmlImportComplete(
|
||||
ImportContext& context);
|
||||
|
||||
|
||||
private: // *** implementation
|
||||
// imported data
|
||||
BString m_nodeKey;
|
||||
@ -124,7 +124,7 @@ private: // *** implementation
|
||||
BString m_dormantName;
|
||||
int64 m_kinds;
|
||||
int32 m_flavorID;
|
||||
|
||||
|
||||
int32 m_flags;
|
||||
int32 m_runMode;
|
||||
bigtime_t m_recordingDelay;
|
||||
@ -133,7 +133,7 @@ private: // *** implementation
|
||||
BEntry m_entry;
|
||||
|
||||
bool m_exportValid;
|
||||
|
||||
|
||||
status_t _matchDormantNode(
|
||||
dormant_node_info* outInfo);
|
||||
};
|
||||
|
@ -49,7 +49,7 @@
|
||||
|
||||
#include <SupportDefs.h>
|
||||
|
||||
class rtm_pool;
|
||||
struct rtm_pool;
|
||||
|
||||
class RawBuffer {
|
||||
public: // ctor/dtor/accessors
|
||||
@ -64,7 +64,7 @@ public: // ctor/dtor/accessors
|
||||
uint32 frames=0,
|
||||
bool circular=true,
|
||||
rtm_pool* pFromPool=0);
|
||||
|
||||
|
||||
// point to given data (does NOT take responsibility for
|
||||
// deleting it; use adopt() for that.)
|
||||
RawBuffer(
|
||||
@ -73,7 +73,7 @@ public: // ctor/dtor/accessors
|
||||
uint32 frames,
|
||||
bool bCircular=true,
|
||||
rtm_pool* pFromPool=0);
|
||||
|
||||
|
||||
// generate reference to the given target buffer
|
||||
RawBuffer(const RawBuffer& clone);
|
||||
RawBuffer& operator=(const RawBuffer& clone);
|
||||
@ -82,22 +82,22 @@ public: // ctor/dtor/accessors
|
||||
char* data() const;
|
||||
// returns pointer to given frame
|
||||
char* frame(uint32 frame) const;
|
||||
|
||||
|
||||
uint32 frameSize() const;
|
||||
uint32 frames() const;
|
||||
uint32 size() const;
|
||||
|
||||
bool isCircular() const;
|
||||
bool ownsBuffer() const;
|
||||
|
||||
|
||||
rtm_pool* pool() const;
|
||||
|
||||
// resize buffer, re-allocating if necessary to contain
|
||||
// designated number of frames
|
||||
// Does not preserve buffer contents.
|
||||
|
||||
|
||||
void resize(uint32 frames);
|
||||
|
||||
|
||||
// take ownership of buffer from target
|
||||
// (deletes current buffer data, if any owned)
|
||||
|
||||
@ -107,11 +107,11 @@ public: // ctor/dtor/accessors
|
||||
uint32 frames,
|
||||
bool bCircular=true,
|
||||
rtm_pool* pPool=0);
|
||||
|
||||
|
||||
// returns false if the target doesn't own the data, but references it
|
||||
// one way or the other
|
||||
bool adopt(RawBuffer& target);
|
||||
|
||||
|
||||
// adopt currently ref'd data (if any; returns false if no buffer data or
|
||||
// already owned)
|
||||
bool adopt();
|
||||
@ -119,7 +119,7 @@ public: // ctor/dtor/accessors
|
||||
public: // operations
|
||||
|
||||
// fill the buffer with zeroes
|
||||
|
||||
|
||||
void zero();
|
||||
|
||||
// raw copy to destination buffer, returning the number of
|
||||
@ -137,7 +137,7 @@ public: // operations
|
||||
uint32* pioFromFrame,
|
||||
uint32* pioTargetFrame,
|
||||
uint32 frames) const;
|
||||
|
||||
|
||||
// more convenient version of above if you don't care
|
||||
// how the offsets change.
|
||||
|
||||
@ -151,14 +151,14 @@ protected: // internal operations
|
||||
// free owned data, if any
|
||||
// [16jun99] uses proper rtm_free() call if needed
|
||||
void free();
|
||||
|
||||
|
||||
protected: // members
|
||||
void* m_pData;
|
||||
rtm_pool* m_pPool;
|
||||
uint32 m_frameSize;
|
||||
uint32 m_frames;
|
||||
uint32 m_allocatedSize;
|
||||
|
||||
|
||||
bool m_bCircular;
|
||||
bool m_bOwnData;
|
||||
};
|
||||
|
@ -26,7 +26,7 @@ class DwarfTypeFactory;
|
||||
class FunctionID;
|
||||
class GlobalTypeCache;
|
||||
class GlobalTypeLookup;
|
||||
class LocationDescription;
|
||||
struct LocationDescription;
|
||||
class ObjectID;
|
||||
class RegisterMap;
|
||||
class Variable;
|
||||
|
@ -45,11 +45,11 @@ class DwarfTargetInterface;
|
||||
class DwarfType;
|
||||
class DwarfTypeContext;
|
||||
class DwarfTypedefType;
|
||||
class DwarfUnspecifiedType;
|
||||
struct DwarfUnspecifiedType;
|
||||
class GlobalTypeCache;
|
||||
class GlobalTypeLookup;
|
||||
class LocationDescription;
|
||||
class MemberLocation;
|
||||
struct LocationDescription;
|
||||
struct MemberLocation;
|
||||
class RegisterMap;
|
||||
|
||||
|
||||
|
@ -16,7 +16,7 @@
|
||||
|
||||
class AbbreviationTable;
|
||||
class DebugInfoEntry;
|
||||
class SourceLanguageInfo;
|
||||
struct SourceLanguageInfo;
|
||||
|
||||
|
||||
enum dwarf_unit_kind {
|
||||
|
@ -16,7 +16,7 @@
|
||||
#include "TypeUnit.h"
|
||||
|
||||
|
||||
class AbbreviationEntry;
|
||||
struct AbbreviationEntry;
|
||||
class AbbreviationTable;
|
||||
class BVariant;
|
||||
class CfaContext;
|
||||
@ -199,7 +199,7 @@ private:
|
||||
const FDEInfoList& infoList) const;
|
||||
|
||||
private:
|
||||
friend class DwarfFile::ExpressionEvaluationContext;
|
||||
friend struct DwarfFile::ExpressionEvaluationContext;
|
||||
|
||||
private:
|
||||
char* fName;
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
|
||||
namespace CLanguage {
|
||||
class Token;
|
||||
struct Token;
|
||||
class Tokenizer;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user