Skip to content

Commit

Permalink
Merge pull request #1095 from jwillemsen/master
Browse files Browse the repository at this point in the history
Removed left over ACE_CDR_LONGLONG_INITIALIZER, related to #1090
  • Loading branch information
jwillemsen authored Apr 29, 2020
2 parents c9622fd + cce840e commit 787426a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion TAO/TAO_IDL/fe/idl.ll
Original file line number Diff line number Diff line change
Expand Up @@ -971,7 +971,7 @@ idl_store_pragma (char *buf)
static ACE_CDR::LongLong
idl_atoi (char *s, long b)
{
ACE_CDR::LongLong r = ACE_CDR_LONGLONG_INITIALIZER;
ACE_CDR::LongLong r = 0;

// Skip over the dash and possibly spaces after the dash
while (*s == '-' || *s == ' ' || *s == '\t')
Expand Down
12 changes: 6 additions & 6 deletions TAO/TAO_IDL/fe/idl.yy.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#line 2 "fe/idl.yy.cpp"
#line 1 "fe/idl.yy.cpp"

#line 4 "fe/idl.yy.cpp"
#line 3 "fe/idl.yy.cpp"

#define YY_INT_ALIGNED short int

Expand Down Expand Up @@ -1297,9 +1297,9 @@ static AST_Decl * idl_find_node (const char *);
#undef ECHO
#endif

#line 1303 "fe/idl.yy.cpp"
#line 1302 "fe/idl.yy.cpp"
/* SO we don't choke on files that use \r\n */
#line 1305 "fe/idl.yy.cpp"
#line 1304 "fe/idl.yy.cpp"

#define INITIAL 0

Expand Down Expand Up @@ -1522,7 +1522,7 @@ YY_DECL
#line 123 "fe/idl.ll"


#line 1528 "fe/idl.yy.cpp"
#line 1527 "fe/idl.yy.cpp"

while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
{
Expand Down Expand Up @@ -2307,7 +2307,7 @@ YY_RULE_SETUP
#line 418 "fe/idl.ll"
ECHO;
YY_BREAK
#line 2313 "fe/idl.yy.cpp"
#line 2312 "fe/idl.yy.cpp"
case YY_STATE_EOF(INITIAL):
yyterminate();

Expand Down

0 comments on commit 787426a

Please sign in to comment.