diff options
author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-04-25 09:25:01 +0000 |
---|---|---|
committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-04-25 09:25:01 +0000 |
commit | 6918dd31b64f6eee09f00fa7c3b232da8ba40515 (patch) | |
tree | dbf8e3e597d7cd8a51ec14c1561bdd2b87dc4316 | |
parent | c229c2470e478174f5e3356ead4bb8c48d07e6f9 (diff) | |
download | ATCD-6918dd31b64f6eee09f00fa7c3b232da8ba40515.tar.gz |
ChangeLogTag: Fri Apr 25 09:25:00 UTC 2008 Simon Massey <sma at pristmech dot com>
-rw-r--r-- | TAO/ChangeLog | 9 | ||||
-rw-r--r-- | TAO/examples/mfc/server.mpc | 2 | ||||
-rw-r--r-- | TAO/utils/NamingViewer/NamingViewer.mpc | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d34c163a29d..24f2249f0c7 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Fri Apr 25 09:25:00 UTC 2008 Simon Massey <sma at pristmech dot com> + + * examples/MFC/server.mpc: + * utils/NamingViewer/NamingView.mpc: + + Feature name "uses_wchar" already used within ACE/TAO. Replaces + the "unicode" feature name. Template / project name within MPC + still named unicode. + Fri Apr 25 09:10:32 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * tao/DiffServPolicy/Server_Network_Priority_Policy.cpp: diff --git a/TAO/examples/mfc/server.mpc b/TAO/examples/mfc/server.mpc index f2b07b0e6ae..21f47bd0a70 100644 --- a/TAO/examples/mfc/server.mpc +++ b/TAO/examples/mfc/server.mpc @@ -2,7 +2,7 @@ // $Id$ project(MFC_Server): namingexe, portableserver, ace_mfc { - avoids += unicode + avoids += uses_wchar after += MFC_Client exename = server pch_header = StdAfx.h diff --git a/TAO/utils/NamingViewer/NamingViewer.mpc b/TAO/utils/NamingViewer/NamingViewer.mpc index 4f0fd8d50c8..4d129a6c35e 100644 --- a/TAO/utils/NamingViewer/NamingViewer.mpc +++ b/TAO/utils/NamingViewer/NamingViewer.mpc @@ -2,7 +2,7 @@ // $Id$ project : namingexe, ace_mfc { - avoids += unicode + avoids += uses_wchar exename = NamingViewer install = $(ACE_ROOT)/bin pch_header = StdAfx.h |