diff --git a/Build_android/openssl/openssl-1.0.2k.patch b/Build_android/openssl/openssl-1.0.2k.patch index 992a27e9f9..35c528356d 100644 --- a/Build_android/openssl/openssl-1.0.2k.patch +++ b/Build_android/openssl/openssl-1.0.2k.patch @@ -3,10 +3,10 @@ for Android using either Clang or GCC toolchains. An alias for the android-armv7 target, named android-armeabi, is added for compatability with the OpenSSL 1.1.0 configuration target names. Support for -the AArch64 archicture is also added, as well as targets using the Clang +the AArch64 architecture is also added, as well as targets using the Clang compiler. -Clang does not recognize some of the ARM assembly nmenonics that are used in +Clang does not recognize some of the ARM assembly mnemonics that are used in OpenSSL. In particular, the 'adrl' pseudo instruction is not supported. To further complicate matters, Clang doesn't support immediate fixup values so the alternative adr/sub sequence used for the Thumb2 code path cannot be diff --git a/Build_android/openssl/openssl-1.0.2l.patch b/Build_android/openssl/openssl-1.0.2l.patch index 03acbee7c0..9e4f6073a7 100644 --- a/Build_android/openssl/openssl-1.0.2l.patch +++ b/Build_android/openssl/openssl-1.0.2l.patch @@ -3,10 +3,10 @@ for Android using either Clang or GCC toolchains. An alias for the android-armv7 target, named android-armeabi, is added for compatability with the OpenSSL 1.1.0 configuration target names. Support for -the AArch64 archicture is also added, as well as targets using the Clang +the AArch64 architecture is also added, as well as targets using the Clang compiler. -Clang does not recognize some of the ARM assembly nmenonics that are used in +Clang does not recognize some of the ARM assembly mnemonics that are used in OpenSSL. In particular, the 'adrl' pseudo instruction is not supported. To further complicate matters, Clang doesn't support immediate fixup values so the alternative adr/sub sequence used for the Thumb2 code path cannot be diff --git a/Build_android/openssl/openssl-1.0.2m.patch b/Build_android/openssl/openssl-1.0.2m.patch index 8314b1e7fd..a1d79b0115 100644 --- a/Build_android/openssl/openssl-1.0.2m.patch +++ b/Build_android/openssl/openssl-1.0.2m.patch @@ -3,10 +3,10 @@ for Android using either Clang or GCC toolchains. An alias for the android-armv7 target, named android-armeabi, is added for compatability with the OpenSSL 1.1.0 configuration target names. Support for -the AArch64 archicture is also added, as well as targets using the Clang +the AArch64 architecture is also added, as well as targets using the Clang compiler. -Clang does not recognize some of the ARM assembly nmenonics that are used in +Clang does not recognize some of the ARM assembly mnemonics that are used in OpenSSL. In particular, the 'adrl' pseudo instruction is not supported. To further complicate matters, Clang doesn't support immediate fixup values so the alternative adr/sub sequence used for the Thumb2 code path cannot be diff --git a/Build_android/openssl/openssl-1.0.2n.patch b/Build_android/openssl/openssl-1.0.2n.patch index 7e96205923..51fae72064 100644 --- a/Build_android/openssl/openssl-1.0.2n.patch +++ b/Build_android/openssl/openssl-1.0.2n.patch @@ -3,10 +3,10 @@ for Android using either Clang or GCC toolchains. An alias for the android-armv7 target, named android-armeabi, is added for compatability with the OpenSSL 1.1.0 configuration target names. Support for -the AArch64 archicture is also added, as well as targets using the Clang +the AArch64 architecture is also added, as well as targets using the Clang compiler. -Clang does not recognize some of the ARM assembly nmenonics that are used in +Clang does not recognize some of the ARM assembly mnemonics that are used in OpenSSL. In particular, the 'adrl' pseudo instruction is not supported. To further complicate matters, Clang doesn't support immediate fixup values so the alternative adr/sub sequence used for the Thumb2 code path cannot be diff --git a/Build_iOS/README.md b/Build_iOS/README.md index a5c58cc98a..a2f747ea5a 100644 --- a/Build_iOS/README.md +++ b/Build_iOS/README.md @@ -1 +1 @@ -Please consult the documentation [here](https://github.com/Microsoft/cpprestsdk/wiki/How-to-build-for-iOS) for iOS compilation. +Please consult the [documentation for iOS compilation](https://github.com/Microsoft/cpprestsdk/wiki/How-to-build-for-iOS). diff --git a/Release/CMakeLists.txt b/Release/CMakeLists.txt index 14e43cedcd..1214552f90 100644 --- a/Release/CMakeLists.txt +++ b/Release/CMakeLists.txt @@ -213,7 +213,7 @@ function(configure_pch target precompile_header precomile_source) # optional add set_property(SOURCE ${_srcs} APPEND PROPERTY OBJECT_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${target}.pch") set(pch_output_filepath_arg "/Fp${CMAKE_CURRENT_BINARY_DIR}/${target}.pch") else() - # Don't specify output file so that VS may choose a config spefic location. + # Don't specify output file so that VS may choose a config specific location. # Otherwise Debug/Release builds will interfere with one another. endif() diff --git a/Release/include/cpprest/asyncrt_utils.h b/Release/include/cpprest/asyncrt_utils.h index 3e4bfdd5c4..55b97b0a52 100644 --- a/Release/include/cpprest/asyncrt_utils.h +++ b/Release/include/cpprest/asyncrt_utils.h @@ -381,7 +381,7 @@ inline bool __cdecl is_alnum(Elem ch) CPPREST_NOEXCEPT /// 0x0A == Line Feed /// 0x0B == Vertical Tab /// 0x0C == Form Feed -/// 0x0D == Carrage Return +/// 0x0D == Carriage Return /// 0x20 == Space /// template @@ -451,7 +451,7 @@ std::unique_ptr<_Type> make_unique(_Arg1&& arg1, _Arg2&& arg2, _Arg3&& arg3, _Ar } /// -/// Cross platform utility function for performing case insensitive string equality comparison. +/// Cross platform utility function for performing case-insensitive string equality comparison. /// /// First string to compare. /// Second strong to compare. @@ -459,7 +459,7 @@ std::unique_ptr<_Type> make_unique(_Arg1&& arg1, _Arg2&& arg2, _Arg3&& arg3, _Ar _ASYNCRTIMP bool __cdecl str_iequal(const std::string& left, const std::string& right) CPPREST_NOEXCEPT; /// -/// Cross platform utility function for performing case insensitive string equality comparison. +/// Cross platform utility function for performing case-insensitive string equality comparison. /// /// First string to compare. /// Second strong to compare. @@ -467,7 +467,7 @@ _ASYNCRTIMP bool __cdecl str_iequal(const std::string& left, const std::string& _ASYNCRTIMP bool __cdecl str_iequal(const std::wstring& left, const std::wstring& right) CPPREST_NOEXCEPT; /// -/// Cross platform utility function for performing case insensitive string less-than comparison. +/// Cross platform utility function for performing case-insensitive string less-than comparison. /// /// First string to compare. /// Second strong to compare. @@ -476,7 +476,7 @@ _ASYNCRTIMP bool __cdecl str_iequal(const std::wstring& left, const std::wstring _ASYNCRTIMP bool __cdecl str_iless(const std::string& left, const std::string& right) CPPREST_NOEXCEPT; /// -/// Cross platform utility function for performing case insensitive string less-than comparison. +/// Cross platform utility function for performing case-insensitive string less-than comparison. /// /// First string to compare. /// Second strong to compare. @@ -725,7 +725,7 @@ class nonce_generator /// /// Set length of the generated nonce string. /// - /// Lenght of nonce string. + /// Length of nonce string. void set_length(int length) { m_length = length; } private: diff --git a/Release/include/cpprest/details/SafeInt3.hpp b/Release/include/cpprest/details/SafeInt3.hpp index e6276f949b..3a0c4c90de 100644 --- a/Release/include/cpprest/details/SafeInt3.hpp +++ b/Release/include/cpprest/details/SafeInt3.hpp @@ -207,7 +207,7 @@ the type has. Enabling this option is not recommended. * * One key operator that is missing is an implicit cast to type T. The reason for * this is that if there is an implicit cast operator, then we end up with -* an ambiguous compile-time precedence. Because of this amiguity, there +* an ambiguous compile-time precedence. Because of this ambiguity, there * are two methods that are provided: * * Casting operators for every native integer type @@ -3759,7 +3759,7 @@ class DivisionHelper else // Corner case if (t == IntTraits::minInt && u == (unsigned __int64)IntTraits::minInt) { - // Min int divided by it's own magnitude is -1 + // Min int divided by its own magnitude is -1 result = -1; } else @@ -3796,7 +3796,7 @@ class DivisionHelper else // Corner case if (t == IntTraits::minInt && u == (unsigned __int64)IntTraits::minInt) { - // Min int divided by it's own magnitude is -1 + // Min int divided by its own magnitude is -1 result = -1; } else @@ -7211,7 +7211,7 @@ class DivisionCornerCaseHelper2 template SafeInt operator/(U lhs, SafeInt rhs) SAFEINT_CPP_THROW { - // Corner case - has to be handled seperately + // Corner case - has to be handled separately SafeInt result; if (DivisionCornerCaseHelper::method == (int)DivisionState_UnsignedSigned>:: DivisionCornerCase1(lhs, rhs, result)) diff --git a/Release/include/cpprest/http_headers.h b/Release/include/cpprest/http_headers.h index 4b4f9eaceb..ae608baa7c 100644 --- a/Release/include/cpprest/http_headers.h +++ b/Release/include/cpprest/http_headers.h @@ -96,7 +96,7 @@ bool bind_impl(const key_type& text, std::string& ref) class http_headers { public: - /// Function object to perform case insensitive comparison of wstrings. + /// Function object to perform case-insensitive comparison of wstrings. struct _case_insensitive_cmp { bool operator()(const utility::string_t& str1, const utility::string_t& str2) const @@ -315,7 +315,7 @@ class http_headers _ASYNCRTIMP void set_date(const utility::datetime& date); private: - // Headers are stored in a map with case insensitive key. + // Headers are stored in a map with case-insensitive key. inner_container m_headers; }; } // namespace http diff --git a/Release/include/cpprest/http_msg.h b/Release/include/cpprest/http_msg.h index 55c0433c94..cb9c977d11 100644 --- a/Release/include/cpprest/http_msg.h +++ b/Release/include/cpprest/http_msg.h @@ -438,7 +438,7 @@ class http_msg_base /// /// /// This routine is like _get_content_length, except that it adds a compression algorithm to - /// the Trasfer-Length header if compression is configured. It throws if a Transfer-Encoding + /// the Transfer-Length header if compression is configured. It throws if a Transfer-Encoding /// header exists and does not match the one it generated. /// _ASYNCRTIMP size_t _get_content_length_and_set_compression(); diff --git a/Release/include/cpprest/json.h b/Release/include/cpprest/json.h index 9549f9b8d5..9797d2e0c6 100644 --- a/Release/include/cpprest/json.h +++ b/Release/include/cpprest/json.h @@ -782,7 +782,7 @@ enum json_error malformed_numeric_literal, malformed_string_literal, malformed_token, - mismatched_brances, + mismatched_braces, nesting, unexpected_token }; @@ -805,7 +805,7 @@ class json_error_category_impl : public std::error_category case json_error::malformed_numeric_literal: return "Malformed numeric literal"; case json_error::malformed_string_literal: return "Malformed string literal"; case json_error::malformed_token: return "Malformed token"; - case json_error::mismatched_brances: return "Mismatched braces"; + case json_error::mismatched_braces: return "Mismatched braces"; case json_error::nesting: return "Nesting too deep"; case json_error::unexpected_token: return "Unexpected token"; default: return "Unknown json error"; diff --git a/Release/include/cpprest/rawptrstream.h b/Release/include/cpprest/rawptrstream.h index 1f15ecbe77..166902898f 100644 --- a/Release/include/cpprest/rawptrstream.h +++ b/Release/include/cpprest/rawptrstream.h @@ -110,7 +110,7 @@ class basic_rawptr_buffer : public streams::details::streambuf_state_manager<_Ch /// virtual size_t in_avail() const { - // See the comment in seek around the restiction that we do not allow read head to + // See the comment in seek around the restriction that we do not allow read head to // seek beyond the current size. _ASSERTE(m_current_position <= m_size); diff --git a/Release/include/pplx/pplxtasks.h b/Release/include/pplx/pplxtasks.h index 6868fc1619..ce6f1124ee 100644 --- a/Release/include/pplx/pplxtasks.h +++ b/Release/include/pplx/pplxtasks.h @@ -204,7 +204,7 @@ class task; /// only one frame is captured and no stackwalk will be involved. Otherwise, the number of callstack frames will be /// captured. /// -/// +/// /// This needs to be defined as a macro rather than a function so that if we're only gathering one frame, /// _ReturnAddress() will evaluate to client code, rather than a helper function inside of _TaskCreationCallstack, /// itself. @@ -878,7 +878,7 @@ struct _ResultHolder> std::vector<_Type ^> Get() { - // Return vectory with the objects that are marshaled in the proper apartment + // Return vector with the objects that are marshaled in the proper apartment std::vector<_Type ^> _Return; _Return.reserve(_Result.size()); @@ -1446,7 +1446,7 @@ inline bool _IsCausalitySupported() OSVERSIONINFOEX _osvi = {}; _osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); - // The Causality is supported on Windows version higher than Windows 8 + // The Causality is supported on Windows version above Windows 8 _osvi.dwMajorVersion = 6; _osvi.dwMinorVersion = 3; @@ -2396,7 +2396,7 @@ inline void _TaskEventLogger::_LogTaskCompleted() /// /// The implementation of a first-class task. This structure contains the task group used to execute /// the task function and handles the scheduling. The _Task_impl is created as a shared_ptr -/// member of the the public task class, so its destruction is handled automatically. +/// member of the public task class, so its destruction is handled automatically. /// /// /// The result type of this task. @@ -3200,7 +3200,7 @@ class _Continuation_func_transformer } }; -// A helper class template that transforms an intial task lambda returns void into a lambda that returns a non-void type +// A helper class template that transforms an initial task lambda returns void into a lambda that returns a non-void type // (details::_Unit_type is used to substitute for void). This is to minimize the special handling required for 'void'. template class _Init_func_transformer @@ -4267,7 +4267,7 @@ class task // // A **nullptr** token state indicates that it was not provided by the user. In this case, we inherit the - // antecedent's token UNLESS this is a an exception handling continuation. In that case, we break the chain with + // antecedent's token UNLESS this is an exception handling continuation. In that case, we break the chain with // a _None. That continuation is never canceled unless the user explicitly passes the same token. // if (_PTokenState == nullptr) @@ -5348,9 +5348,9 @@ struct _SelectorTaskGenerator cancellation_token_source _Cts, const _TaskCreationCallstack& _callstack) { - task_options _taskOptinos(_Cts.get_token()); - details::_get_internal_task_options(_taskOptinos)._set_creation_callstack(_callstack); - return task<_ReturnType>(_Func(), _taskOptinos); + task_options _taskOptions(_Cts.get_token()); + details::_get_internal_task_options(_taskOptions)._set_creation_callstack(_callstack); + return task<_ReturnType>(_Func(), _taskOptions); } template @@ -5358,9 +5358,9 @@ struct _SelectorTaskGenerator cancellation_token_source _Cts, const _TaskCreationCallstack& _callstack) { - task_options _taskOptinos(_Cts.get_token()); - details::_get_internal_task_options(_taskOptinos)._set_creation_callstack(_callstack); - return task<_ReturnType>(_Func(_Cts.get_token()), _taskOptinos); + task_options _taskOptions(_Cts.get_token()); + details::_get_internal_task_options(_taskOptions)._set_creation_callstack(_callstack); + return task<_ReturnType>(_Func(_Cts.get_token()), _taskOptions); } template @@ -5369,9 +5369,9 @@ struct _SelectorTaskGenerator cancellation_token_source _Cts, const _TaskCreationCallstack& _callstack) { - task_options _taskOptinos(_Cts.get_token()); - details::_get_internal_task_options(_taskOptinos)._set_creation_callstack(_callstack); - return task<_ReturnType>(_Func(_Progress), _taskOptinos); + task_options _taskOptions(_Cts.get_token()); + details::_get_internal_task_options(_taskOptions)._set_creation_callstack(_callstack); + return task<_ReturnType>(_Func(_Progress), _taskOptions); } template @@ -5380,9 +5380,9 @@ struct _SelectorTaskGenerator cancellation_token_source _Cts, const _TaskCreationCallstack& _callstack) { - task_options _taskOptinos(_Cts.get_token()); - details::_get_internal_task_options(_taskOptinos)._set_creation_callstack(_callstack); - return task<_ReturnType>(_Func(_Progress, _Cts.get_token()), _taskOptinos); + task_options _taskOptions(_Cts.get_token()); + details::_get_internal_task_options(_taskOptions)._set_creation_callstack(_callstack); + return task<_ReturnType>(_Func(_Progress, _Cts.get_token()), _taskOptions); } }; @@ -5394,9 +5394,9 @@ struct _SelectorTaskGenerator<_AsyncSelector, void> cancellation_token_source _Cts, const _TaskCreationCallstack& _callstack) { - task_options _taskOptinos(_Cts.get_token()); - details::_get_internal_task_options(_taskOptinos)._set_creation_callstack(_callstack); - return task(_Func(), _taskOptinos); + task_options _taskOptions(_Cts.get_token()); + details::_get_internal_task_options(_taskOptions)._set_creation_callstack(_callstack); + return task(_Func(), _taskOptions); } template @@ -5404,9 +5404,9 @@ struct _SelectorTaskGenerator<_AsyncSelector, void> cancellation_token_source _Cts, const _TaskCreationCallstack& _callstack) { - task_options _taskOptinos(_Cts.get_token()); - details::_get_internal_task_options(_taskOptinos)._set_creation_callstack(_callstack); - return task(_Func(_Cts.get_token()), _taskOptinos); + task_options _taskOptions(_Cts.get_token()); + details::_get_internal_task_options(_taskOptions)._set_creation_callstack(_callstack); + return task(_Func(_Cts.get_token()), _taskOptions); } template @@ -5415,9 +5415,9 @@ struct _SelectorTaskGenerator<_AsyncSelector, void> cancellation_token_source _Cts, const _TaskCreationCallstack& _callstack) { - task_options _taskOptinos(_Cts.get_token()); - details::_get_internal_task_options(_taskOptinos)._set_creation_callstack(_callstack); - return task(_Func(_Progress), _taskOptinos); + task_options _taskOptions(_Cts.get_token()); + details::_get_internal_task_options(_taskOptions)._set_creation_callstack(_callstack); + return task(_Func(_Progress), _taskOptions); } template @@ -5426,9 +5426,9 @@ struct _SelectorTaskGenerator<_AsyncSelector, void> cancellation_token_source _Cts, const _TaskCreationCallstack& _callstack) { - task_options _taskOptinos(_Cts.get_token()); - details::_get_internal_task_options(_taskOptinos)._set_creation_callstack(_callstack); - return task(_Func(_Progress, _Cts.get_token()), _taskOptinos); + task_options _taskOptions(_Cts.get_token()); + details::_get_internal_task_options(_taskOptions)._set_creation_callstack(_callstack); + return task(_Func(_Progress, _Cts.get_token()), _taskOptions); } }; @@ -5446,15 +5446,15 @@ struct _SelectorTaskGenerator<_TypeSelectorNoAsync, _ReturnType> cancellation_token_source _Cts, const _TaskCreationCallstack& _callstack) { - task_options _taskOptinos(_Cts.get_token()); - details::_get_internal_task_options(_taskOptinos)._set_creation_callstack(_callstack); + task_options _taskOptions(_Cts.get_token()); + details::_get_internal_task_options(_taskOptions)._set_creation_callstack(_callstack); return task<_ReturnType>( [=]() -> _ReturnType { _Task_generator_oversubscriber_t _Oversubscriber; (_Oversubscriber); return _Func(); }, - _taskOptinos); + _taskOptions); } #pragma warning(pop) @@ -5463,15 +5463,15 @@ struct _SelectorTaskGenerator<_TypeSelectorNoAsync, _ReturnType> cancellation_token_source _Cts, const _TaskCreationCallstack& _callstack) { - task_options _taskOptinos(_Cts.get_token()); - details::_get_internal_task_options(_taskOptinos)._set_creation_callstack(_callstack); + task_options _taskOptions(_Cts.get_token()); + details::_get_internal_task_options(_taskOptions)._set_creation_callstack(_callstack); return task<_ReturnType>( [=]() -> _ReturnType { _Task_generator_oversubscriber_t _Oversubscriber; (_Oversubscriber); return _Func(_Cts.get_token()); }, - _taskOptinos); + _taskOptions); } template @@ -5480,15 +5480,15 @@ struct _SelectorTaskGenerator<_TypeSelectorNoAsync, _ReturnType> cancellation_token_source _Cts, const _TaskCreationCallstack& _callstack) { - task_options _taskOptinos(_Cts.get_token()); - details::_get_internal_task_options(_taskOptinos)._set_creation_callstack(_callstack); + task_options _taskOptions(_Cts.get_token()); + details::_get_internal_task_options(_taskOptions)._set_creation_callstack(_callstack); return task<_ReturnType>( [=]() -> _ReturnType { _Task_generator_oversubscriber_t _Oversubscriber; (_Oversubscriber); return _Func(_Progress); }, - _taskOptinos); + _taskOptions); } template @@ -5497,15 +5497,15 @@ struct _SelectorTaskGenerator<_TypeSelectorNoAsync, _ReturnType> cancellation_token_source _Cts, const _TaskCreationCallstack& _callstack) { - task_options _taskOptinos(_Cts.get_token()); - details::_get_internal_task_options(_taskOptinos)._set_creation_callstack(_callstack); + task_options _taskOptions(_Cts.get_token()); + details::_get_internal_task_options(_taskOptions)._set_creation_callstack(_callstack); return task<_ReturnType>( [=]() -> _ReturnType { _Task_generator_oversubscriber_t _Oversubscriber; (_Oversubscriber); return _Func(_Progress, _Cts.get_token()); }, - _taskOptinos); + _taskOptions); } }; @@ -5517,15 +5517,15 @@ struct _SelectorTaskGenerator<_TypeSelectorNoAsync, void> cancellation_token_source _Cts, const _TaskCreationCallstack& _callstack) { - task_options _taskOptinos(_Cts.get_token()); - details::_get_internal_task_options(_taskOptinos)._set_creation_callstack(_callstack); + task_options _taskOptions(_Cts.get_token()); + details::_get_internal_task_options(_taskOptions)._set_creation_callstack(_callstack); return task( [=]() { _Task_generator_oversubscriber_t _Oversubscriber; (_Oversubscriber); _Func(); }, - _taskOptinos); + _taskOptions); } template @@ -5533,15 +5533,15 @@ struct _SelectorTaskGenerator<_TypeSelectorNoAsync, void> cancellation_token_source _Cts, const _TaskCreationCallstack& _callstack) { - task_options _taskOptinos(_Cts.get_token()); - details::_get_internal_task_options(_taskOptinos)._set_creation_callstack(_callstack); + task_options _taskOptions(_Cts.get_token()); + details::_get_internal_task_options(_taskOptions)._set_creation_callstack(_callstack); return task( [=]() { _Task_generator_oversubscriber_t _Oversubscriber; (_Oversubscriber); _Func(_Cts.get_token()); }, - _taskOptinos); + _taskOptions); } template @@ -5550,15 +5550,15 @@ struct _SelectorTaskGenerator<_TypeSelectorNoAsync, void> cancellation_token_source _Cts, const _TaskCreationCallstack& _callstack) { - task_options _taskOptinos(_Cts.get_token()); - details::_get_internal_task_options(_taskOptinos)._set_creation_callstack(_callstack); + task_options _taskOptions(_Cts.get_token()); + details::_get_internal_task_options(_taskOptions)._set_creation_callstack(_callstack); return task( [=]() { _Task_generator_oversubscriber_t _Oversubscriber; (_Oversubscriber); _Func(_Progress); }, - _taskOptinos); + _taskOptions); } template @@ -5567,15 +5567,15 @@ struct _SelectorTaskGenerator<_TypeSelectorNoAsync, void> cancellation_token_source _Cts, const _TaskCreationCallstack& _callstack) { - task_options _taskOptinos(_Cts.get_token()); - details::_get_internal_task_options(_taskOptinos)._set_creation_callstack(_callstack); + task_options _taskOptions(_Cts.get_token()); + details::_get_internal_task_options(_taskOptions)._set_creation_callstack(_callstack); return task( [=]() { _Task_generator_oversubscriber_t _Oversubscriber; (_Oversubscriber); _Func(_Progress, _Cts.get_token()); }, - _taskOptinos); + _taskOptions); } }; @@ -7041,10 +7041,10 @@ struct _RunAnyParam template void _WhenAnyContinuationWrapper(_RunAnyParam<_CompletionType>* _PParam, const _Function& _Func, task<_TaskType>& _Task) { - bool _IsTokenCancled = !_PParam->_M_fHasExplicitToken && + bool _IsTokenCanceled = !_PParam->_M_fHasExplicitToken && _Task._GetImpl()->_M_pTokenState != _CancellationTokenState::_None() && _Task._GetImpl()->_M_pTokenState->_IsCanceled(); - if (_Task._GetImpl()->_IsCompleted() && !_IsTokenCancled) + if (_Task._GetImpl()->_IsCompleted() && !_IsTokenCanceled) { _Func(); if (atomic_increment(_PParam->_M_completeCount) == _PParam->_M_numTasks) @@ -7054,8 +7054,8 @@ void _WhenAnyContinuationWrapper(_RunAnyParam<_CompletionType>* _PParam, const _ } else { - _ASSERTE(_Task._GetImpl()->_IsCanceled() || _IsTokenCancled); - if (_Task._GetImpl()->_HasUserException() && !_IsTokenCancled) + _ASSERTE(_Task._GetImpl()->_IsCanceled() || _IsTokenCanceled); + if (_Task._GetImpl()->_HasUserException() && !_IsTokenCanceled) { if (_PParam->_M_Completed._StoreException(_Task._GetImpl()->_GetExceptionHolder())) { diff --git a/Release/include/pplx/threadpool.h b/Release/include/pplx/threadpool.h index b297ff6bc8..a56a6202b5 100644 --- a/Release/include/pplx/threadpool.h +++ b/Release/include/pplx/threadpool.h @@ -59,7 +59,7 @@ class threadpool /// /// /// This function allows an application (in their main function) to initialize the cpprestsdk - /// threadpool with a custom threadcount. Libraries should avoid calling this function to avoid + /// threadpool with a custom thread count. Libraries should avoid calling this function to avoid /// a diamond problem with multiple consumers attempting to customize the pool. /// /// Thrown if the threadpool has already been initialized diff --git a/Release/public_apis_doxyfile b/Release/public_apis_doxyfile index dcd0f857bf..ef77273dba 100644 --- a/Release/public_apis_doxyfile +++ b/Release/public_apis_doxyfile @@ -194,7 +194,7 @@ QT_AUTOBRIEF = NO # tag to YES if you prefer the old behavior instead. # # Note that setting this tag to YES also means that rational rose comments are -# not recognized any more. +# not recognized anymore. # The default value is: NO. MULTILINE_CPP_IS_BRIEF = NO @@ -268,7 +268,7 @@ OPTIMIZE_OUTPUT_VHDL = NO # parses. With this tag you can assign which parser to use for a given # extension. Doxygen has a built-in mapping, but you can override or extend it # using this tag. The format is ext=language, where ext is a file extension, and -# language is one of the parsers supported by doxygen: IDL, Java, Javascript, +# language is one of the parsers supported by doxygen: IDL, Java, JavaScript, # C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran: # FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran: # Fortran. In the later case the parser tries to guess whether the code is fixed @@ -494,7 +494,7 @@ INTERNAL_DOCS = NO # If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file # names in lower-case letters. If set to YES upper-case letters are also # allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows +# in case and if your file system supports case-sensitive file names. Windows # and Mac users are advised to set this option to NO. # The default value is: system dependent. @@ -654,7 +654,7 @@ SHOW_NAMESPACES = YES # The FILE_VERSION_FILTER tag can be used to specify a program or script that # doxygen should invoke to get the current version for each file (typically from # the version control system). Doxygen will invoke the program by executing (via -# popen()) the command command input-file, where command is the value of the +# popen()) the command input-file, where command is the value of the # FILE_VERSION_FILTER tag, and input-file is the name of an input file provided # by doxygen. Whatever the program writes to standard output is used as the file # version. For an example see the documentation. @@ -1418,7 +1418,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1430,7 +1430,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# http://www.mathjax.org) which uses client side JavaScript for the rendering # instead of using prerendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1500,7 +1500,7 @@ MATHJAX_CODEFILE = SEARCHENGINE = YES # When the SERVER_BASED_SEARCH tag is enabled the search engine will be -# implemented using a web server instead of a web client using Javascript. There +# implemented using a web server instead of a web client using JavaScript. There # are two flavors of web server based searching depending on the EXTERNAL_SEARCH # setting. When disabled, doxygen will generate a PHP script for searching and # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing diff --git a/Release/samples/BlackJack/BlackJack_Server/BlackJack_Server.cpp b/Release/samples/BlackJack/BlackJack_Server/BlackJack_Server.cpp index 72918ead67..d31a327829 100644 --- a/Release/samples/BlackJack/BlackJack_Server/BlackJack_Server.cpp +++ b/Release/samples/BlackJack/BlackJack_Server/BlackJack_Server.cpp @@ -4,7 +4,7 @@ * * =+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ * - * BlackJack_Servr.cpp - Simple server application for blackjack + * BlackJack_Server.cpp - Simple server application for blackjack * * =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- ****/ diff --git a/Release/samples/BlackJack/BlackJack_Server/messagetypes.h b/Release/samples/BlackJack/BlackJack_Server/messagetypes.h index f38556dde3..846085959f 100644 --- a/Release/samples/BlackJack/BlackJack_Server/messagetypes.h +++ b/Release/samples/BlackJack/BlackJack_Server/messagetypes.h @@ -336,7 +336,7 @@ struct BJTable auto iPlayers = object.find(PLAYERS); if (iPlayers == object.end()) { - throw web::json::json_exception(U("PLAYTERS key not found")); + throw web::json::json_exception(U("PLAYERS key not found")); } web::json::value players = iPlayers->second; int i = 0; diff --git a/Release/samples/BlackJack/BlackJack_UIClient/CardShape.xaml b/Release/samples/BlackJack/BlackJack_UIClient/CardShape.xaml index 466dfdf1ff..21fa873a01 100644 --- a/Release/samples/BlackJack/BlackJack_UIClient/CardShape.xaml +++ b/Release/samples/BlackJack/BlackJack_UIClient/CardShape.xaml @@ -17,7 +17,7 @@ - + diff --git a/Release/samples/BlackJack/BlackJack_UIClient/Common/StandardStyles.xaml b/Release/samples/BlackJack/BlackJack_UIClient/Common/StandardStyles.xaml index 85f4ed640e..cad02d4fc9 100644 --- a/Release/samples/BlackJack/BlackJack_UIClient/Common/StandardStyles.xaml +++ b/Release/samples/BlackJack/BlackJack_UIClient/Common/StandardStyles.xaml @@ -1092,7 +1092,7 @@