std::shared_ptr

[dcpomatic.git] / src / tools / dcpomatic_server.cc

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index 696fec09ae1b37c73071b9707e204ac0f3a55f79..c59fefe8f3170e7a006f47a1cc4c463187417745 100644 (file)
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -46,11 +46,11 @@ using std::exception;
 using std::list;
 using std::fixed;
 using std::setprecision;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::thread;
 using boost::bind;
 using boost::optional;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
@@ -206,7 +206,7 @@ private:
 
        wxTextCtrl* _text;
        wxStaticText* _fps;
-       boost::shared_ptr<wxTimer> _timer;
+       std::shared_ptr<wxTimer> _timer;
 };
 
 class TaskBarIcon : public wxTaskBarIcon
@@ -218,7 +218,7 @@ public:
 #ifdef DCPOMATIC_WINDOWS
                wxIcon icon (std_to_wx ("id"));
 #else
-               wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
+               wxBitmap bitmap (wxString::Format(wxT("%s/dcpomatic_small.png"), std_to_wx(resources_path().string())), wxBITMAP_TYPE_PNG);
                wxIcon icon;
                icon.CopyFromBitmap (bitmap);
 #endif