diff --git a/configure.py b/configure.py index 744d286e8e1..fc508177616 100755 --- a/configure.py +++ b/configure.py @@ -1090,7 +1090,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN, "ShieldD"), "JSystem/JAudio2/JAUBankTable.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAUClusterSound.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAUInitializer.cpp"), - Object(Equivalent, "JSystem/JAudio2/JAUSectionHeap.cpp"), # weak func order + Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAUSectionHeap.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAUSeqCollection.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAUSeqDataBlockMgr.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAUSoundAnimator.cpp"), diff --git a/include/JSystem/JAudio2/JAUSectionHeap.h b/include/JSystem/JAudio2/JAUSectionHeap.h index 97280f1bf54..21049065f17 100644 --- a/include/JSystem/JAudio2/JAUSectionHeap.h +++ b/include/JSystem/JAudio2/JAUSectionHeap.h @@ -61,7 +61,6 @@ public: JASVoiceBank* newVoiceBank(u32, u32); bool beginNewBankTable(u32, u32); JAUBankTable* endNewBankTable(); - virtual ~JAUSection() {} bool isBuilding() const { return field_0x2c; } bool isOpen() const; diff --git a/src/JSystem/JAudio2/JAUSectionHeap.cpp b/src/JSystem/JAudio2/JAUSectionHeap.cpp index 153ea20c125..aee48de91d5 100644 --- a/src/JSystem/JAudio2/JAUSectionHeap.cpp +++ b/src/JSystem/JAudio2/JAUSectionHeap.cpp @@ -53,7 +53,6 @@ namespace { } return field_0x8[short_id]; } - virtual ~TStreamDataMgr() {} bool isValid() { return field_0x4; } diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/bitset.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/bitset.h index 8accb8bf945..f6bb7354f71 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/bitset.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/bitset.h @@ -16,10 +16,10 @@ template class __bitset_base { public: __bitset_base(); - bool test(size_t pos) const; - bool any() const; void set(size_t pos, bool val); void reset(size_t pos); + bool test(size_t pos) const; + bool any() const; private: size_t data[N]; };