Avoid auto_ptr if C++11 is available.

xrootd · Feb 3, 2015 · 1886198 · 1886198
1 parent d395913
commit 1886198
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/src/XrdThrottle/XrdThrottle.hh b/src/XrdThrottle/XrdThrottle.hh
@@ -14,8 +14,15 @@
 class XrdSysLogger;
 class XrdOucStream;
 
+
 namespace XrdThrottle {
 
+#if __cplusplus >= 201103L
+typedef std::unique_ptr<XrdSfsFile> unique_sfs_ptr;
+#else
+typedef std::auto_ptr<XrdSfsFile> unique_sfs_ptr;
+#endif
+
 class FileSystem;
 
 class File : public XrdSfsFile {
@@ -86,12 +93,12 @@ public:
             XrdSfsXferSize     size);
 
 private:
-   File(const char *user, int monid, std::auto_ptr<XrdSfsFile>, XrdThrottleManager &throttle, XrdSysError &eroute);
+   File(const char *user, int monid, unique_sfs_ptr, XrdThrottleManager &throttle, XrdSysError &eroute);
 
    virtual
    ~File();
 
-   std::auto_ptr<XrdSfsFile> m_sfs;
+   unique_sfs_ptr m_sfs;
    int m_uid; // A unique identifier for this user; has no meaning except for the fairshare.
    std::string m_loadshed;
    std::string m_user;

diff --git a/src/XrdThrottle/XrdThrottleFile.cc b/src/XrdThrottle/XrdThrottleFile.cc
@@ -23,10 +23,14 @@ XrdThrottleTimer xtimer = m_throttle.StartIOTimer();
 
 File::File(const char                     *user,
                  int                       monid,
-                 std::auto_ptr<XrdSfsFile> sfs,
+                 unique_sfs_ptr            sfs,
                  XrdThrottleManager       &throttle,
                  XrdSysError              &eroute)
-   : m_sfs(sfs), // Guaranteed to be non-null by FileSystem::newFile
+#if __cplusplus >= 201103L
+   : m_sfs(std::move(sfs)), // Guaranteed to be non-null by FileSystem::newFile
+#else
+   : m_sfs(sfs),
+#endif
      m_uid(0),
      m_user(user),
      m_throttle(throttle),

diff --git a/src/XrdThrottle/XrdThrottleFileSystem.cc b/src/XrdThrottle/XrdThrottleFileSystem.cc
@@ -23,9 +23,13 @@ FileSystem::newFile(char *user,
    XrdSfsFile * chain_file = m_sfs_ptr->newFile(user, monid);
    if (chain_file)
    {
-      std::auto_ptr<XrdSfsFile> chain_file_ptr(chain_file);
+      unique_sfs_ptr chain_file_ptr(chain_file);
       // We should really be giving out shared_ptrs to m_throttle, but alas, no boost.
+#if __cplusplus >= 201103L
+      return static_cast<XrdSfsFile*>(new File(user, monid, std::move(chain_file_ptr), m_throttle, m_eroute));
+#else
       return static_cast<XrdSfsFile*>(new File(user, monid, chain_file_ptr, m_throttle, m_eroute));
+#endif
    }
    return NULL;
 }