summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormbrudka <mbrudka@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-06-30 22:30:53 +0000
committermbrudka <mbrudka@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-06-30 22:30:53 +0000
commitea44b65af13098d5a3d139f4979b3e0b4966a09a (patch)
tree1d657814283904af63f3f8a91e92ec994d23c5ca
parentd3fc92e758be9f37ab6280da27ff43b9b303c126 (diff)
downloadATCD-ea44b65af13098d5a3d139f4979b3e0b4966a09a.tar.gz
ChangeLogTag: Thu Jul 1 00:18:07 2004 Marek Brudka <mbrudka@elka.pw.edu.pl>
-rw-r--r--TAO/ChangeLog12
-rw-r--r--TAO/TAO_IDL/include/utl_string.h2
2 files changed, 11 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index c8f615711e7..0025b3f8d4a 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,9 +1,15 @@
+Thu Jul 1 00:18:07 2004 Marek Brudka <mbrudka@elka.pw.edu.pl>
+
+ * TAO_IDL/include/utl_string.h:
+ Fixed small compilation error related to lack of size_t in
+ included headers.
+
Wed Jun 30 11:55:46 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
* TAO_IDL/ast/ast_root.cpp:
* TAO_IDLinclude/ast_root.h:
* TAO_IDLinclude/utl_scope.h:
-
+
Made the nmembers() method of UTL_Scope virtual and
added an override in AST_Root, so we can get a member
count of the global scope without the predefined types
@@ -12,9 +18,9 @@ Wed Jun 30 11:55:46 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
Wed Jun 30 06:50:37 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
* orbsvcs/IFR_Service/IFR_Service.mpc:
-
+
Reverted some of the changes in
-
+
Tue Jun 29 11:13:51 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
so that TAO_IFR_EXE once again depends on TAO and IFR_Client.
diff --git a/TAO/TAO_IDL/include/utl_string.h b/TAO/TAO_IDL/include/utl_string.h
index aa7b28b87c1..2b98d823525 100644
--- a/TAO/TAO_IDL/include/utl_string.h
+++ b/TAO/TAO_IDL/include/utl_string.h
@@ -70,6 +70,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
#include "TAO_IDL_FE_Export.h"
#include "idl_bool.h"
#include "ace/iosfwd.h"
+ /* Basic_Types.h are needed in QNX for size_t type. */
+#include "ace/Basic_Types.h"
class TAO_IDL_FE_Export UTL_String
{