diff -r 08ccaf26cffd -r 777b2a10b835 sources/basics.h --- a/sources/basics.h Thu Jul 23 01:52:04 2015 +0300 +++ b/sources/basics.h Thu Jul 23 02:15:21 2015 +0300 @@ -36,30 +36,11 @@ #define MACRO_TO_STRING_2(A) #A #define MACRO_TO_STRING(A) MACRO_TO_STRING_2(A) +// The Windows SDK appears to use identifiers that conflicts with the identifiers defined in ZFC, +// so they have to be put in a namespace. #define BEGIN_ZFC_NAMESPACE namespace zfc { #define END_ZFC_NAMESPACE } -BEGIN_ZFC_NAMESPACE - -class String; - -// ------------------------------------------------------------------------------------------------- -// -enum Color -{ - BLACK, - RED, - GREEN, - YELLOW, - BLUE, - MAGENTA, - CYAN, - WHITE, - DEFAULT, - - NUM_COLORS -}; - // Goddamnit, MSVC #ifdef _MSC_VER # define and && @@ -85,6 +66,8 @@ #define TEXTCOLOR_BrightCyan TEXTCOLOR_Escape "V" #define TEXTCOLOR_Reset TEXTCOLOR_Escape "-" +BEGIN_ZFC_NAMESPACE + template T min (T a, T b) { @@ -104,4 +87,5 @@ } struct Exitception {}; + END_ZFC_NAMESPACE