Issue 1906 - Fix broken Android build

test/Notification.cpp

Index: test/Notification.cpp
diff --git a/test/Notification.cpp b/test/Notification.cpp
index 06c8656ee7a3ddf1f4ed0615ff380d853ea5980d..35e57549090af68fd8dbe9123e7ccd9217e977a6 100644
--- a/test/Notification.cpp
+++ b/test/Notification.cpp
@@ -37,7 +37,8 @@ namespace
       jsEngine->SetFileSystem(FileSystemPtr(new LazyFileSystem()));
       jsEngine->SetWebRequest(WebRequestPtr(new LazyWebRequest()));
       jsEngine->SetLogSystem(LogSystemPtr(new DefaultLogSystem()));
-      filterEngine = std::tr1::make_shared<FilterEngine>(jsEngine);
+      filterEngine = 
+          std::tr1::shared_ptr<FilterEngine>(new FilterEngine(jsEngine));

[René Jeschke, 2015/01/29 14:22:22]

std::tr1::make_shared<T>(...) is not available on the gcc-toolchain version used
by the Android build.

First I thought about just 'polyfilling' std::tr1::make_shared, but the guarding
#ifdefs would have needed a bit of research, so I just replaced all make_shared
calls with direct shared_ptr instantiations.

[Felix Dahlke, 2015/01/29 16:49:25]

We can actually go for the shorter:

filterEngine.reset(new FilterEngine(jsEngine));

Same below.

[René Jeschke, 2015/01/29 17:07:53]

Done.

     }
 
     void AddNotification(const std::string& notification)
@@ -80,7 +81,8 @@ namespace
     void SetUp() override
     {
       BaseJsTest::SetUp();
-      jsEngine->SetFileSystem(std::tr1::make_shared<LazyFileSystem>());
+      jsEngine->SetFileSystem(
+          std::tr1::shared_ptr<LazyFileSystem>(new LazyFileSystem()));

[Felix Dahlke, 2015/01/29 16:49:25]

Next line indent is generally 2 spaces, apparent at some places in this file.
Also below.

[René Jeschke, 2015/01/29 17:07:53]

Done.

       const char* responseJsonText = "{"
         "\"notifications\": [{"
           "\"id\": \"some id\","
@@ -91,9 +93,11 @@ namespace
           "\"title\": \"Title\""
         "}]"
         "}";
-      jsEngine->SetWebRequest(std::tr1::make_shared<MockWebRequest>(responseJsonText));
+      jsEngine->SetWebRequest(std::tr1::shared_ptr<MockWebRequest>(
+          new MockWebRequest(responseJsonText)));
       jsEngine->SetLogSystem(LogSystemPtr(new DefaultLogSystem()));
-      filterEngine = std::tr1::make_shared<FilterEngine>(jsEngine);
+      filterEngine = 
+          std::tr1::shared_ptr<FilterEngine>(new FilterEngine(jsEngine));
     }
   };
 #endif
@@ -166,4 +170,4 @@ TEST_F(NotificationTest, MarkAsShown)
   ASSERT_TRUE(notification);
   notification->MarkAsShown();
   EXPECT_EQ(NULL, filterEngine->GetNextNotificationToShow().get());
-}
+}