From 0dfed0a096c4995b1c1a98ae86871fb7861bb161 Mon Sep 17 00:00:00 2001
From: gallaert <gaetan.allaert@belgacom.net>
Date: Sun, 19 Apr 2020 12:05:55 +0100
Subject: [PATCH] Replace boost::shared_ptr/weak_ptr by
 std::shared_ptr/weak_ptr

---
 src/GUI/FileDialog.cxx           | 6 +-----
 src/Scripting/ClipboardX11.cxx   | 2 ++
 src/Scripting/NasalClipboard.hxx | 4 ++--
 src/Scripting/NasalSGPath.cxx    | 6 +-----
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/GUI/FileDialog.cxx b/src/GUI/FileDialog.cxx
index 9604a98b5..12f36ac95 100644
--- a/src/GUI/FileDialog.cxx
+++ b/src/GUI/FileDialog.cxx
@@ -22,12 +22,8 @@
 #  include "config.h"
 #endif
 
-
 #include "FileDialog.hxx"
 
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-
 #include <simgear/nasal/cppbind/Ghost.hxx>
 
 #include <Main/globals.hxx>
@@ -137,7 +133,7 @@ void FGFileDialog::setCallbackFromNasal(const nasal::CallContext& ctx)
     setCallback(new NasalCallback(func, object));
 }
 
-typedef boost::shared_ptr<FGFileDialog> FileDialogPtr;
+typedef std::shared_ptr<FGFileDialog> FileDialogPtr;
 typedef nasal::Ghost<FileDialogPtr> NasalFileDialog;
 
 /**
diff --git a/src/Scripting/ClipboardX11.cxx b/src/Scripting/ClipboardX11.cxx
index c8747863b..645bd1657 100644
--- a/src/Scripting/ClipboardX11.cxx
+++ b/src/Scripting/ClipboardX11.cxx
@@ -31,6 +31,8 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
+#include <cassert>
+
 class ClipboardX11:
   public NasalClipboard
 {
diff --git a/src/Scripting/NasalClipboard.hxx b/src/Scripting/NasalClipboard.hxx
index 036132a05..45e43f09b 100644
--- a/src/Scripting/NasalClipboard.hxx
+++ b/src/Scripting/NasalClipboard.hxx
@@ -20,7 +20,7 @@
 #define NASAL_CLIPOARD_HXX_
 
 #include <simgear/nasal/nasal.h>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <string>
 
 class FGNasalSys;
@@ -39,7 +39,7 @@ class NasalClipboard
       PRIMARY
     };
 
-    typedef boost::shared_ptr<NasalClipboard> Ptr;
+    typedef std::shared_ptr<NasalClipboard> Ptr;
 
     virtual void update() {}
     virtual std::string getText(Type type = CLIPBOARD) = 0;
diff --git a/src/Scripting/NasalSGPath.cxx b/src/Scripting/NasalSGPath.cxx
index d3712609e..c7f8adad5 100644
--- a/src/Scripting/NasalSGPath.cxx
+++ b/src/Scripting/NasalSGPath.cxx
@@ -25,14 +25,10 @@
 #include <Main/util.hxx>
 #include <simgear/misc/sg_path.hxx>
 
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-
 #include <simgear/nasal/cppbind/NasalHash.hxx>
 #include <simgear/nasal/cppbind/Ghost.hxx>
 
-
-typedef boost::shared_ptr<SGPath> SGPathRef;
+typedef std::shared_ptr<SGPath> SGPathRef;
 typedef nasal::Ghost<SGPathRef> NasalSGPath;
 
 SGPath::Permissions checkIORules(const SGPath& path)