# 
# 
# patch "ChangeLog"
#  from [bcab3efd1a17c25cdc1ffc19109b943e88e88e0f]
#    to [dce809f42a672e314e266308bf3dde7f87be8375]
# 
# patch "cmd_automate.cc"
#  from [2a30a70b095966dcbef804dcc8b1fb3524756f4f]
#    to [3e1f8c7fdf8e7e801b7c35ddcddd37beac617078]
# 
# patch "option.cc"
#  from [5f0054153bf1a32737a543bd8498acbf50390be3]
#    to [b77298978426c2389438f4bd7bff57cbfbaeb0fd]
# 
# patch "options_list.hh"
#  from [861b5fc7a146a5618c60b5bbbb588e22517d6e73]
#    to [a90c27aef22f12f95e4d8efbebc3f670fb6e3397]
# 
============================================================
--- ChangeLog	bcab3efd1a17c25cdc1ffc19109b943e88e88e0f
+++ ChangeLog	dce809f42a672e314e266308bf3dde7f87be8375
@@ -1,3 +1,7 @@
+2006-11-02  Patrick Mauritz  <address@hidden>
+
+	*  cmd_automate.cc, option.cc, options_list.hh: fixes for sun studio
+
 2006-11-01  Richard Levitte  <address@hidden>
 
 	* po/sv.po: A fuzzy to fix.
============================================================
--- cmd_automate.cc	2a30a70b095966dcbef804dcc8b1fb3524756f4f
+++ cmd_automate.cc	3e1f8c7fdf8e7e801b7c35ddcddd37beac617078
@@ -283,6 +283,7 @@ struct automate_ostream : public std::os
   
   automate_ostream(std::ostream &out, size_t blocksize)
     : _M_autobuf(out, blocksize)
+    , std::ostream(NULL)
   { this->init(&_M_autobuf); }
   
   ~automate_ostream()
============================================================
--- option.cc	5f0054153bf1a32737a543bd8498acbf50390be3
+++ option.cc	b77298978426c2389438f4bd7bff57cbfbaeb0fd
@@ -249,7 +249,7 @@ getopt(map<string, concrete_option> cons
   if (i != by_name.end())
     return i->second;
   else
-    throw option::unknown_option(name);
+    throw unknown_option(name);
 }
 
 void concrete_option_set::from_command_line(std::vector<std::string> & args,
@@ -397,7 +397,7 @@ static vector<string> wordwrap(string st
 
 // Get the non-description part of the usage string,
 // looks like "--long [ -s ] <arg>".
-static string usagestr(option::concrete_option const & opt)
+static string usagestr(concrete_option const & opt)
 {
   string out;
   if (opt.longname == "--")
============================================================
--- options_list.hh	861b5fc7a146a5618c60b5bbbb588e22517d6e73
+++ options_list.hh	a90c27aef22f12f95e4d8efbebc3f670fb6e3397
@@ -1,10 +1,10 @@
 #define OPT(name, string, type, default_, description)			\
   OPTVAR(name, type, name, default_)					\
-  OPTION(name, name, has_arg<type>(), string, description)
+  OPTION(name, name, has_arg<type >(), string, description)
 
 #define GOPT(name, string, type, default_, description)			\
   OPTVAR(globals, type, name, default_)					\
-  OPTION(globals, name, has_arg<type>(), string, description)
+  OPTION(globals, name, has_arg<type >(), string, description)
 
 OPTSET(globals)