diff --git a/ACE/NEWS b/ACE/NEWS index a0a0d67506461..a6af1f46181d8 100644 --- a/ACE/NEWS +++ b/ACE/NEWS @@ -1,6 +1,10 @@ USER VISIBLE CHANGES BETWEEN ACE-7.1.4 and ACE-7.1.5 ==================================================== +. ACE/TAO now require C++17 or newer + +. Add support for Embarcadero C++ Builder bcc64x compiler + USER VISIBLE CHANGES BETWEEN ACE-7.1.3 and ACE-7.1.4 ==================================================== diff --git a/ACE/ace/checked_iterator.h b/ACE/ace/checked_iterator.h index bdbe4e3cf2ccf..a7b2ea4b4ec53 100644 --- a/ACE/ace/checked_iterator.h +++ b/ACE/ace/checked_iterator.h @@ -11,7 +11,7 @@ * Some compilers (e.g. MSVC++ >= 8) issue security related * diagnostics if algorithms such as std::copy() are used in an unsafe * way. Normally this isn't an issue if STL container iterators are - * used in conjuction with the standard algorithms. However, in cases + * used in conjunction with the standard algorithms. However, in cases * where application-specific iterators are use with standard * algorithms that could potentially overrun a buffer, extra care must * be taken to prevent such an overrun. If supported, checked