summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-04-03 09:43:45 +0000
committersma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-04-03 09:43:45 +0000
commitdf02a0fc47551c6d23cedac2820977b39b2ea975 (patch)
treeb31072ef3a3d4afb3ba36696b229631f6065b06e
parent620087fea380601e643322116b2ff7231d336d03 (diff)
downloadATCD-df02a0fc47551c6d23cedac2820977b39b2ea975.tar.gz
ChangeLogTag: Thu Apr 3 09:40:00 UTC 2008 Simon Massey <simon dot massey at prismtech dot com>
-rw-r--r--TAO/ChangeLog8
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h2
2 files changed, 9 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 8db86ffebab..905a6946f8c 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Thu Apr 3 09:40:00 UTC 2008 Simon Massey <simon dot massey at prismtech dot com>
+
+ * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h:
+
+ Using "interface" as the descriptive name of a parameter seems to
+ cause VC8 (when building with MFC) to assume you mean a struct type
+ and it raises an incorrect systax error.
+
Thu Apr 3 01:18:45 UTC 2008 Phil Mesnier <mesnier_p@ociweb.com>
* tests/DSI_Gateway/client.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
index be8c2d6d59f..5d07ebec18f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
@@ -262,7 +262,7 @@ public:
protected:
/// Function caches the full interface description from the IFR
- int cache_interface_description (const char *interface);
+ int cache_interface_description (const char *interface_);
/// Insert a operation/parameter into the IFR cache
int insert_into_ifr_cache (const char *operation, TAO_CEC_Operation_Params *parameters);