diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-04-29 16:34:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-29 16:34:40 +0200 |
| commit | 787426a49615759b0f84bd5a4aa3abd8afe9d407 (patch) | |
| tree | 03808193a4c89204fdaed1542d63dd0194a6378e | |
| parent | c9622fd1d7f2a9b3f7587446b5ff89f21b79d9d1 (diff) | |
| parent | cce840e88439eb21e24df18a2668856bbccc1e21 (diff) | |
| download | ATCD-787426a49615759b0f84bd5a4aa3abd8afe9d407.tar.gz | |
Merge pull request #1095 from jwillemsen/master
Removed left over ACE_CDR_LONGLONG_INITIALIZER, related to #1090
| -rw-r--r-- | TAO/TAO_IDL/fe/idl.ll | 2 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/idl.yy.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll index fde9c3776ce..69bc94d48bd 100644 --- a/TAO/TAO_IDL/fe/idl.ll +++ b/TAO/TAO_IDL/fe/idl.ll @@ -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') diff --git a/TAO/TAO_IDL/fe/idl.yy.cpp b/TAO/TAO_IDL/fe/idl.yy.cpp index bcb099c813a..37bf6530725 100644 --- a/TAO/TAO_IDL/fe/idl.yy.cpp +++ b/TAO/TAO_IDL/fe/idl.yy.cpp @@ -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 @@ -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 @@ -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 */ { @@ -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(); |