[Monotone-commits-diffs] Revision 201865bdf90c29bd7320f4b177aedf69e18a0b6c

[monotone]

-----------------------------------------------------------------
Revision: 201865bdf90c29bd7320f4b177aedf69e18a0b6c
Ancestor: 7ac4fa1ee120a3a46bfa10fb791fdd75f015ea35
Author: address@hidden
Date: 2009-04-17T20:34:27
Branch: net.venge.monotone

Modified files:
        automate.cc database.cc key_store.cc merge_conflict.cc
        merge_content.cc txt2c.cc unit-tests/roster.cc
        unit_tester.cc

ChangeLog: 

Various changes to make monotone compile on (Open)Solaris with Sun Studio.
See http://article.gmane.org/gmane.comp.version-control.monotone.devel/16216
for some hints on why some of these are necessary.

* automate.cc, database.cc, txt2c.cc, unit-tests/roster.cc:
  Add using std::* as necessary.
* database.cc, key_store.cc: Add using Botan::* as necessary.
* database.cc, unit_tester.cc: Explicitely type 0 as unsigned int when
  stlport4 has an alternative void* variant and Sun Studio can't decide
  which one to use.
* merge_conflicts.cc, merge_content.cc: Use const arguments for methods if
  the prototype declares them const.

txtGkNJXMkiT6.txt
Description: Diff [7ac4fa1ee120a3a46bfa10fb791fdd75f015ea35] -> [201865bdf90c29bd7320f4b177aedf69e18a0b6c]