[Monotone-devel] Yet another gcc 3.3 compile error fix

[Tero Koskinen]

Hi,

Again, the latest head of net.venge.monotone
(r869baba046ea547aadee135aec6938e2f79d3c50) doesn't compile with
gcc 3.3, so here is a patch.

Now and then someone talks about dropping gcc 3.3 support completely, so
I am wondering is it worth for me to provide these little patches in the
future? If yes, should I ask for commit access and fix things directly
to the repository?

Personally, I use OpenBSD as my main OS and OpenBSD most likely won't
upgrade its base system compiler any time soon, so I need to be able
to compile monotone with gcc 3.3. 

...Alternatively I could manually compile both boost and monotone
from the ports system with gcc 4.x, but it opens a can of worms
since many other ports (like OpenOffice.org) use gcc 3.3 compiled
boost libraries.

Few IRC discussion references:
http://colabti.de/irclogger/irclogger_log/monotone?date=2007-04-23,Mon#l68
http://colabti.de/irclogger/irclogger_log/monotone?date=2007-04-28,Sat#l28

Here is the patch:
#
# old_revision [869baba046ea547aadee135aec6938e2f79d3c50]
#
# patch "commands.cc"
#  from [37c663818da4333a6748e5c7244d97b9625fd0be]
#    to [09c0a2860ca0dcf1219b0df0e181c157ec6038af]
#
============================================================
--- commands.cc 37c663818da4333a6748e5c7244d97b9625fd0be
+++ commands.cc 09c0a2860ca0dcf1219b0df0e181c157ec6038af
@@ -333,7 +333,8 @@ namespace commands {
             else if (!child->hidden() &&
                      prefix().length() < (*iter2)().length())
               {
-                utf8 p(string((*iter2)(), 0, prefix().length()));
+                string temp((*iter2)(), 0, prefix().length());
+                utf8 p(temp);
                 if (prefix == p)
                   matches[caux] = child;
               }



-- 
Tero Koskinen - http://iki.fi/tero.koskinen/