summaryrefslogtreecommitdiff
path: root/CIAO
diff options
context:
space:
mode:
authorWilliam R. Otte <wotte@dre.vanderbilt.edu>2007-12-06 17:58:19 +0000
committerWilliam R. Otte <wotte@dre.vanderbilt.edu>2007-12-06 17:58:19 +0000
commit1a90176ddd7efee912f8b1d5236d6c9e6c41a3ed (patch)
treeaf329b058172f316cdc78b59377ed1bbc594d432 /CIAO
parent86990d911285ec056893184d4047ca6e27439758 (diff)
downloadATCD-1a90176ddd7efee912f8b1d5236d6c9e6c41a3ed.tar.gz
ChangeLogTag:Thu Dec 6 17:56:35 UTC 2007 Will Otte <otte_w@dre.Vanderbilt.Edu>
Diffstat (limited to 'CIAO')
-rw-r--r--CIAO/CCF/CCF/CIDL/SemanticAction/Composition.cpp2
-rw-r--r--CIAO/CCF/CCF/IDL2/SemanticAction/Operation.cpp2
-rw-r--r--CIAO/CIDLC/CxxNamePrinter.cpp4
-rw-r--r--CIAO/ChangeLog8
4 files changed, 12 insertions, 4 deletions
diff --git a/CIAO/CCF/CCF/CIDL/SemanticAction/Composition.cpp b/CIAO/CCF/CCF/CIDL/SemanticAction/Composition.cpp
index e8eb6f99924..0daa4518f04 100644
--- a/CIAO/CCF/CCF/CIDL/SemanticAction/Composition.cpp
+++ b/CIAO/CCF/CCF/CIDL/SemanticAction/Composition.cpp
@@ -18,7 +18,7 @@ namespace CCF
namespace
{
- char* labels[] = {"entity", "process", "service", "session" };
+ const char* labels[] = {"entity", "process", "service", "session" };
}
std::ostream&
diff --git a/CIAO/CCF/CCF/IDL2/SemanticAction/Operation.cpp b/CIAO/CCF/CCF/IDL2/SemanticAction/Operation.cpp
index b75d48400a4..27fadff5459 100644
--- a/CIAO/CCF/CCF/IDL2/SemanticAction/Operation.cpp
+++ b/CIAO/CCF/CCF/IDL2/SemanticAction/Operation.cpp
@@ -18,7 +18,7 @@ namespace CCF
namespace
{
- char* labels[] = {"in", "out", "inout"};
+ const char* labels[] = {"in", "out", "inout"};
}
std::ostream&
diff --git a/CIAO/CIDLC/CxxNamePrinter.cpp b/CIAO/CIDLC/CxxNamePrinter.cpp
index 027889791ec..d340f910c76 100644
--- a/CIAO/CIDLC/CxxNamePrinter.cpp
+++ b/CIAO/CIDLC/CxxNamePrinter.cpp
@@ -1,6 +1,6 @@
// file : CIDLC/CxxNamePrinter.cpp
// author : Boris Kolpackov <boris@codesynthesis.com>
-// cvs-id : $Id: Collectors.hpp 55138 2004-01-05 07:53:05Z parsons $
+// cvs-id : $Id$
#include "CIDLC/CxxNamePrinter.hpp"
@@ -11,7 +11,7 @@ namespace
{
// Sorted C++ keywords.
//
- char* keywords[] = {
+ const char* keywords[] = {
"and",
"asm",
"auto",
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index f1ae909a034..297abf3ddb5 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,11 @@
+Thu Dec 6 17:56:35 UTC 2007 Will Otte <otte_w@dre.Vanderbilt.Edu>
+
+ * CCF/CCF/CIDL/SemanticAction/Composition.cpp:
+ * CCF/CCF/IDL2/SemanticAction/Operation.cpp:
+ * CIDLC/CxxNamePrinter.cpp:
+
+ Fixed warnings manifesting on Debian Etch.
+
Mon Dec 3 17:42:25 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>
* examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h: