Merge pull request MicrosoftDocs#3595 from MicrosoftDocs/FromPublicMasterBranch

Colin Robertson · web-flow · commit bb4d0b7cefa0 · 2021-06-01T10:57:36.000-07:00
Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master)
diff --git a/docs/cpp/lambda-expression-syntax.md b/docs/cpp/lambda-expression-syntax.md
@@ -13,7 +13,7 @@ This article demonstrates the syntax and structural elements of lambda expressio
 
 When you write code, you probably use function pointers and function objects to solve problems and perform calculations, especially when you use [C++ Standard Library algorithms](../standard-library/algorithms.md). Function pointers and function objects each have advantages and disadvantages—for example, function pointers have minimal syntactic overhead but do not retain state within a scope, and function objects can maintain state but require the syntactic overhead of a class definition.
 
-A lambda combines the benefits of function pointers and function objects and avoids their disadvantages. Like a function objects, a lambda is flexible and can maintain state, but unlike a function object, its compact syntax doesn't require an explicit class definition. By using lambdas, you can write code that's less cumbersome and less prone to errors than the code for an equivalent function object.
+A lambda combines the benefits of function pointers and function objects and avoids their disadvantages. Like a function object, a lambda is flexible and can maintain state, but unlike a function object, its compact syntax doesn't require an explicit class definition. By using lambdas, you can write code that's less cumbersome and less prone to errors than the code for an equivalent function object.
 
 The following examples compare the use of a lambda to the use of a function object. The first example uses a lambda to print to the console whether each element in a `vector` object is even or odd. The second example uses a function object to accomplish the same task.
 
diff --git a/docs/error-messages/compiler-warnings/compiler-warning-level-1-c4103.md b/docs/error-messages/compiler-warnings/compiler-warning-level-1-c4103.md
@@ -20,7 +20,7 @@ The following sample generates C4103:
 // C4103.h
 #pragma pack(push, 4)
 
-// defintions and declarations
+// definitions and declarations
 
 // uncomment the following line to resolve
 // #pragma pack(pop)
diff --git a/docs/standard-library/algorithm-functions.md b/docs/standard-library/algorithm-functions.md
@@ -9445,7 +9445,7 @@ int main()
     v1_NewEnd3 = unique ( v1.begin( ), v1_NewEnd2, greater<int>( ) );
 
     cout << "Removing adjacent elements satisfying the binary\n "
-            << " predicate mod_equal from vector v1 gives ( " ;
+            << " predicate greater<int> from vector v1 gives ( " ;
     for ( v1_Iter3 = v1.begin( ) ; v1_Iter3 != v1_NewEnd3 ; v1_Iter3++ )
         cout << *v1_Iter3 << " ";
     cout << ")." << endl;
@@ -9460,7 +9460,7 @@ Removing adjacent duplicates from vector v1 under the
   binary predicate mod_equal gives
 ( 5 4 7 ).
 Removing adjacent elements satisfying the binary
-  predicate mod_equal from vector v1 gives ( 5 7 ).
+  predicate greater<int> from vector v1 gives ( 5 7 ).
 ```
 
 ## <a name="unique_copy"></a> `unique_copy`
