std::shared_ptr

[dcpomatic.git] / src / lib / scp_uploader.cc

diff --git a/src/lib/scp_uploader.cc b/src/lib/scp_uploader.cc
index 603d53cdf6731699a256d4d776eba11eab0a69bb..0926ffa9f794bf22353cbce13f6ee998b7c239a3 100644 (file)
--- a/src/lib/scp_uploader.cc
+++ b/src/lib/scp_uploader.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -23,13 +24,14 @@
 #include "config.h"
 #include "cross.h"
 #include "compose.hpp"
+#include "warnings.h"
 #include <sys/stat.h>
 
 #include "i18n.h"
 
 using std::string;
 using std::min;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::function;
 
 SCPUploader::SCPUploader (function<void (string)> set_status, function<void (float)> set_progress)
@@ -50,10 +52,12 @@ SCPUploader::SCPUploader (function<void (string)> set_status, function<void (flo
                throw NetworkError (String::compose (_("Could not connect to server %1 (%2)"), Config::instance()->tms_ip(), ssh_get_error (_session)));
        }
 
+DCPOMATIC_DISABLE_WARNINGS
        r = ssh_is_server_known (_session);
        if (r == SSH_SERVER_ERROR) {
                throw NetworkError (String::compose (_("SSH error (%1)"), ssh_get_error (_session)));
        }
+DCPOMATIC_ENABLE_WARNINGS
 
        r = ssh_userauth_password (_session, 0, Config::instance()->tms_password().c_str ());
        if (r != SSH_AUTH_SUCCESS) {