summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam R. Otte <wotte@dre.vanderbilt.edu>2006-04-22 21:17:00 +0000
committerWilliam R. Otte <wotte@dre.vanderbilt.edu>2006-04-22 21:17:00 +0000
commit4a170c8d24ac4de8ea3464d20bf04559c9393434 (patch)
treebcd079bde7a386109e490e43c964c063024de9bb
parentfdc9381a7c071dd8693363c33ec2181fc528c880 (diff)
downloadATCD-4a170c8d24ac4de8ea3464d20bf04559c9393434.tar.gz
Sat Apr 22 21:13:10 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu>
-rw-r--r--TAO/CIAO/ChangeLog3
-rw-r--r--TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp3
2 files changed, 2 insertions, 4 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 911d47ae29f..bcfcb662fb2 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,5 +1,6 @@
-Sat Apr 22 21:13:10 UTC 2006 <wotte@blade35.isislab.vanderbilt.edu>
+Sat Apr 22 21:13:10 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu>
+ * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp
* tools/Config_Handlers/Basic_Deployment_Data.hpp
* tools/Config_Handlers/Deployment.hpp
* tools/Config_Handlers/ccd.hpp
diff --git a/TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp b/TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp
index 7a7ca403bac..c71e1986d78 100644
--- a/TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp
@@ -10,9 +10,6 @@
*/
-// Fixes the VC6 warning 4786.
-#include "vc6-4786.h"
-
// Fix for Borland compilers, which seem to have a broken
// <string> include.
#ifdef __BORLANDC__