fixes 1486 weak pointer lock example

mikeblome · mikeblome · commit 01b63f8fda86 · 2019-09-16T16:54:58.000-07:00
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
@@ -6,77 +6,73 @@
 
 using namespace std;
 
-class Controller 
+class Controller
 {
 public:
-    int Num;
-    wstring Status;
-    vector<weak_ptr<Controller>> others;
-    explicit Controller(int i) : Num(i) , Status(L"On")
-    {
-        wcout << L"Creating Controller" << Num << endl;
-    }
+   int Num;
+   wstring Status;
+   vector<weak_ptr<Controller>> others;
+   explicit Controller(int i) : Num(i), Status(L"On")
+   {
+      wcout << L"Creating Controller" << Num << endl;
+   }
 
-    ~Controller()
-    {
-        wcout << L"Destroying Controller" << Num << endl;
-    }
+   ~Controller()
+   {
+      wcout << L"Destroying Controller" << Num << endl;
+   }
 
-    // Demonstrates how to test whether the  
-    // pointed-to memory still exists or not. 
-    void CheckStatuses() const
-    {
-        for_each(others.begin(), others.end(), [] (weak_ptr<Controller> wp)
-        {
-            try
-            {
-                auto p = wp.lock();
-                wcout << L"Status of " << p->Num << " = " << p->Status << endl;
-            }
-
-            catch (bad_weak_ptr b)
-            {
-                wcout << L"Null object" << endl;
-            }                
-        });
-    }
+   // Demonstrates how to test whether the
+   // pointed-to memory still exists or not.
+   void CheckStatuses() const
+   {
+      for_each(others.begin(), others.end(), [](weak_ptr<Controller> wp) {
+         auto p = wp.lock();
+         if (p)
+         {
+            wcout << L"Status of " << p->Num << " = " << p->Status << endl;
+         }
+         else
+         {
+            wcout << L"Null object" << endl;
+         }
+      });
+   }
 };
 
 void RunTest()
 {
-    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),
-    };
+   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. 
-    for (int i = 0 ; i < v.size(); ++i)
-    {
-        for_each(v.begin(), v.end(), [&v,i] (shared_ptr<Controller> p)
-        {
-            if(p->Num != i)
-            {
-                v[i]->others.push_back(weak_ptr<Controller>(p));
-                wcout << L"push_back to v[" << i << "]: " << p->Num << endl;
-            }
-        });        
-    }
+   // Each controller depends on all others not being deleted.
+   // Give each controller a pointer to all the others.
+   for (int i = 0; i < v.size(); ++i)
+   {
+      for_each(v.begin(), v.end(), [&v, i](shared_ptr<Controller> p) {
+         if (p->Num != i)
+         {
+            v[i]->others.push_back(weak_ptr<Controller>(p));
+            wcout << L"push_back to v[" << i << "]: " << p->Num << endl;
+         }
+      });
+   }
 
-    for_each(v.begin(), v.end(), [](shared_ptr<Controller>& p)
-    {
-        wcout << L"use_count = " << p.use_count() << endl;
-        p->CheckStatuses();
-    });
+   for_each(v.begin(), v.end(), [](shared_ptr<Controller> &p) {
+      wcout << L"use_count = " << p.use_count() << endl;
+      p->CheckStatuses();
+   });
 }
 
 int main()
-{    
-    RunTest(); 
-    wcout << L"Press any key" << endl;
-    char ch;
-    cin.getline(&ch, 1);
+{
+   RunTest();
+   wcout << L"Press any key" << endl;
+   char ch;
+   cin.getline(&ch, 1);
 }
