X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=src%2Fcpp-common%2Fbt2%2Fshared-object.hpp;h=8eb156523e993a16878b4586cb86085ee53d6be2;hb=c022776a5704be758b90a56563d491861d29fa49;hp=1ffbe8b1b9715008c71fb01c06d1af1faf90140a;hpb=7f5cdaf0da71769252d4ae548c25be5d1ffc49a1;p=babeltrace.git

diff --git a/src/cpp-common/bt2/shared-object.hpp b/src/cpp-common/bt2/shared-object.hpp
index 1ffbe8b1..8eb15652 100644
--- a/src/cpp-common/bt2/shared-object.hpp
+++ b/src/cpp-common/bt2/shared-object.hpp
@@ -8,7 +8,7 @@
 #define BABELTRACE_CPP_COMMON_BT2_SHARED_OBJECT_HPP
 
 #include "common/assert.h"
-#include "cpp-common/optional.hpp"
+#include "cpp-common/bt2s/optional.hpp"
 
 namespace bt2 {
 
@@ -252,7 +252,9 @@ public:
     ObjT release() noexcept
     {
         BT_ASSERT_DBG(_mObj);
+
         const auto obj = *_mObj;
+
         this->_reset();
         return obj;
     }
@@ -290,7 +292,7 @@ private:
         }
     }
 
-    nonstd::optional<ObjT> _mObj;
+    bt2s::optional<ObjT> _mObj;
 };
 
 } /* namespace bt2 */