OnShutdown macro conflicts!!!

There are NEW two macro defines in file "platform.h" in BETA 2:

#define OnStartup                                              
   namespace { struct _StaticStartup { _StaticStartup(); }; }  
   static const _StaticStartup _staticStartup;                 
   _StaticStartup::_StaticStartup()

#define OnShutdown                                                
   namespace { struct _StaticShutdown { ~_StaticShutdown(); }; }  
   static const _StaticShutdown _staticShutdown;                  
   _StaticShutdown::~_StaticShutdown()

At least OnShutdown makes a conflict against function "OnShutdown" in win SDK "atlbase.h":

void OnShutdown() throw()
	{
	}

How to resolve it?
Any help will be appreciated!

And I recommand GG to add a prefix to the function or macro you defined, e.g. torque_OnShutdown or GG_OnShutdown
to avoid such conflicts.