diff options
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | TAO/examples/mfc/StdAfx.h | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index aa8641f5a17..863885a5b5a 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Fri Mar 24 23:07:51 2000 Darrell Brunsch <brunsch@uci.edu> + + * examples/mfc/StdAfx.h: + + Added in a comment about how we have to include ACE/TAO + headers before MFC headers. + Fri Mar 24 22:24:10 2000 Carlos O'Ryan <coryan@uci.edu> * orbsvcs/orbsvcs/Makefile.CosConcurrency: diff --git a/TAO/examples/mfc/StdAfx.h b/TAO/examples/mfc/StdAfx.h index ed233ec0e17..119479af838 100644 --- a/TAO/examples/mfc/StdAfx.h +++ b/TAO/examples/mfc/StdAfx.h @@ -12,6 +12,10 @@ #pragma once #endif // _MSC_VER > 1000 +// We must include at least one ACE/TAO header before the MFC/Windows headers +// because of the way windows.h is included. So this must go before the MFC +// headers. + #include "tao\corba.h" #include "ace\Thread_Manager.h" |