Merge branch 'next'

1 files changed, 17 insertions, 1 deletions

diff --git a/src/expr.h b/src/expr.h
index b880fd79..83fe33dd 100644
--- a/src/expr.h
+++ b/src/expr.h
@@ -103,7 +103,7 @@ public:
   expr_t(const string& _str, const uint_least8_t flags = 0);
   expr_t(std::istream& in, const uint_least8_t flags = 0);
 
-  virtual ~expr_t() throw();
+  ~expr_t() throw();
 
   expr_t& operator=(const expr_t& _expr);
   expr_t& operator=(const string& _expr) {
@@ -163,6 +163,22 @@ public:
   void dump(std::ostream& out) const;
 
   static value_t eval(const string& _expr, scope_t& scope);
+
+#if defined(HAVE_BOOST_SERIALIZATION)
+private:
+  /** Serialization. */
+
+  friend class boost::serialization::access;
+
+  template<class Archive>
+  void serialize(Archive & ar, const unsigned int /* version */) {
+    ar & ptr;
+    ar & context;
+    ar & str;
+    if (Archive::is_loading::value)
+      compiled = false;
+  }
+#endif // HAVE_BOOST_SERIALIZATION
 };
 
 std::ostream& operator<<(std::ostream& out, const expr_t& expr);