pull request #4478 review fixes

2 files changed, 20 insertions, 11 deletions

diff --git a/platform/socket.hpp b/platform/socket.hpp
index ebc87dc816..01f51eb133 100644
--- a/platform/socket.hpp
+++ b/platform/socket.hpp
@@ -2,6 +2,7 @@
 
 #include "std/string.hpp"
 #include "std/target_os.hpp"
+#include "std/unique_ptr.hpp"
 
 namespace platform
 {
@@ -25,15 +26,5 @@ public:
   virtual void SetTimeout(uint32_t milliseconds) = 0;
 };
 
-class PlatformSocket final : public Socket
-{
-  PlatformSocket();
-  // Socket overrides
-  ~PlatformSocket();
-  bool Open(string const & host, uint16_t port) override;
-  void Close() override;
-  bool Read(uint8_t * data, uint32_t count) override;
-  bool Write(uint8_t const * data, uint32_t count) override;
-  void SetTimeout(uint32_t milliseconds) override;
-};
+unique_ptr<Socket> createSocket();
 }  // namespace platform
diff --git a/platform/socket_apple.mm b/platform/socket_apple.mm
index 50615484f9..192503163c 100644
--- a/platform/socket_apple.mm
+++ b/platform/socket_apple.mm
@@ -22,6 +22,24 @@
 
 namespace platform
 {
+class PlatformSocket final : public Socket
+{
+public:
+  PlatformSocket();
+  // Socket overrides
+  ~PlatformSocket();
+  bool Open(string const & host, uint16_t port) override;
+  void Close() override;
+  bool Read(uint8_t * data, uint32_t count) override;
+  bool Write(uint8_t const * data, uint32_t count) override;
+  void SetTimeout(uint32_t milliseconds) override;
+};
+
+unique_ptr<Socket> createSocket()
+{
+  return make_unique<PlatformSocket>();
+}
+
 PlatformSocket::PlatformSocket() {}
 
 PlatformSocket::~PlatformSocket() { Close(); }