small compile fixes

This commit is contained in:
Aishou 2014-02-24 08:51:57 +01:00
parent 681c3c53f0
commit f85420b343
3 changed files with 11 additions and 10 deletions

View File

@ -51,9 +51,10 @@ class be_t
public:
typedef T type;
#ifdef __GNUG__
be_t() noexcept = default
#endif
be_t() noexcept = default;
#else
be_t(){}
#endif
be_t(const T& value)
{

View File

@ -306,7 +306,7 @@ public:
static const wxString& dir_path = "textures";
static const wxString& file_fmt = dir_path + "\\" + "tex[%d].png";
if(!wxDirExists(dir_path)) wxMkDir(dir_path);
if(!wxDirExists(dir_path)) wxMkDir(dir_path, wxS_DIR_DEFAULT );
u32 count = 0;
while(wxFileExists(wxString::Format(file_fmt, count))) count++;

View File

@ -524,12 +524,12 @@ struct CellAdecParamM4Aac
be_t<MPEG4AAC_ConfigType> configNumber;
union {
struct { struct
struct mp { struct mp2
{
be_t<u32> adifProgramNumber; // 0
} adifConfig; };
struct { struct
struct mp3 { struct mp4
{
be_t<MPEG4AAC_SamplingFreq> samplingFreqIndex;
be_t<u32> profile; // LC profile (1)
@ -557,8 +557,8 @@ struct CellAdecM4AacInfo
be_t<u32> pad1; // TODO: check alignment
union {
struct {
struct
struct mp5 {
struct m6
{
be_t<u32> copyrightIdPresent;
char copyrightId[9];
@ -571,8 +571,8 @@ struct CellAdecM4AacInfo
} adif;
};
struct {
struct
struct mp7 {
struct mp8
{
be_t<u32> id;
be_t<u32> layer;
@ -595,7 +595,7 @@ struct CellAdecM4AacInfo
be_t<u32> pad2; // TODO: check alignment
struct
struct mp9
{
be_t<u32> matrixMixdownPresent;
be_t<u32> mixdownIndex;