diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-12-07 22:33:01 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-12-07 22:33:01 +0000 |
| commit | c392014e3ed9d05e105d60df843430530312414b (patch) | |
| tree | d4ceec186da49b3599b5f518fb431c74d57f1396 | |
| parent | b11ffd3a1a8baadc6b9760fdb433c69370e64974 (diff) | |
| download | ATCD-c392014e3ed9d05e105d60df843430530312414b.tar.gz | |
ChangeLogTag:Fri Dec 07 14:28:33 2001 Carlos O'Ryan <coryan@uci.edu>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 6 | ||||
| -rw-r--r-- | tests/ACE_Init_Test.cpp | 8 | ||||
| -rw-r--r-- | tests/ACE_Init_TestDlg.cpp | 6 |
5 files changed, 25 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index c6fac8f0c82..7531b170315 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Dec 07 14:28:33 2001 Carlos O'Ryan <coryan@uci.edu> + + * tests/ACE_Init_Test.cpp: + * tests/ACE_Init_TestDlg.cpp: + Fix order of #includes to work under unicode builds. + Fri Dec 07 15:42:44 2001 Nanbor Wang <nanbor@cs.wustl.edu> * ace/Registry_Name_Space.cpp: Changed to conditionally use diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index c6fac8f0c82..7531b170315 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Fri Dec 07 14:28:33 2001 Carlos O'Ryan <coryan@uci.edu> + + * tests/ACE_Init_Test.cpp: + * tests/ACE_Init_TestDlg.cpp: + Fix order of #includes to work under unicode builds. + Fri Dec 07 15:42:44 2001 Nanbor Wang <nanbor@cs.wustl.edu> * ace/Registry_Name_Space.cpp: Changed to conditionally use diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index c6fac8f0c82..7531b170315 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Fri Dec 07 14:28:33 2001 Carlos O'Ryan <coryan@uci.edu> + + * tests/ACE_Init_Test.cpp: + * tests/ACE_Init_TestDlg.cpp: + Fix order of #includes to work under unicode builds. + Fri Dec 07 15:42:44 2001 Nanbor Wang <nanbor@cs.wustl.edu> * ace/Registry_Name_Space.cpp: Changed to conditionally use diff --git a/tests/ACE_Init_Test.cpp b/tests/ACE_Init_Test.cpp index ccb833b6c38..abbcc23a106 100644 --- a/tests/ACE_Init_Test.cpp +++ b/tests/ACE_Init_Test.cpp @@ -14,9 +14,9 @@ // // ACE_Init_Test.cpp : Defines the class behaviors for the application. -#include "test_config.h" +#if !defined(ACE_HAS_MFC) -#if !defined(ACE_WIN32) +#include "test_config.h" // If this is not a WIN32 platform do not even try to compile the // test, many of the #includes make little sense. @@ -35,6 +35,8 @@ main (int, char*[]) #include "ACE_Init_Test_StdAfx.h" #include "ACE_Init_Test.h" #include "ACE_Init_TestDlg.h" +#include "test_config.h" + #include "ace/Thread_Manager.h" @@ -126,4 +128,4 @@ wait_and_kill_dialog (void *pBox) } -#endif /* ACE_WIN32 */ +#endif /* ACE_HAS_MFC */ diff --git a/tests/ACE_Init_TestDlg.cpp b/tests/ACE_Init_TestDlg.cpp index 33530894587..4bfad2516b0 100644 --- a/tests/ACE_Init_TestDlg.cpp +++ b/tests/ACE_Init_TestDlg.cpp @@ -2,9 +2,7 @@ // ACE_Init_TestDlg.cpp : implementation file // -#include "ace/config.h" - -#if defined(ACE_WIN32) +#if defined(ACE_HAS_MFC) #include "ACE_Init_Test_StdAfx.h" #include "ACE_Init_Test.h" @@ -97,4 +95,4 @@ HCURSOR CACE_Init_TestDlg::OnQueryDragIcon() return (HCURSOR) m_hIcon; } -#endif /* ACE_WIN32 */ +#endif /* ACE_HAS_MFC */ |