ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wxIsoFile: And a couple more compiler fixes. 

git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxIsoFile@3942 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2010-10-18 16:09:00 +00:00
parent d5bc947e8d
commit ca9e250837
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/include/Utilities/Dependencies.h
View File

@ -185,6 +185,9 @@ extern const wxChar* __fastcall pxExpandMsg( const wxChar* key, const wxChar* en
extern const wxChar* __fastcall pxGetTranslation( const wxChar* message ); extern const wxChar* __fastcall pxGetTranslation( const wxChar* message );
extern bool pxIsEnglish( int id ); extern bool pxIsEnglish( int id );
extern wxString fromUTF8( const char* src );
extern wxString fromAscii( const char* src );
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// wxLt(x) [macro] // wxLt(x) [macro]
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
@ -230,6 +233,7 @@ extern bool pxIsEnglish( int id );
#define pxE(key, english) pxExpandMsg( wxT(key), english ) #define pxE(key, english) pxExpandMsg( wxT(key), english )
#include "Utilities/Assertions.h"
#include "Utilities/Exceptions.h"
#include "Utilities/ScopedPtr.h" #include "Utilities/ScopedPtr.h"
#include "Utilities/ScopedAlloc.h" #include "Utilities/ScopedAlloc.h"
#include "Utilities/Assertions.h"

4
common/include/Utilities/Exceptions.h
View File

@ -15,8 +15,8 @@
#pragma once #pragma once
#include "Dependencies.h" #include "Assertions.h"
#include "StringHelpers.h" #include "ScopedPtr.h"
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// DESTRUCTOR_CATCHALL - safe destructor helper // DESTRUCTOR_CATCHALL - safe destructor helper

1
common/include/Utilities/FixedPointTypes.h
View File

@ -16,7 +16,6 @@
#pragma once #pragma once
#include "Dependencies.h" #include "Dependencies.h"
#include "Exceptions.h"
template< int Precision > template< int Precision >
struct FixedInt struct FixedInt

8
common/include/Utilities/ScopedAlloc.h
View File

@ -15,6 +15,8 @@
#pragma once #pragma once
#include "Exceptions.h"
// pxUSE_SECURE_MALLOC - enables bounds checking on scoped malloc allocations. // pxUSE_SECURE_MALLOC - enables bounds checking on scoped malloc allocations.
#ifndef pxUSE_SECURE_MALLOC #ifndef pxUSE_SECURE_MALLOC
@ -142,7 +144,7 @@ template< typename T >
class ScopedAlloc : public BaseScopedAlloc<T> class ScopedAlloc : public BaseScopedAlloc<T>
{ {
public: public:
ScopedAlloc( size_t size=0 ) : BaseScopedAlloc() ScopedAlloc( size_t size=0 ) : BaseScopedAlloc<T>()
{ {
Alloc(size); Alloc(size);
} }
@ -156,9 +158,9 @@ public:
{ {
safe_free(this->m_buffer); safe_free(this->m_buffer);
this->m_size = newsize; this->m_size = newsize;
if (!m_size) return; if (!this->m_size) return;
this->m_buffer = (T*)malloc( m_size * sizeof(T) ); this->m_buffer = (T*)malloc( this->m_size * sizeof(T) );
if (!this->m_buffer) if (!this->m_buffer)
throw Exception::OutOfMemory("ScopedAlloc"); throw Exception::OutOfMemory("ScopedAlloc");
} }

3
common/include/Utilities/StringHelpers.h
View File

@ -64,9 +64,6 @@ public:
extern void px_fputs( FILE* fp, const char* src ); extern void px_fputs( FILE* fp, const char* src );
extern wxString fromUTF8( const char* src );
extern wxString fromAscii( const char* src );
// wxWidgets lacks one of its own... // wxWidgets lacks one of its own...
extern const wxRect wxDefaultRect; extern const wxRect wxDefaultRect;

2
pcsx2/PrecompiledHeader.h
View File

@ -88,13 +88,11 @@ typedef int BOOL;
#include "Pcsx2Defs.h" #include "Pcsx2Defs.h"
#include "i18n.h" #include "i18n.h"
#include "Utilities/Assertions.h"
#include "Utilities/FixedPointTypes.h" #include "Utilities/FixedPointTypes.h"
#include "Utilities/wxBaseTools.h" #include "Utilities/wxBaseTools.h"
#include "Utilities/ScopedPtr.h" #include "Utilities/ScopedPtr.h"
#include "Utilities/Path.h" #include "Utilities/Path.h"
#include "Utilities/Console.h" #include "Utilities/Console.h"
#include "Utilities/Exceptions.h"
#include "Utilities/MemcpyFast.h" #include "Utilities/MemcpyFast.h"
#include "Utilities/General.h" #include "Utilities/General.h"
#include "x86emitter/tools.h" #include "x86emitter/tools.h"