#
#
# patch "database.hh"
#  from [6c591fe758a0dcb3706813f9fa100fae9a37c6f6]
#    to [b863d340028d584f572ec1fb9a48ee5ebffefb59]
# 
# patch "work.hh"
#  from [aef7dfdf6b6cd9c99761561c3483e6182305f6ee]
#    to [8797491e6dd9884bbbb4a76dc00e87b5dfd9f7f9]
#
============================================================
--- database.hh	6c591fe758a0dcb3706813f9fa100fae9a37c6f6
+++ database.hh	b863d340028d584f572ec1fb9a48ee5ebffefb59
@@ -226,8 +226,8 @@ private:
   void get_roster_delta(std::string const & ident,
                         std::string const & base,
                         roster_delta & del);
-  friend class file_and_manifest_reconstruction_graph;
-  friend class roster_reconstruction_graph;
+  friend struct file_and_manifest_reconstruction_graph;
+  friend struct roster_reconstruction_graph;
   void get_version(hexenc<id> const & ident,
                    data & dat,
                    std::string const & data_table,
============================================================
--- work.hh	aef7dfdf6b6cd9c99761561c3483e6182305f6ee
+++ work.hh	8797491e6dd9884bbbb4a76dc00e87b5dfd9f7f9
@@ -64,7 +64,7 @@ class node_restriction;
 
 class path_restriction;
 class node_restriction;
-class content_merge_adaptor;
+struct content_merge_adaptor;
 class lua_hooks;
 
 struct workspace