Merge pull request MicrosoftDocs#797 from MicrosoftDocs/FromPublicMasterBranch

Colin Robertson · web-flow · commit 74394398d4b4 · 2018-05-10T13:10:09.000-07:00
Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master)
diff --git a/docs/build/reference/zp-struct-member-alignment.md b/docs/build/reference/zp-struct-member-alignment.md
@@ -1,7 +1,7 @@
 ---
 title: "-Zp (Struct Member Alignment) | Microsoft Docs"
 ms.custom: ""
-ms.date: "11/04/2016"
+ms.date: "04/30/2018"
 ms.technology: ["cpp-tools"]
 ms.topic: "reference"
 f1_keywords: ["/zp", "VC.Project.VCCLCompilerTool.StructMemberAlignment", "VC.Project.VCCLWCECompilerTool.StructMemberAlignment"]
@@ -13,60 +13,55 @@ ms.author: "corob"
 ms.workload: ["cplusplus"]
 ---
 # /Zp (Struct Member Alignment)
-Controls how the members of a structure are packed into memory and specifies the same packing for all structures in a module.  
-  
-## Syntax  
-  
-```  
-/Zp[1|2|4|8|16]  
-```  
-  
-## Remarks  
- When you specify this option, each structure member after the first is stored on either the size of the member type or `n`-byte boundaries (where `n` is 1, 2, 4, 8, or 16), whichever is smaller.  
-  
- The available values are described in the following table.  
-  
- 1  
- Packs structures on 1-byte boundaries. Same as **/Zp**.  
-  
- 2  
- Packs structures on 2-byte boundaries.  
-  
- 4  
- Packs structures on 4-byte boundaries.  
-  
- 8  
- Packs structures on 8-byte boundaries (default).  
-  
- 16  
- Packs structures on 16-byte boundaries.  
-  
- You should not use this option unless you have specific alignment requirements.  
-  
- You can also use [pack](../../preprocessor/pack.md) to control structure packing. For more information about alignment, see:  
-  
--   [align](../../cpp/align-cpp.md)  
-  
--   [__alignof Operator](../../cpp/alignof-operator.md)  
-  
--   [__unaligned](../../cpp/unaligned.md)  
-  
--   [Examples of Structure Alignment](../../build/examples-of-structure-alignment.md) (x64 specific)  
-  
-### To set this compiler option in the Visual Studio development environment  
-  
-1.  Open the project's **Property Pages** dialog box. For details, see [Working with Project Properties](../../ide/working-with-project-properties.md).  
-  
-2.  Click the **C/C++** folder.  
-  
-3.  Click the **Code Generation** property page.  
-  
-4.  Modify the **Struct Member Alignment** property.  
-  
-### To set this compiler option programmatically  
-  
--   See <xref:Microsoft.VisualStudio.VCProjectEngine.VCCLCompilerTool.StructMemberAlignment%2A>.  
-  
-## See Also  
- [Compiler Options](../../build/reference/compiler-options.md)   
- [Setting Compiler Options](../../build/reference/setting-compiler-options.md)
+
+Controls how the members of a structure are packed into memory and specifies the same packing for all structures in a module.
+
+## Syntax
+
+> **/Zp**[**1**|**2**|**4**|**8**|**16**]
+
+## Remarks
+
+When you specify the **/Zp**_n_ option, each structure member after the first is stored on either the size of the member type or *n*-byte boundaries (where *n* is 1, 2, 4, 8, or 16), whichever is smaller.
+
+The available packing values are described in the following table:
+
+|/Zp argument|Effect|
+|-|-|
+|1|Packs structures on 1-byte boundaries. Same as **/Zp**.|
+|2|Packs structures on 2-byte boundaries.|
+|4|Packs structures on 4-byte boundaries.|
+|8|Packs structures on 8-byte boundaries (default).|
+|16| Packs structures on 16-byte boundaries.|
+
+You should not use this option unless you have specific alignment requirements.
+
+> [!WARNING]  
+> C++ headers in the Windows SDK assume **/Zp8** packing. Memory corruption may occur if the **/Zp** setting is changed when using Windows SDK headers.
+
+You can also use [pack](../../preprocessor/pack.md) to control structure packing. For more information about alignment, see:
+
+- [align](../../cpp/align-cpp.md)
+
+- [__alignof Operator](../../cpp/alignof-operator.md)
+
+- [__unaligned](../../cpp/unaligned.md)
+
+- [Examples of Structure Alignment](../../build/examples-of-structure-alignment.md) (x64 specific)
+
+### To set this compiler option in the Visual Studio development environment
+
+1.  Open the project's **Property Pages** dialog box. For details, see [Working with Project Properties](../../ide/working-with-project-properties.md).
+
+1. Select the **C/C++** > **Code Generation** property page.
+
+1. Modify the **Struct Member Alignment** property.
+
+### To set this compiler option programmatically
+
+-   See <xref:Microsoft.VisualStudio.VCProjectEngine.VCCLCompilerTool.StructMemberAlignment%2A>.
+
+## See also
+
+- [Compiler Options](../../build/reference/compiler-options.md)   
+- [Setting Compiler Options](../../build/reference/setting-compiler-options.md)
diff --git a/docs/cpp/codesnippet/CPP/how-to-create-and-use-shared-ptr-instances_3.cpp b/docs/cpp/codesnippet/CPP/how-to-create-and-use-shared-ptr-instances_3.cpp
@@ -1,8 +1,8 @@
-    vector<shared_ptr<Song>> v;
-
-    v.push_back(make_shared<Song>(L"Bob Dylan", L"The Times They Are A Changing"));
-    v.push_back(make_shared<Song>(L"Aretha Franklin", L"Bridge Over Troubled Water"));
-    v.push_back(make_shared<Song>(L"Thal�a", L"Entre El Mar y Una Estrella"));
+    vector<shared_ptr<Song>> v {
+      make_shared<Song>(L"Bob Dylan", L"The Times They Are A Changing"),
+      make_shared<Song>(L"Aretha Franklin", L"Bridge Over Troubled Water"),
+      make_shared<Song>(L"Thal�a", L"Entre El Mar y Una Estrella")
+    };
 
     vector<shared_ptr<Song>> v2;
     remove_copy_if(v.begin(), v.end(), back_inserter(v2), [] (shared_ptr<Song> s) 
@@ -13,4 +13,4 @@
     for (const auto& s : v2)
     {
         wcout << s->artist << L":" << s->title << endl;
-    }
+    }
diff --git a/docs/cpp/codesnippet/CPP/how-to-create-and-use-shared-ptr-instances_4.cpp b/docs/cpp/codesnippet/CPP/how-to-create-and-use-shared-ptr-instances_4.cpp
@@ -1,8 +1,8 @@
-    vector<shared_ptr<MediaAsset>> assets;
-
-    assets.push_back(shared_ptr<Song>(new Song(L"Himesh Reshammiya", L"Tera Surroor")));
-    assets.push_back(shared_ptr<Song>(new Song(L"Penaz Masani", L"Tu Dil De De")));
-    assets.push_back(shared_ptr<Photo>(new Photo(L"2011-04-06", L"Redmond, WA", L"Soccer field at Microsoft.")));
+    vector<shared_ptr<MediaAsset>> assets {
+      make_shared<Song>(L"Himesh Reshammiya", L"Tera Surroor"),
+      make_shared<Song>(L"Penaz Masani", L"Tu Dil De De")),
+      make_shared<Photo>(L"2011-04-06", L"Redmond, WA", L"Soccer field at Microsoft.")
+    };
 
     vector<shared_ptr<MediaAsset>> photos;
 
