Merge remote-tracking branch 'remotes/origin/master' into nightly-1.29

1 files changed, 7 insertions, 3 deletions

diff --git a/src/include/span.hpp b/src/include/span.hpp
index 51c3440c..970a2ad0 100644
--- a/src/include/span.hpp
+++ b/src/include/span.hpp
@@ -29,9 +29,9 @@ struct ProtoSpan
     unsigned int start_line;
     unsigned int start_ofs;
 };
-class Span
+struct Span
 {
-public:
+//public:
     ::std::shared_ptr<Span> outer_span; // Expansion target for macros
     RcString    filename;
 
@@ -47,10 +47,14 @@ public:
         end_line(end_line),
         end_ofs(end_ofs)
     {}
-    Span(const Span& x);
+    Span(const Span& x) = default;
+    Span(Span&& x) = default;
     Span(const Position& position);
     Span();
 
+    Span& operator=(const Span& x) = default;
+    Span& operator=(Span&& x) = default;
+
     void bug(::std::function<void(::std::ostream&)> msg) const;
     void error(ErrorType tag, ::std::function<void(::std::ostream&)> msg) const;
     void warning(WarningType tag, ::std::function<void(::std::ostream&)> msg) const;