mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-10 13:06:59 -04:00
Remove DECLARE_TYPEOF
It is no longer needed since C++11
This commit is contained in:
@@ -13,9 +13,6 @@
|
||||
|
||||
// ----------------------------------------------------------------------------- : Action stack
|
||||
|
||||
DECLARE_TYPEOF_COLLECTION(Action*);
|
||||
DECLARE_TYPEOF_COLLECTION(ActionListener*);
|
||||
|
||||
ActionStack::ActionStack()
|
||||
: save_point(nullptr)
|
||||
, last_was_add(false)
|
||||
|
||||
@@ -15,8 +15,6 @@
|
||||
#endif
|
||||
#include <queue>
|
||||
|
||||
DECLARE_TYPEOF_COLLECTION(ScriptParseError);
|
||||
|
||||
// ----------------------------------------------------------------------------- : Debug utilities
|
||||
|
||||
#if defined(_MSC_VER) && defined(_DEBUG) && defined(_CRT_WIDE)
|
||||
|
||||
@@ -13,8 +13,6 @@
|
||||
#include <errno.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
DECLARE_TYPEOF_COLLECTION(String);
|
||||
|
||||
// ----------------------------------------------------------------------------- : File names
|
||||
|
||||
String normalize_filename(const String& name) {
|
||||
|
||||
@@ -18,12 +18,6 @@
|
||||
|
||||
// ----------------------------------------------------------------------------- : Typeof magic
|
||||
|
||||
// GCC has a buildin typeof function, so it doesn't need (as much) hacks
|
||||
#define DECLARE_TYPEOF(T)
|
||||
#define DECLARE_TYPEOF_NO_REV(T)
|
||||
#define DECLARE_TYPEOF_CONST(T)
|
||||
#define DECLARE_TYPEOF_COLLECTION(T)
|
||||
|
||||
#define TYPEOF(Value) decltype(Value)
|
||||
#define TYPEOF_IT(Value) decltype((Value).begin())
|
||||
#define TYPEOF_CIT(Value) decltype((Value).begin())
|
||||
@@ -32,14 +26,6 @@
|
||||
#define TYPEOF_REF(Value) decltype(*(Value).begin())&
|
||||
#define TYPEOF_CREF(Value) decltype(*(Value).begin())&
|
||||
|
||||
/// Use for template classes
|
||||
/** i.e.
|
||||
* DECLARE_TYPEOF(pair<a COMMA b>);
|
||||
* instead of
|
||||
* DECLARE_TYPEOF(pair<a,b>);
|
||||
*/
|
||||
#define COMMA ,
|
||||
|
||||
// ----------------------------------------------------------------------------- : Looping macros with iterators
|
||||
|
||||
/// Iterate over a collection, using an iterator it of type Type
|
||||
|
||||
@@ -16,9 +16,6 @@
|
||||
#include <wx/zipstrm.h>
|
||||
#include <wx/dir.h>
|
||||
|
||||
DECLARE_TYPEOF(Package::FileInfos);
|
||||
DECLARE_TYPEOF_COLLECTION(PackageDependencyP);
|
||||
|
||||
// ----------------------------------------------------------------------------- : Package : outside
|
||||
|
||||
IMPLEMENT_DYNAMIC_ARG(Package*, writing_package, nullptr);
|
||||
|
||||
@@ -175,7 +175,6 @@ class Package : public IntrusivePtrVirtualBase {
|
||||
|
||||
public:
|
||||
/// Information on files in the package
|
||||
/** Note: must be public for DECLARE_TYPEOF to work */
|
||||
typedef map<String, FileInfo> FileInfos;
|
||||
inline const FileInfos& getFileInfos() const { return files; }
|
||||
/// When was a file last modified?
|
||||
|
||||
@@ -19,10 +19,6 @@
|
||||
#include <wx/stdpaths.h>
|
||||
#include <wx/wfstream.h>
|
||||
|
||||
DECLARE_TYPEOF_COLLECTION(InstallablePackageP);
|
||||
DECLARE_TYPEOF_COLLECTION(PackageVersionP);
|
||||
DECLARE_TYPEOF_COLLECTION(PackageVersion::FileInfo);
|
||||
|
||||
// ----------------------------------------------------------------------------- : PackageManager : in memory
|
||||
|
||||
PackageManager package_manager;
|
||||
|
||||
@@ -26,8 +26,6 @@ class wxTextOutputStream;
|
||||
/// The string type used throughout MSE
|
||||
typedef wxString String;
|
||||
|
||||
DECLARE_TYPEOF_NO_REV(String); // iterating over characters in a string
|
||||
|
||||
inline wxStdString const& toStdString(String const& s) {
|
||||
#if wxUSE_UNICODE_WCHAR
|
||||
return s.ToStdWstring();
|
||||
|
||||
Reference in New Issue
Block a user