# 
# 
# patch "ChangeLog"
#  from [7d1211b293f94886ad3e3a3c732980ad4cc94807]
#    to [5c828c0890ee2e03420b61ad55c077eee4941955]
# 
# patch "cmd.hh"
#  from [b603bd9f4ad5e79d24d128694352376d0d5719a6]
#    to [142898bfbb49704a60be81e5e01ddef553d32ea6]
# 
# patch "cmd_automate.cc"
#  from [eaa1ad0948253c507dfafc1521b8885260ba2db6]
#    to [5b90227ffcfe111cead5ab503b2df2ed81899835]
# 
# patch "commands.cc"
#  from [a46a10ed30eab12e318db1db9b48d100f1009ce1]
#    to [67676365ab02c505dbf5467645943b2a84f1d8b2]
# 
============================================================
--- ChangeLog	7d1211b293f94886ad3e3a3c732980ad4cc94807
+++ ChangeLog	5c828c0890ee2e03420b61ad55c077eee4941955
@@ -1,3 +1,9 @@
+2006-11-17  Thomas Keller  <address@hidden>
+
+	* cmd_automate.cc, cmd.hh, ...: renamed member variable 
+	"options" to "opts" to make (hopefully) the gcc-3.3 build
+	slaves happy
+
 2006-11-15  Richard Levitte  <address@hidden>
 
 	* lua.cc (LUAEXT): Implement includedirpattern(), which is like
============================================================
--- cmd.hh	b603bd9f4ad5e79d24d128694352376d0d5719a6
+++ cmd.hh	142898bfbb49704a60be81e5e01ddef553d32ea6
@@ -35,7 +35,7 @@ namespace commands
     std::string params_;
     std::string desc_;
     bool use_workspace_options;
-    options::options_type options;
+    options::options_type opts;
     command(std::string const & n,
             std::string const & g,
             std::string const & p,
@@ -180,7 +180,7 @@ namespace commands {                    
     cmd_ ## C() : command(#C, realcommand##_cmd.cmdgroup,            \
                           realcommand##_cmd.params_,                 \
                           realcommand##_cmd.desc_, true,             \
-                          realcommand##_cmd.options)                 \
+                          realcommand##_cmd.opts)                 \
     {}                                                               \
     virtual std::string desc();                                      \
     virtual void exec(app_state & app,                               \
@@ -206,7 +206,7 @@ namespace automation {
   {
     std::string name;
     std::string params;
-    options::options_type options;
+    options::options_type opts;
     automate(std::string const & n, std::string const & p,
              options::options_type const & o);
     virtual void run(std::vector<utf8> args,
============================================================
--- cmd_automate.cc	eaa1ad0948253c507dfafc1521b8885260ba2db6
+++ cmd_automate.cc	5b90227ffcfe111cead5ab503b2df2ed81899835
@@ -28,7 +28,7 @@ namespace automation {
   static map<string, automate * const> * automations;
   automate::automate(string const &n, string const &p,
                      options::options_type const & o)
-    : name(n), params(p), options(o)
+    : name(n), params(p), opts(o)
   {
     static bool first(true);
     if (first)
@@ -350,7 +350,7 @@ AUTOMATE(stdio, "", options::opts::autom
       try
         {
           options::options_type opts = options::opts::globals();
-          opts = opts | find_automation(cmd, help_name).options;
+          opts = opts | find_automation(cmd, help_name).opts;
           opts.instantiate(&app.opts).from_key_value_pairs(params);
           automate_command(cmd, args, help_name, app, os);
         }
@@ -402,7 +402,7 @@ commands::cmd_automate::get_options(vect
 {
   if (args.size() < 2)
     return options::options_type();
-  return find_automation(idx(args,1), idx(args,0)()).options;
+  return find_automation(idx(args,1), idx(args,0)()).opts;
 }
 
 
============================================================
--- commands.cc	a46a10ed30eab12e318db1db9b48d100f1009ce1
+++ commands.cc	67676365ab02c505dbf5467645943b2a84f1d8b2
@@ -68,7 +68,7 @@ namespace commands
                    bool u,
                    options::options_type const & o)
     : name(n), cmdgroup(g), params_(p), desc_(d), use_workspace_options(u),
-      options(o)
+      opts(o)
   {
     if (cmds == NULL)
       cmds = new map<string, command *>;
@@ -79,7 +79,7 @@ namespace commands
   std::string command::desc() {return safe_gettext(desc_.c_str());}
   options::options_type command::get_options(vector<utf8> const & args)
   {
-    return options;
+    return opts;
   }
   bool operator<(command const & self, command const & other);
   std::string const & hidden_group()
@@ -262,7 +262,7 @@ namespace commands
   {
     if ((*cmds).find(cmd) != (*cmds).end())
       {
-        return (*cmds)[cmd]->options;
+        return (*cmds)[cmd]->opts;
       }
     else
       {