mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-11 21:27:01 -04:00
The DECLARE_TYPEOF(()) calls don't work in MSVC, I changed it to use a COMMA macro instead of ,
If this doesn't work in GCC, the COMMA definition could be made only for MSVC, then GCC sees DECLARE_TYPEOF(map<int COMMA string>). GCC doesn't need DECLARE_TYPEOF anyway. Keyword expansion now works, still todo: - marking parameters, e.g. "Cycling 2W" -> "Cycling <param-mana>2W</param-mana>" - user interface for toggling reminder text - user interface for keywords git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@210 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
+10
-3
@@ -85,12 +85,19 @@
|
||||
}
|
||||
|
||||
/// Declare typeof magic for a specific std::vector type
|
||||
#define DECLARE_TYPEOF_COLLECTION(T) DECLARE_TYPEOF(vector<T>); \
|
||||
// DECLARE_TYPEOF_CONST(set<T>)
|
||||
#define DECLARE_TYPEOF_COLLECTION(T) DECLARE_TYPEOF(vector< T >); \
|
||||
DECLARE_TYPEOF_CONST(set< T >)
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
/// 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
|
||||
|
||||
Reference in New Issue
Block a user