Removed DECLARE_TYPEOF2; replaced with double-parenthesized macro calls. (GCC doesn't accept the other way in all cases.. I don't know whether MSW accepts this way.) Fixed a few resource names.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@209 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
coppro
2007-03-15 23:48:01 +00:00
parent 41a8c123cf
commit 83b6aa36f8
20 changed files with 1184 additions and 8327 deletions
+1 -17
View File
@@ -24,8 +24,6 @@
#define DECLARE_TYPEOF_NO_REV(T)
#define DECLARE_TYPEOF_CONST(T)
#define DECLARE_TYPEOF_COLLECTION(T)
#define DECLARE_TYPEOF2(A,B)
#define DECLARE_TYPEOF_NO_REV2(A,B)
#define TYPEOF(Value) __typeof(Value)
#define TYPEOF_IT(Value) __typeof(Value.begin())
@@ -88,21 +86,7 @@
/// Declare typeof magic for a specific std::vector type
#define DECLARE_TYPEOF_COLLECTION(T) DECLARE_TYPEOF(vector<T>); \
DECLARE_TYPEOF_CONST(set<T>)
/// Declare typeof magic for a specific type, with two template arguments
/** This is needed because the preprocessor sees MACRO(class<a,b>)
* as a macro call with two arguments.
*/
#define DECLARE_TYPEOF2(A,B) \
typedef A,B BOOST_PP_CAT(TypeOfTemp,__LINE__); \
DECLARE_TYPEOF(BOOST_PP_CAT(TypeOfTemp,__LINE__))
#define DECLARE_TYPEOF_NO_REV2(A,B) \
typedef A,B BOOST_PP_CAT(TypeOfTemp,__LINE__); \
DECLARE_TYPEOF_NO_REV(BOOST_PP_CAT(TypeOfTemp,__LINE__))
#define DECLARE_TYPEOF_COLLECTION2(A,B) \
typedef A,B BOOST_PP_CAT(TypeOfTemp,__LINE__); \
DECLARE_TYPEOF_COLLECTION(BOOST_PP_CAT(TypeOfTemp,__LINE__))
// DECLARE_TYPEOF_CONST(set<T>)
#endif