Upgrade Slice library to use shared_ptr (#1674)

zeroc-ice · Jan 17, 2024 · cfc8e6c · cfc8e6c
1 parent e8f89de
commit cfc8e6c
Show file tree

Hide file tree

Showing 38 changed files with 2,724 additions and 2,781 deletions.
diff --git a/cpp/src/Slice/FileTracker.cpp b/cpp/src/Slice/FileTracker.cpp
@@ -65,7 +65,7 @@ Slice::FileTracker::instance()
 {
     if(!Instance)
     {
-        Instance = new FileTracker();
+        Instance = make_shared<FileTracker>();
     }
     return Instance;
 }

diff --git a/cpp/src/Slice/FileTracker.h b/cpp/src/Slice/FileTracker.h
@@ -6,6 +6,7 @@
 #define FILE_TRACKER_H
 
 #include <IceUtil/Shared.h>
+#include <IceUtil/Handle.h>
 #include <Slice/Parser.h>
 
 namespace Slice
@@ -32,9 +33,8 @@ class FileException : public ::IceUtil::Exception
 };
 
 class FileTracker;
-typedef IceUtil::Handle<FileTracker> FileTrackerPtr;
-
-class FileTracker : public ::IceUtil::SimpleShared
+using FileTrackerPtr = std::shared_ptr<FileTracker>;
+class FileTracker
 {
 public: