Use nullopt to reset optional

5 files changed, 9 insertions, 8 deletions

diff --git a/bpkg/pkg-disfigure.cxx b/bpkg/pkg-disfigure.cxx
index d9ed811..48e54ba 100644
--- a/bpkg/pkg-disfigure.cxx
+++ b/bpkg/pkg-disfigure.cxx
@@ -82,7 +82,7 @@ namespace bpkg
       throw;
     }
 
-    p->out_root = optional<dir_path> ();
+    p->out_root = nullopt;
     p->state = state::unpacked;
 
     db.update (p);
diff --git a/bpkg/pkg-fetch.cxx b/bpkg/pkg-fetch.cxx
index 1e7072c..a5d216b 100644
--- a/bpkg/pkg-fetch.cxx
+++ b/bpkg/pkg-fetch.cxx
@@ -109,9 +109,9 @@ namespace bpkg
         state::fetched,
         move (a),
         purge,
-        optional<dir_path> (), // No source directory yet.
+        nullopt, // No source directory yet.
         false,
-        optional<dir_path> ()  // No output directory yet.
+        nullopt  // No output directory yet.
      });
 
     db.persist (p);
diff --git a/bpkg/pkg-purge.cxx b/bpkg/pkg-purge.cxx
index 57e098d..7663dea 100644
--- a/bpkg/pkg-purge.cxx
+++ b/bpkg/pkg-purge.cxx
@@ -89,7 +89,7 @@ namespace bpkg
           if (exists (d)) // Don't complain if someone did our job for us.
             rm_r (d);
 
-          p->src_root = optional<dir_path> ();
+          p->src_root = nullopt;
           p->purge_src = false;
         }
         catch (const failed&)
@@ -140,7 +140,7 @@ namespace bpkg
           if (exists (a))
             rm (a);
 
-          p->archive = optional<path> ();
+          p->archive = nullopt;
           p->purge_archive = false;
         }
         catch (const failed&)
diff --git a/bpkg/pkg-unpack.cxx b/bpkg/pkg-unpack.cxx
index f78543e..6979842 100644
--- a/bpkg/pkg-unpack.cxx
+++ b/bpkg/pkg-unpack.cxx
@@ -65,11 +65,11 @@ namespace bpkg
         move (m.name),
         move (m.version),
         state::unpacked,
-        optional<path> (),    // No archive
-        false,                // Don't purge archive.
+        nullopt,    // No archive
+        false,      // Don't purge archive.
         move (ad),
         purge,
-        optional<dir_path> () // No output directory yet.
+        nullopt     // No output directory yet.
      });
 
     db.persist (p);
diff --git a/bpkg/types b/bpkg/types
index a5fe114..648c0f1 100644
--- a/bpkg/types
+++ b/bpkg/types
@@ -25,6 +25,7 @@ namespace bpkg
   using std::shared_ptr;
 
   using butl::optional;
+  using butl::nullopt;
 
   // <butl/path>
   //