From 2c2991d44ec275a31974e42eadfbcdd68c32a400 Mon Sep 17 00:00:00 2001
From: Jack Andersen <jackoalan@gmail.com>
Date: Tue, 18 Aug 2015 12:50:52 -1000
Subject: [PATCH] switched to unique_ptr due to expected app main use

---
 include/boo/IApplication.hpp |  6 +++---
 lib/x11/ApplicationUnix.cpp  | 23 +++++++++++------------
 test/main.cpp                |  2 +-
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/include/boo/IApplication.hpp b/include/boo/IApplication.hpp
index 2693a1e..fc88800 100644
--- a/include/boo/IApplication.hpp
+++ b/include/boo/IApplication.hpp
@@ -56,7 +56,7 @@ public:
     
 };
 
-std::shared_ptr<IApplication>
+std::unique_ptr<IApplication>
 ApplicationBootstrap(IApplication::EPlatformType platform,
                      IApplicationCallback& cb,
                      const std::string& uniqueName,
@@ -66,7 +66,7 @@ ApplicationBootstrap(IApplication::EPlatformType platform,
                      bool singleInstance=true);
 extern IApplication* APP;
     
-static inline std::shared_ptr<IApplication>
+static inline std::unique_ptr<IApplication>
 ApplicationBootstrap(IApplication::EPlatformType platform,
                      IApplicationCallback& cb,
                      const std::string& uniqueName,
@@ -75,7 +75,7 @@ ApplicationBootstrap(IApplication::EPlatformType platform,
                      bool singleInstance=true)
 {
     if (APP)
-        return std::shared_ptr<IApplication>(APP);
+        return std::unique_ptr<IApplication>();
     std::vector<std::string> args;
     for (int i=1 ; i<argc ; ++i)
         args.push_back(argv[i]);
diff --git a/lib/x11/ApplicationUnix.cpp b/lib/x11/ApplicationUnix.cpp
index d7af3bd..e3faf79 100644
--- a/lib/x11/ApplicationUnix.cpp
+++ b/lib/x11/ApplicationUnix.cpp
@@ -48,7 +48,7 @@ namespace boo
 {
 
 IApplication* APP = NULL;
-std::shared_ptr<IApplication> ApplicationBootstrap(IApplication::EPlatformType platform,
+std::unique_ptr<IApplication> ApplicationBootstrap(IApplication::EPlatformType platform,
                                                    IApplicationCallback& cb,
                                                    const std::string& uniqueName,
                                                    const std::string& friendlyName,
@@ -56,17 +56,16 @@ std::shared_ptr<IApplication> ApplicationBootstrap(IApplication::EPlatformType p
                                                    const std::vector<std::string>& args,
                                                    bool singleInstance)
 {
-    if (!APP)
-    {
-        if (platform == IApplication::PLAT_WAYLAND)
-            APP = new ApplicationWayland(cb, uniqueName, friendlyName, pname, args, singleInstance);
-        else if (platform == IApplication::PLAT_XCB ||
-                 platform == IApplication::PLAT_AUTO)
-            APP = new ApplicationXCB(cb, uniqueName, friendlyName, pname, args, singleInstance);
-        else
-            return std::shared_ptr<IApplication>();
-    }
-    return std::shared_ptr<IApplication>(APP);
+    if (APP)
+        return std::unique_ptr<IApplication>();
+    if (platform == IApplication::PLAT_WAYLAND)
+        APP = new ApplicationWayland(cb, uniqueName, friendlyName, pname, args, singleInstance);
+    else if (platform == IApplication::PLAT_XCB ||
+             platform == IApplication::PLAT_AUTO)
+        APP = new ApplicationXCB(cb, uniqueName, friendlyName, pname, args, singleInstance);
+    else
+        return std::unique_ptr<IApplication>();
+    return std::unique_ptr<IApplication>(APP);
 }
     
 }
diff --git a/test/main.cpp b/test/main.cpp
index 22d4989..2d78790 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -137,7 +137,7 @@ struct TestApplicationCallback : IApplicationCallback
 int main(int argc, const char** argv)
 {
     boo::TestApplicationCallback appCb;
-    std::shared_ptr<boo::IApplication> app =
+    std::unique_ptr<boo::IApplication> app =
             ApplicationBootstrap(boo::IApplication::PLAT_AUTO,
                                  appCb, "rwk", "RWK", argc, argv);
     app->run();