summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-07-28 14:10:13 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-07-28 14:10:13 +0000
commitf46cd7e92dc9b3ecaae67846932232bbf28cec0b (patch)
tree87c93900a617bd0a75b351a91d07c97f26027f06
parente9efc7278486a5a22b2af151bcc8991bde87e700 (diff)
downloadATCD-f46cd7e92dc9b3ecaae67846932232bbf28cec0b.tar.gz
ChangeLogTag: Mon Jul 28 09:04:14 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
-rw-r--r--TAO/ChangeLog12
-rw-r--r--TAO/TAO_IDL/fe/idl.ll2
-rw-r--r--TAO/TAO_IDL/fe/lex.yy.cpp2
3 files changed, 14 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 302ad59b375..74396edba09 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,15 @@
+Mon Jul 28 09:04:14 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
+
+ * TAO_IDL/fe/idl.ll:
+ * TAO_IDL/fe/lex.yy.cpp:
+
+ Minor change to make the return type of atoui(), modified
+ in
+
+ Mon Jul 21 15:58:39 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
+
+ compatible with its usage to set the line number.
+
Mon Jul 28 14:04:10 UTC 2003 Don Hinton <dhinton@dresystems.com>
* examples/RTScheduling/DT_Creator.cpp:
diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll
index c360f602c23..39638c9a9fe 100644
--- a/TAO/TAO_IDL/fe/idl.ll
+++ b/TAO/TAO_IDL/fe/idl.ll
@@ -408,7 +408,7 @@ idl_parse_line_and_file (char *buf)
}
*r++ = 0;
- idl_global->set_lineno (idl_atoui (h, 10));
+ idl_global->set_lineno ((long) idl_atoui (h, 10));
// Find file name, if present.
for (; *r != '"'; r++)
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp
index cde1fc49273..d3d5cedea94 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp
@@ -2601,7 +2601,7 @@ idl_parse_line_and_file (char *buf)
}
*r++ = 0;
- idl_global->set_lineno (idl_atoui (h, 10));
+ idl_global->set_lineno ((long) idl_atoui (h, 10));
// Find file name, if present.
for (; *r != '"'; r++)