summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2011-10-20 12:50:47 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2011-10-20 12:50:47 +0000
commit9f86c943c132a8479bfc4fbfb1d8bce963f4ac65 (patch)
tree8d8d74ee95fe53fc4f836b35afca96f0f99936e1 /TAO
parente9ba475d86ac2a0717a737885ffc54599ceb5384 (diff)
downloadATCD-9f86c943c132a8479bfc4fbfb1d8bce963f4ac65.tar.gz
Diffstat (limited to 'TAO')
-rw-r--r--TAO/ChangeLog5
-rw-r--r--TAO/TAO_IDL/be_include/be_interface.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 5364460d990..d26fe81333c 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 20 12:50:09 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * TAO_IDL/be_include/be_interface.h:
+ Fixed gcc warning
+
Tue Oct 20 09:30:13 UTC 2011 Martin Corino <mcorino@remedy.nl>
Merged changes from Remedy work branch.
diff --git a/TAO/TAO_IDL/be_include/be_interface.h b/TAO/TAO_IDL/be_include/be_interface.h
index 65bb4bec8ee..ca64c76bdfd 100644
--- a/TAO/TAO_IDL/be_include/be_interface.h
+++ b/TAO/TAO_IDL/be_include/be_interface.h
@@ -324,7 +324,7 @@ protected:
protected:
enum Suffix_Code
{
- PROXY_IMPL = 0,
+ PROXY_IMPL = 0
};
enum Tag_Code