summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
Diffstat (limited to 'TAO')
-rw-r--r--TAO/ChangeLog31
-rw-r--r--TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp9
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp17
-rw-r--r--TAO/orbsvcs/tests/Redundant_Naming/client.cpp4
-rw-r--r--TAO/tao/Transport.cpp12
5 files changed, 54 insertions, 19 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index a4aa7cca8be..ba81a168ba9 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,4 +1,32 @@
-
+Thu Jul 3 11:48:40 2003 Chris Cleeland <cleeland_c@ociweb.com>
+
+ * orbsvcs/tests/Redundant_Naming/client.cpp: Initialized ns[12]ref
+ variables to zero. Although the code looked like the variables
+ probably would be assigned prior to use, this de-warns on picky
+ platforms/compilers like GCC 3.2.
+
+ * orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp:
+
+ Modified operator<< and operator>> to use
+ ACE_SIZE_T_FORMAT_SPECIFIER macro rather than an explicit %d.
+ This should rid us of warnings such as "warning: int format,
+ different type arg (arg 3)"
+
+ * tao/Transport.cpp (dump_iov): Made same modification as above
+ for the same reasons.
+
+Thu Jul 3 11:22:47 2003 Chris Cleeland <cleeland_c@ociweb.com>
+
+ * orbsvcs/IFR_Service/ifr_adding_visitor.cpp:
+
+ Used proper ACE_ENV_ARG_* macros in function declarations and
+ function bodies. This should get rid of compilation errors on
+ no-exception builds that manifested themselves as
+ "`_ACE_CORBA_Environment_variable' undeclared" errors.
+
+ Also used .in() to explicitly select a conversion on a _var so
+ get rid of warnings regarding which conversion the G++ compiler
+ was going to choose.
Thu Jul 03 18:53:51 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
@@ -42,7 +70,6 @@ Thu Jul 03 13:20:16 2003 Pradeep Gore <pradeep@oomworks.com>
Many thanks to Johnny Willemsen <jwillemsen@remedy.nl> for all
of the above.
-
Thu Jul 03 17:03:33 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
* orbsvcs/tests/Event/lib/Makefile:
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
index 7231f04d11c..3c44a7c9ba1 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
@@ -1218,7 +1218,7 @@ ifr_adding_visitor::visit_component_fwd (AST_ComponentFwd *node)
c->repoID (),
c->local_name ()->get_string (),
c->version (),
- base_component,
+ base_component.in (),
supported_interfaces
ACE_ENV_ARG_PARAMETER
);
@@ -3522,7 +3522,8 @@ ifr_adding_visitor::get_referenced_type (AST_Type *node
void
ifr_adding_visitor::fill_base_value (CORBA::ValueDef_ptr &result,
- AST_ValueType *node)
+ AST_ValueType *node
+ ACE_ENV_ARG_DECL)
{
result = CORBA::ValueDef::_nil ();
AST_ValueType *base_value = node->inherits_concrete ();
@@ -3881,7 +3882,7 @@ ifr_adding_visitor::fill_get_exceptions (CORBA::ExceptionDefSeq &result,
{
this->fill_exceptions (result,
node->get_get_exceptions ()
- ACE_ENV_ARG_DECL);
+ ACE_ENV_ARG_PARAMETER);
}
void
@@ -3891,7 +3892,7 @@ ifr_adding_visitor::fill_set_exceptions (CORBA::ExceptionDefSeq &result,
{
this->fill_exceptions (result,
node->get_set_exceptions ()
- ACE_ENV_ARG_DECL);
+ ACE_ENV_ARG_PARAMETER);
}
void
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp
index 15854db92bd..60a95bb34c6 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp
@@ -171,13 +171,16 @@ TAO_NS_FlatFileStream::operator <<(
ACE_OS::fprintf(this->fl_, "%d\n", type);
ACE_CString id = record.id();
- ACE_OS::fprintf(this->fl_, "%d\n%s\n", id.length(), id.c_str());
+ ACE_OS::fprintf(this->fl_, ACE_SIZE_T_FORMAT_SPECIFIER "\n%s\n",
+ id.length(), id.c_str());
ACE_CString kind = record.kind();
- ACE_OS::fprintf(this->fl_, "%d\n%s\n", kind.length(), kind.c_str());
+ ACE_OS::fprintf(this->fl_, ACE_SIZE_T_FORMAT_SPECIFIER "\n%s\n",
+ kind.length(), kind.c_str());
ACE_CString ref = record.ref();
- ACE_OS::fprintf(this->fl_, "%d\n%s\n", ref.length(), ref.c_str());
+ ACE_OS::fprintf(this->fl_, ACE_SIZE_T_FORMAT_SPECIFIER "\n%s\n",
+ ref.length(), ref.c_str());
ACE_OS::fflush(this->fl_);
@@ -195,10 +198,10 @@ TAO_NS_FlatFileStream::operator >>(
type = (TAO_NS_Persistence_Record::Record_Type) temp_type_in;
record.type(type);
- int bufSize = 0;
+ size_t bufSize = 0;
//id
- fscanf(fl_, "%d\n", &bufSize);
+ fscanf(fl_, ACE_SIZE_T_FORMAT_SPECIFIER "\n", &bufSize);
char *id = new char[bufSize+1];
//char *id;
//ACE_NEW_RETURN (id, char[bufSize+1], 1);
@@ -208,7 +211,7 @@ TAO_NS_FlatFileStream::operator >>(
delete [] id;
//kind
- fscanf(fl_, "%d\n", &bufSize);
+ fscanf(fl_, ACE_SIZE_T_FORMAT_SPECIFIER "\n", &bufSize);
char *kind = new char[bufSize+1];
//char *kind;
//ACE_NEW (kind, char[bufSize+1]);
@@ -219,7 +222,7 @@ TAO_NS_FlatFileStream::operator >>(
delete [] kind;
//ref
- fscanf(fl_, "%d\n", &bufSize);
+ fscanf(fl_, ACE_SIZE_T_FORMAT_SPECIFIER "\n", &bufSize);
char *ref = new char[bufSize+1];
//char *ref;
//ACE_NEW(ref, char[bufSize+1]);
diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
index ddcc664fb6e..15b909fe965 100644
--- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
@@ -88,8 +88,8 @@ main (int argc, ACE_TCHAR **argv)
int c_breath = 4;
int c_depth = 4;
int o_breath = 4;
- ACE_TCHAR *ns1ref;
- ACE_TCHAR *ns2ref;
+ ACE_TCHAR *ns1ref = 0;
+ ACE_TCHAR *ns2ref = 0;
ACE_Get_Opt get_opts (argc, argv, ACE_LIB_TEXT ("b:d:o:p:q:"));
int c;
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 541ddf256c1..e07169bb109 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -45,8 +45,10 @@ dump_iov (iovec *iov, int iovcnt, size_t id,
{
ACE_Log_Msg::instance ()->acquire ();
+#define DUMP_IOV_PREFIX "Transport[" ACE_SIZE_T_FORMAT_SPECIFIER "]::%s"
ACE_DEBUG ((LM_DEBUG,
- "TAO (%P|%t) - Transport[%d]::%s, "
+ "TAO (%P|%t) - "
+ DUMP_IOV_PREFIX ", "
"sending %d buffers\n",
id, location, iovcnt));
for (int i = 0; i != iovcnt && 0 < current_transfer; ++i)
@@ -58,7 +60,8 @@ dump_iov (iovec *iov, int iovcnt, size_t id,
iov_len = current_transfer;
ACE_DEBUG ((LM_DEBUG,
- "TAO (%P|%t) - Transport[%d]::%s, "
+ "TAO (%P|%t) - "
+ DUMP_IOV_PREFIX ", "
"buffer %d/%d has %d bytes\n",
id, location,
i, iovcnt,
@@ -69,7 +72,7 @@ dump_iov (iovec *iov, int iovcnt, size_t id,
{
ACE_TCHAR header[1024];
ACE_OS::sprintf (header,
- "TAO - Transport[%d]::%s ("
+ "TAO - " DUMP_IOV_PREFIX " ("
ACE_SIZE_T_FORMAT_SPECIFIER "/"
ACE_SIZE_T_FORMAT_SPECIFIER ")\n",
id, location, offset, iov_len);
@@ -85,7 +88,8 @@ dump_iov (iovec *iov, int iovcnt, size_t id,
current_transfer -= iov_len;
}
ACE_DEBUG ((LM_DEBUG,
- "TAO (%P|%t) - Transport[%d]::%s, "
+ "TAO (%P|%t) - "
+ DUMP_IOV_PREFIX ", "
"end of data\n",
id, location));
View Lorry Controller Status