Replace some use of Boost smart pointers by std equivalents

rug-compling · May 4, 2020 · 3a0cbbc · 3a0cbbc
1 parent 7f32f9c
commit 3a0cbbc
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 26 deletions.
diff --git a/util/common/EqualsPrevious.hh b/util/common/EqualsPrevious.hh
@@ -2,6 +2,7 @@
 #define ALPINOCORPUS_EQUALSPREVIOUS_HH
 
 #include <functional>
+#include <memory>
 
 #include <boost/shared_ptr.hpp>
 
@@ -23,7 +24,7 @@ public:
   }
 
   // operator() is often expected to be const.
-  mutable boost::shared_ptr<T> d_previous;
+  mutable std::unique_ptr<T> d_previous;
 };
 
 template <typename T>

diff --git a/util/create/main.cpp b/util/create/main.cpp
@@ -6,7 +6,6 @@
 #include <string>
 #include <unordered_set>
 
-#include <boost/scoped_ptr.hpp>
 #include <boost/filesystem.hpp>
 
 #include <AlpinoCorpus/CorpusReader.hh>
@@ -28,7 +27,6 @@
 #include <iostream>
 #include <stdexcept>
 
-#include <EqualsPrevious.hh>
 #include <ProgramOptions.hh>
 #include <util.hh>
 
@@ -89,7 +87,7 @@ void writeCorpus(std::shared_ptr<CorpusReader> reader,
 
 int main(int argc, char *argv[])
 {
-  boost::scoped_ptr<ProgramOptions> opts;
+  std::unique_ptr<ProgramOptions> opts;
   try {
     opts.reset(new ProgramOptions(argc, const_cast<char const **>(argv),
       "c:d:m:nq:r"));

diff --git a/util/extract/main.cpp b/util/extract/main.cpp
@@ -8,7 +8,6 @@
 #include <string>
 
 #include <boost/filesystem/path.hpp>
-#include <boost/scoped_ptr.hpp>
 
 #include <AlpinoCorpus/CorpusReader.hh>
 #include <AlpinoCorpus/macros.hh>
@@ -26,7 +25,7 @@ void usage(std::string const &programName) {
 }
 
 int main(int argc, char *argv[]) {
-    boost::scoped_ptr<ProgramOptions> opts;
+    std::unique_ptr<ProgramOptions> opts;
     try {
         opts.reset(new ProgramOptions(argc, const_cast<char const **>(argv),
                 "q"));

diff --git a/util/get/main.cpp b/util/get/main.cpp
@@ -7,8 +7,6 @@
 #include <stdexcept>
 #include <string>
 
-#include <boost/scoped_ptr.hpp>
-
 #include <AlpinoCorpus/CorpusReader.hh>
 #include <AlpinoCorpus/macros.hh>
 
@@ -29,7 +27,7 @@ void usage(std::string const &programName) {
 }
 
 int main(int argc, char *argv[]) {
-    boost::scoped_ptr<ProgramOptions> opts;
+    std::unique_ptr<ProgramOptions> opts;
     try {
         opts.reset(new ProgramOptions(argc, const_cast<char const **>(argv),
                 "a:m:q:v:"));

diff --git a/util/stats/main.cpp b/util/stats/main.cpp
@@ -6,8 +6,6 @@
 #include <string>
 #include <unordered_map>
 
-#include <boost/scoped_ptr.hpp>
-
 #include <AlpinoCorpus/CorpusReader.hh>
 #include <AlpinoCorpus/macros.hh>
 
@@ -64,7 +62,7 @@ void usage(std::string const &programName)
 
 int main(int argc, char *argv[])
 {
-    boost::scoped_ptr<ProgramOptions> opts;
+    std::unique_ptr<ProgramOptions> opts;
     try {
         opts.reset(new ProgramOptions(argc, const_cast<char const **>(argv),
             "m:p"));

diff --git a/util/xpath/main.cpp b/util/xpath/main.cpp
@@ -7,7 +7,6 @@
 #include <string>
 #include <unordered_set>
 
-#include <boost/scoped_ptr.hpp>
 #include <boost/filesystem.hpp>
 
 #include <AlpinoCorpus/CorpusInfo.hh>
@@ -138,11 +137,6 @@ void listCorpus(std::shared_ptr<CorpusReader> reader,
   }
 }
 
-void readEntry(boost::shared_ptr<CorpusReader> reader, std::string const &entry)
-{
-  std::cout << reader->read(entry);
-}
-
 void usage(std::string const &programName)
 {
     std::cerr << "Usage: " << programName << " [OPTION] treebank(s)" <<
@@ -156,7 +150,7 @@ void usage(std::string const &programName)
 
 int main(int argc, char *argv[])
 {
-  boost::scoped_ptr<ProgramOptions> opts;
+  std::unique_ptr<ProgramOptions> opts;
   try {
     opts.reset(new ProgramOptions(argc, const_cast<char const **>(argv),
       "a:cm:q:s"));

diff --git a/util/xquery/main.cpp b/util/xquery/main.cpp
@@ -2,8 +2,6 @@
 #include <memory>
 #include <string>
 
-#include <boost/scoped_ptr.hpp>
-
 #include <AlpinoCorpus/CorpusReader.hh>
 #include <AlpinoCorpus/Entry.hh>
 #include <AlpinoCorpus/Error.hh>
@@ -51,7 +49,7 @@ void usage(std::string const &programName)
 
 int main(int argc, char *argv[])
 {
-  boost::scoped_ptr<ProgramOptions> opts;
+  std::unique_ptr<ProgramOptions> opts;
   try {
     opts.reset(new ProgramOptions(argc, const_cast<char const **>(argv),
       "f:m:q:"));

diff --git a/util/xslt/main.cpp b/util/xslt/main.cpp
@@ -4,8 +4,6 @@
 #include <string>
 #include <unordered_set>
 
-#include <boost/scoped_ptr.hpp>
-
 extern "C" {
 #include <libxslt/xslt.h>
 #include <libxml/parser.h>
@@ -20,7 +18,6 @@ extern "C" {
 
 #include "../src/util/textfile.hh" // XXX - hmpf
 
-#include <EqualsPrevious.hh>
 #include <ProgramOptions.hh>
 #include <Stylesheet.hh>
 #include <util.hh>
@@ -95,7 +92,7 @@ int main (int argc, char *argv[])
     // XPath
     xmlXPathInit();
 
-  boost::scoped_ptr<ProgramOptions> opts;
+  std::unique_ptr<ProgramOptions> opts;
   try {
     opts.reset(new ProgramOptions(argc, const_cast<char const **>(argv),
       "g:m:q:"));