Adapt and adopt PR 988 solution

Colin Robertson · Colin Robertson · commit e0f940b5abe0 · 2019-05-22T15:51:13.000-07:00
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,7 +1,7 @@
     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")
+      make_shared<Song>(L"Thalía", L"Entre El Mar y Una Estrella")
     };
 
     vector<shared_ptr<Song>> v2;
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,6 +1,6 @@
     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<Song>(L"Penaz Masani", L"Tu Dil De De"),
       make_shared<Photo>(L"2011-04-06", L"Redmond, WA", L"Soccer field at Microsoft.")
     };
 
@@ -18,5 +18,5 @@
     {
         // We know that the photos vector contains only 
         // shared_ptr<Photo> objects, so use static_cast.
-        wcout << "Photo location: " << (static_pointer_cast<Photo>(p))->location_ << endl;
+        wcout << "Photo location: " << (static_pointer_cast<Photo>(p))->location << endl;
     }
diff --git a/docs/cpp/how-to-create-and-use-shared-ptr-instances.md b/docs/cpp/how-to-create-and-use-shared-ptr-instances.md
@@ -13,6 +13,57 @@ The following illustration shows several `shared_ptr` instances that point to on
 
 ![Shared pointer diagram](../cpp/media/shared_ptr.png "Shared pointer diagram")
 
+## Example setup
+
+The examples that follow all assume that you've included the required headers and declared the required types, as shown here:
+
+```cpp
+// shared_ptr-examples.cpp
+// The following examples assume these declarations:
+#include <algorithm>
+#include <iostream>
+#include <memory>
+#include <string>
+#include <vector>
+
+struct MediaAsset
+{
+    virtual ~MediaAsset() = default; // make it polymorphic
+};
+
+struct Song : public MediaAsset
+{
+    std::wstring artist;
+    std::wstring title;
+    Song(const std::wstring& artist_, const std::wstring& title_) :
+        artist{ artist_ }, title{ title_ } {}
+};
+
+struct Photo : public MediaAsset
+{
+    std::wstring date;
+    std::wstring location;
+    std::wstring subject;
+    Photo(
+        const std::wstring& date_,
+        const std::wstring& location_,
+        const std::wstring& subject_) :
+        date{ date_ }, location{ location_ }, subject{ subject_ } {}
+};
+
+using namespace std;
+
+int main()
+{
+    // The examples go here, in order:
+    // Example 1
+    // Example 2
+    // Example 3
+    // Example 4
+    // Example 6
+}
+```
+
 ## Example 1
 
 Whenever possible, use the [make_shared](../standard-library/memory-functions.md#make_shared) function to create a `shared_ptr` when the memory resource is created for the first time. `make_shared` is exception-safe. It uses the same call to allocate the memory for the control block and the resource, and thereby reduces the construction overhead. If you do not use `make_shared`, then you have to use an explicit new expression to create the object before you pass it to the `shared_ptr` constructor. The following example shows various ways to declare and initialize a `shared_ptr` together with a new object.

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`vector<shared_ptr<MediaAsset>> assets {`
`2`	`2`	`make_shared<Song>(L"Himesh Reshammiya", L"Tera Surroor"),`
`3`		`- make_shared<Song>(L"Penaz Masani", L"Tu Dil De De")),`
	`3`	`+ make_shared<Song>(L"Penaz Masani", L"Tu Dil De De"),`
`4`	`4`	`make_shared<Photo>(L"2011-04-06", L"Redmond, WA", L"Soccer field at Microsoft.")`
`5`	`5`	`};`
`6`	`6`
`@@ -18,5 +18,5 @@`
`18`	`18`	`{`
`19`	`19`	`// We know that the photos vector contains only`
`20`	`20`	`// shared_ptr<Photo> objects, so use static_cast.`
`21`		`- wcout << "Photo location: " << (static_pointer_cast<Photo>(p))->location_ << endl;`
	`21`	`+ wcout << "Photo location: " << (static_pointer_cast<Photo>(p))->location << endl;`
`22`	`22`	`}`