Skip to content

Commit

Permalink
Merge pull request #2296 from vermaete/master
Browse files Browse the repository at this point in the history
spelling: changed 'explictly' to 'explicitly'
  • Loading branch information
jwillemsen authored Oct 25, 2024
2 parents 14368dd + 7bf94db commit fad364d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions TAO/ChangeLogs/ChangeLog-2004a
Original file line number Diff line number Diff line change
Expand Up @@ -1836,7 +1836,7 @@ Sun Jun 13 07:56:20 2004 Phil Mesnier <[email protected]>
Sun Jun 14 11:36:12 UTC 2004 Johnny Willemsen <[email protected]>

* tao/PortableServer/Operation_Table.cpp:
Also on AIX we must explictly instantiate static template members.
Also on AIX we must explicitly instantiate static template members.
To make things easier to maintenance use the new
ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION macro to check
whether we need to do this. This macro is set for the GNU compiler for
Expand Down Expand Up @@ -8244,7 +8244,7 @@ Wed Feb 11 13:17:11 UTC 2004 Johnny Willemsen <[email protected]>
Wed Feb 11 11:28:56 UTC 2004 Johnny Willemsen <[email protected]>

* examples/Simple/chat/chat.mpc:
Added idl files explictly so that the order in which the idl files
Added idl files explicitly so that the order in which the idl files
are compiled is fixed and correct.

Wed Feb 11 10:22:11 UTC 2004 Johnny Willemsen <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion TAO/TAO_IDL/util/utl_err.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ error_string (UTL_Error::ErrorCode c)
return "Warning - spelling differs from IDL keyword only in case: ";
case UTL_Error::EIDL_ANONYMOUS_ERROR:
return "anonymous types require the IDL version to be 4 or later or must "
"be explictly enabled using -as";
"be explicitly enabled using -as";
case UTL_Error::EIDL_ANONYMOUS_WARNING:
return "anonymous type found";
case UTL_Error::EIDL_ANONYMOUS_EXPLICIT_ERROR:
Expand Down

0 comments on commit fad364d

Please sign in to comment.