diff --git a/docs/cpp/codesnippet/CPP/how-to-create-and-use-unique-ptr-instances_2.cpp b/docs/cpp/codesnippet/CPP/how-to-create-and-use-unique-ptr-instances_2.cpp
@@ -1,12 +1,12 @@
 void SongVector()
 {
     vector<unique_ptr<Song>> songs;
-
+    
     // Create a few new unique_ptr<Song> instances
     // and add them to vector using implicit move semantics.
-    songs.push_back(make_unique<Song>(L"B'z", L"Juice"));
-    songs.push_back(make_unique<Song>(L"Namie Amuro", L"Funky Town"));
-    songs.push_back(make_unique<Song>(L"Kome Kome Club", L"Kimi ga Iru Dake de"));
+    songs.push_back(make_unique<Song>(L"B'z", L"Juice")); 
+    songs.push_back(make_unique<Song>(L"Namie Amuro", L"Funky Town")); 
+    songs.push_back(make_unique<Song>(L"Kome Kome Club", L"Kimi ga Iru Dake de")); 
     songs.push_back(make_unique<Song>(L"Ayumi Hamasaki", L"Poker Face"));
 
     // Pass by const reference when possible to avoid copying.
diff --git a/docs/cpp/codesnippet/CPP/how-to-create-and-use-weak-ptr-instances_1.cpp b/docs/cpp/codesnippet/CPP/how-to-create-and-use-weak-ptr-instances_1.cpp
@@ -44,13 +44,13 @@ class Controller
 
 void RunTest()
 {
-    vector<shared_ptr<Controller>> v;
-
-    v.push_back(shared_ptr<Controller>(new Controller(0)));
-    v.push_back(shared_ptr<Controller>(new Controller(1)));
-    v.push_back(shared_ptr<Controller>(new Controller(2)));
-    v.push_back(shared_ptr<Controller>(new Controller(3)));
-    v.push_back(shared_ptr<Controller>(new Controller(4)));
+    vector<shared_ptr<Controller>> v {
+      make_shared<Controller>(0),
+      make_shared<Controller>(1),
+      make_shared<Controller>(2),
+      make_shared<Controller>(3),
+      make_shared<Controller>(4),
+    };
 
     // Each controller depends on all others not being deleted. 
     // Give each controller a pointer to all the others. 
diff --git a/docs/cpp/functions-cpp.md b/docs/cpp/functions-cpp.md
@@ -293,35 +293,6 @@ template<typename F, typename Tuple = tuple<T...>,
 }
 ```
 
-<<<<<<< HEAD
-4. In addition to using the return value itself, you can "return" values by defining any number of parameters to use pass-by-reference so that the function can modify or initialize the values of objects that the caller provides. For more information, see [Reference-Type Function Arguments](reference-type-function-arguments.md).  
-  
-## Function pointers  
- C++ supports function pointers in the same manner as the C language. However a more type-safe alternative is usually to use a function object.  
-  
- It is recommended that `typedef` be used to declare an alias for the function pointer type if declaring a function that returns a function pointer type.  For example  
-  
-```  
-typedef int (*fp)(int);  
-fp myFunction(char* s); // function returning function pointer  
-```  
-  
- If this is not done, the proper syntax for the function declaration may be deduced from the declarator syntax for the function pointer by replacing the identifier (`fp` in the above example) with the functions name and argument list, as follows:  
-  
-```  
-int (*myFunction(char* s))(int);  
-```  
-  
- The preceding declaration is equivalent to the declaration using typedef above.  
-  
-## See Also  
- [Function Overloading](../cpp/function-overloading.md)   
- [Functions with Variable Argument Lists](../cpp/functions-with-variable-argument-lists-cpp.md)   
- [Explicitly Defaulted and Deleted Functions](../cpp/explicitly-defaulted-and-deleted-functions.md)   
- [Argument-Dependent Name (Koenig) Lookup on Functions](../cpp/argument-dependent-name-koenig-lookup-on-functions.md)   
- [Default Arguments](../cpp/default-arguments.md)   
- [Inline Functions](../cpp/inline-functions-cpp.md)
-=======
 ## Returning multiple values from a function
 
 There are various ways to return more than one value from a function:
@@ -458,4 +429,3 @@ The preceding declaration is equivalent to the declaration using typedef above.
 - [Argument-Dependent Name (Koenig) Lookup on Functions](../cpp/argument-dependent-name-koenig-lookup-on-functions.md)
 - [Default Arguments](../cpp/default-arguments.md)
 - [Inline Functions](../cpp/inline-functions-cpp.md)
->>>>>>> master
diff --git a/docs/parallel/amp/graphics-cpp-amp.md b/docs/parallel/amp/graphics-cpp-amp.md
@@ -116,12 +116,12 @@ texture<int_4, 2> aTexture(768, 1024, texels.begin(), texels.end());
  You can also declare and initialize a `texture` object by using a constructor overload that takes a pointer to the source data, the size of source data in bytes, and the bits per scalar element.  
   
 ```cpp  
-void createTextureWithBPC() { *// Create the source data.  
+void createTextureWithBPC() { // Create the source data.  
     float source[1024* 2];   
     for (int i = 0; i <1024* 2; i++) {  
     source[i] = (float)i;  
  }  
- *// Initialize the texture by using the size of source in bytes *// and bits per scalar element.  
+ // Initialize the texture by using the size of source in bytes // and bits per scalar element.  
     texture<float_2, 1> floatTexture(1024, source, (unsigned int)sizeof(source), 32U);
 
 }  
@@ -131,11 +131,11 @@ void createTextureWithBPC() { *// Create the source data.
   
  There are limits on the size of each dimension of the `texture` object, as shown in the following table. A run-time error is generated if you exceed the limits.  
   
-|Texture|Size limitation|  
+|Texture|Size limitation per dimension|  
 |-------------|---------------------|  
 |texture\<T,1>|16384|  
 |texture\<T,2>|16384|  
-|texture\<T,2>|2048|  
+|texture\<T,3>|2048|  
   
 ### Reading from Texture Objects  
  You can read from a `texture` object by using [texture::operator\[\]](reference/texture-class.md#operator_at), [texture::operator() Operator](reference/texture-class.md#operator_call), or [texture::get Method](reference/texture-class.md#get). The two operators return a value, not a reference. Therefore, you cannot write to a `texture` object by using `texture::operator\[\]`.  
@@ -159,10 +159,10 @@ void readTexture() {
  
     const texture<int_2, 2> tex9(16, 32, src.begin(), src.end());
 
-    parallel_for_each(tex9.extent, [=, &tex9] (index<2> idx) restrict(amp) { *// Use the subscript operator.        
-    arr[idx].x += tex9[idx].x; *// Use the function () operator.        
-    arr[idx].x += tex9(idx).x; *// Use the get method.  
-    arr[idx].y += tex9.get(idx).y; *// Use the function () operator.    
+    parallel_for_each(tex9.extent, [=, &tex9] (index<2> idx) restrict(amp) { // Use the subscript operator.        
+    arr[idx].x += tex9[idx].x; // Use the function () operator.        
+    arr[idx].x += tex9(idx).x; // Use the get method.  
+    arr[idx].y += tex9.get(idx).y; // Use the function () operator.    
     arr[idx].y += tex9(idx[0], idx[1]).y;   
  });
 
@@ -176,21 +176,21 @@ void readTexture() {
  The following code example demonstrates how to store texture channels in a short vector, and then access the individual scalar elements as properties of the short vector.  
   
 ```cpp  
-void UseBitsPerScalarElement() { *// Create the image data. *// Each unsigned int (32-bit) represents four 8-bit scalar elements(r,g,b,a values).  
+void UseBitsPerScalarElement() { // Create the image data. // Each unsigned int (32-bit) represents four 8-bit scalar elements(r,g,b,a values).  
     const int image_height = 16;  
     const int image_width = 16;  
     std::vector<unsigned int> image(image_height* image_width);
 
  
     extent<2> image_extent(image_height, image_width);
 
- *// By using uint_4 and 8 bits per channel, each 8-bit channel in the data source is *// stored in one 32-bit component of a uint_4.  
+ // By using uint_4 and 8 bits per channel, each 8-bit channel in the data source is // stored in one 32-bit component of a uint_4.  
     texture<uint_4, 2> image_texture(image_extent, image.data(), image_extent.size()* 4U,  8U);
 
- *// Use can access the RGBA values of the source data by using swizzling expressions of the uint_4.  
+ // Use can access the RGBA values of the source data by using swizzling expressions of the uint_4.  
     parallel_for_each(image_extent, 
  [&image_texture](index<2> idx) restrict(amp)   
- { *// 4 bytes are automatically extracted when reading.  
+ { // 4 bytes are automatically extracted when reading.  
     uint_4 color = image_texture[idx];   
     unsigned int r = color.r;   
     unsigned int g = color.g;   
@@ -245,7 +245,7 @@ void writeTexture() {
  You can copy between texture objects by using the [copy](reference/concurrency-namespace-functions-amp.md#copy) function or the [copy_async](reference/concurrency-namespace-functions-amp.md#copy_async) function, as shown in the following code example.  
   
 ```cpp  
-void copyHostArrayToTexture() { *// Copy from source array to texture object by using the copy function.  
+void copyHostArrayToTexture() { // Copy from source array to texture object by using the copy function.  
     float floatSource[1024* 2];   
     for (int i = 0; i <1024* 2; i++) {  
     floatSource[i] = (float)i;  
@@ -254,15 +254,15 @@ void copyHostArrayToTexture() { *// Copy from source array to texture object by
 
     copy(floatSource, (unsigned int)sizeof(floatSource), floatTexture);
 
- *// Copy from source array to texture object by using the copy function.  
+ // Copy from source array to texture object by using the copy function.  
     char charSource[16* 16];   
     for (int i = 0; i <16* 16; i++) {  
     charSource[i] = (char)i;  
  }  
     texture<int, 2> charTexture(16, 16, 8U);
 
     copy(charSource, (unsigned int)sizeof(charSource), charTexture);
-*// Copy from texture object to source array by using the copy function.  
+// Copy from texture object to source array by using the copy function.  
     copy(charTexture, charSource, (unsigned int)sizeof(charSource));
 
 }  
diff --git a/docs/parallel/concrt/codesnippet/CPP/how-to-perform-map-and-reduce-operations-in-parallel_1.cpp b/docs/parallel/concrt/codesnippet/CPP/how-to-perform-map-and-reduce-operations-in-parallel_1.cpp
@@ -46,24 +46,24 @@ struct ReduceFunc : binary_function<unordered_map<wstring, size_t>,
 int wmain()
 { 
     // File 1 
-    vector<wstring> v1;
-    v1.push_back(L"word1"); //1 
-    v1.push_back(L"word1"); //2 
-    v1.push_back(L"word2"); 
-    v1.push_back(L"word3"); 
-    v1.push_back(L"word4"); 
+    vector<wstring> v1 {
+      L"word1", // 1
+      L"word1", // 1
+      L"word2",
+      L"word3",
+      L"word4"
+    };
 
     // File 2 
-    vector<wstring> v2; 
-    v2.push_back(L"word5"); 
-    v2.push_back(L"word6"); 
-    v2.push_back(L"word7"); 
-    v2.push_back(L"word8"); 
-    v2.push_back(L"word1"); //3 
+    vector<wstring> v2 {
+      L"word5",
+      L"word6",
+      L"word7",
+      L"word8",
+      L"word1" // 3
+    };
 
-    vector<vector<wstring>> v;
-    v.push_back(v1);
-    v.push_back(v2);
+    vector<vector<wstring>> v { v1, v2 };
 
     vector<unordered_map<wstring, size_t>> map(v.size()); 
 
diff --git a/docs/parallel/concrt/codesnippet/CPP/how-to-perform-map-and-reduce-operations-in-parallel_2.cpp b/docs/parallel/concrt/codesnippet/CPP/how-to-perform-map-and-reduce-operations-in-parallel_2.cpp
diff --git a/docs/parallel/concrt/codesnippet/CPP/parallel-algorithms_6.cpp b/docs/parallel/concrt/codesnippet/CPP/parallel-algorithms_6.cpp
diff --git a/docs/standard-library/basic-string-class.md b/docs/standard-library/basic-string-class.md
