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

Merge pull request #5518 from JosJuice/replace-weird-brace-thingy 

Replace {{}} with {}
This commit is contained in:
Leo Lam 2017-06-03 21:16:36 +02:00 committed by GitHub
parent 5d6074f157 1c926dcae2
commit fbad958f03
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/DiscIO/Volume.h
View File

@ -51,7 +51,7 @@ public:
*buffer = Common::FromBigEndian(temp); *buffer = Common::FromBigEndian(temp);
return true; return true;
} }
virtual std::vector<Partition> GetPartitions() const { return {{}}; } virtual std::vector<Partition> GetPartitions() const { return {}; }
virtual Partition GetGamePartition() const { return PARTITION_NONE; } virtual Partition GetGamePartition() const { return PARTITION_NONE; }
bool GetTitleID(u64* buffer) const { return GetTitleID(buffer, GetGamePartition()); } bool GetTitleID(u64* buffer) const { return GetTitleID(buffer, GetGamePartition()); }
virtual bool GetTitleID(u64* buffer, const Partition& partition) const { return false; } virtual bool GetTitleID(u64* buffer, const Partition& partition) const { return false; }
@ -68,11 +68,11 @@ public:
virtual u16 GetRevision(const Partition& partition) const = 0; virtual u16 GetRevision(const Partition& partition) const = 0;
std::string GetInternalName() const { return GetInternalName(GetGamePartition()); } std::string GetInternalName() const { return GetInternalName(GetGamePartition()); }
virtual std::string GetInternalName(const Partition& partition) const = 0; virtual std::string GetInternalName(const Partition& partition) const = 0;
virtual std::map<Language, std::string> GetShortNames() const { return {{}}; } virtual std::map<Language, std::string> GetShortNames() const { return {}; }
virtual std::map<Language, std::string> GetLongNames() const { return {{}}; } virtual std::map<Language, std::string> GetLongNames() const { return {}; }
virtual std::map<Language, std::string> GetShortMakers() const { return {{}}; } virtual std::map<Language, std::string> GetShortMakers() const { return {}; }
virtual std::map<Language, std::string> GetLongMakers() const { return {{}}; } virtual std::map<Language, std::string> GetLongMakers() const { return {}; }
virtual std::map<Language, std::string> GetDescriptions() const { return {{}}; } virtual std::map<Language, std::string> GetDescriptions() const { return {}; }
virtual std::vector<u32> GetBanner(int* width, int* height) const = 0; virtual std::vector<u32> GetBanner(int* width, int* height) const = 0;
u64 GetFSTSize() const { return GetFSTSize(GetGamePartition()); } u64 GetFSTSize() const { return GetFSTSize(GetGamePartition()); }
virtual u64 GetFSTSize(const Partition& partition) const = 0; virtual u64 GetFSTSize(const Partition& partition) const = 0;

2
Source/Core/DiscIO/VolumeDirectory.cpp
View File

@ -211,7 +211,7 @@ std::map<Language, std::string> CVolumeDirectory::GetLongNames() const
{ {
std::string name = GetInternalName(); std::string name = GetInternalName();
if (name.empty()) if (name.empty())
return {{}}; return {};
return {{Language::LANGUAGE_UNKNOWN, name}}; return {{Language::LANGUAGE_UNKNOWN, name}};
} }

2
Source/Core/DiscIO/VolumeWiiCrypted.cpp
View File

@ -276,7 +276,7 @@ std::map<Language, std::string> CVolumeWiiCrypted::GetLongNames() const
{ {
std::unique_ptr<IFileSystem> file_system(CreateFileSystem(this, GetGamePartition())); std::unique_ptr<IFileSystem> file_system(CreateFileSystem(this, GetGamePartition()));
if (!file_system) if (!file_system)
return {{}}; return {};
std::vector<u8> opening_bnr(NAMES_TOTAL_BYTES); std::vector<u8> opening_bnr(NAMES_TOTAL_BYTES);
size_t size = file_system->ReadFile("opening.bnr", opening_bnr.data(), opening_bnr.size(), 0x5C); size_t size = file_system->ReadFile("opening.bnr", opening_bnr.data(), opening_bnr.size(), 0x5C);