#
# old_revision [09655aae0a7b9ab2a30f5a9ed36cc8719838d5a1]
#
# patch "commands.cc"
# from [b8565eb8a7d0acb72a64ba561e959df66469120d]
# to [c52969b97cc392cda4271092c6a72ae08dae4942]
#
# patch "simplestring_xform.hh"
# from [79e8cd9358a80d05db87ffd1759ac705ea942d3e]
# to [9c1ad0f329dcb7b2a595ac63fdf5cc47ab20043c]
#
# patch "txt2c.cc"
# from [b53f05ddac34b55e53343efc612c572d9e861b37]
# to [4bfb199702931f2c6e4729b4b4d6e90af48b66ee]
#
# patch "visualc/monotone.vcproj"
# from [8f39ccb9e213d022e4807149d7b834aae4ead4c0]
# to [14a2215a6cdba56f9af9a2d679fdc450e84cf63e]
#
# patch "visualc/tester.vcproj"
# from [63ef1a3ac1a34f71c5def17e03b3a38d0ca9acad]
# to [ef7eb6c66a7426ad7ce5ae3b56f12c95248d297b]
#
============================================================
--- commands.cc b8565eb8a7d0acb72a64ba561e959df66469120d
+++ commands.cc c52969b97cc392cda4271092c6a72ae08dae4942
@@ -318,7 +318,7 @@ namespace commands {
I(!prefix().empty());
- for (children_set::iterator iter = children().begin();
+ for (children_set::const_iterator iter = children().begin();
iter != children().end(); iter++)
{
command * child = *iter;
@@ -623,7 +623,7 @@ namespace commands
command::names_set othernames = cmd->names();
othernames.erase(ident[ident.size() - 1]);
out << format_text(F("Aliases: %s.") %
- join_words(othernames, ", ")(), 2)
+ join_words(othernames, ", "), 2)
<< '\n';
}
}
============================================================
--- simplestring_xform.hh 79e8cd9358a80d05db87ffd1759ac705ea942d3e
+++ simplestring_xform.hh 9c1ad0f329dcb7b2a595ac63fdf5cc47ab20043c
@@ -44,11 +44,11 @@ std::vector< T > split_into_words(T cons
return out;
}
-template< template< typename > class T1, class T2 >
-T2 join_words(T1< T2 > const & in, std::string const & sep = " ")
+template< class T1, class T2 >
+T1 join_words_common(T2 const & in, std::string const & sep)
{
std::string str;
- typename T1< T2 >::const_iterator iter = in.begin();
+ typename T2::const_iterator iter = in.begin();
while (iter != in.end())
{
str += (*iter)();
@@ -56,9 +56,28 @@ T2 join_words(T1< T2 > const & in, std::
if (iter != in.end())
str += sep;
}
- return T2(str);
+ return T1(str);
}
+
+template< template< typename > class T1, class T2>
+T2 join_words(T1< T2 > const & in, std::string const & sep = " ")
+{
+ return join_words_common< T2 >(in,sep);
+}
+
+template< template< typename , typename > class T1, class T2 , class T3>
+T2 join_words(T1< T2 , T3 > const & in, std::string const & sep = " ")
+{
+ return join_words_common< T2 >(in,sep);
+}
+
+template< template< typename , typename , typename > class T1, class T2 , class T3, class T4>
+T2 join_words(T1< T2 , T3 , T4 > const & in, std::string const & sep = " ")
+{
+ return join_words_common< T2 >(in,sep);
+}
+
void prefix_lines_with(std::string const & prefix,
std::string const & lines,
std::string & out);
============================================================
--- txt2c.cc b53f05ddac34b55e53343efc612c572d9e861b37
+++ txt2c.cc 4bfb199702931f2c6e4729b4b4d6e90af48b66ee
@@ -29,7 +29,7 @@ int main(int argc, char **argv)
}
if (string(argv[i]) == "--no-static")
{
- static_decl = "";
+ static_decl = "extern ";
i++;
}
char const * fname = argv[i++];
============================================================
--- visualc/monotone.vcproj 8f39ccb9e213d022e4807149d7b834aae4ead4c0
+++ visualc/monotone.vcproj 14a2215a6cdba56f9af9a2d679fdc450e84cf63e
@@ -69,7 +69,7 @@
AdditionalDependencies="botan.lib sqlite3.lib netxx.lib stringprep.lib lua.lib libiconv.lib libcharset.lib ws2_32.lib shell32.lib advapi32.lib zlib.lib"
OutputFile="$(outdir)\mtn.exe"
LinkIncremental="2"
- AdditionalLibraryDirectories=""$(ProjectDir)\..";"$(ProjectDir)\Debug""
+ AdditionalLibraryDirectories=""$(OutDir)""
GenerateDebugInformation="true"
ProgramDatabaseFile="$(outdir)/visualc.pdb"
SubSystem="1"
@@ -160,7 +160,7 @@
AdditionalDependencies="botan.lib sqlite3.lib netxx.lib stringprep.lib lua.lib libiconv.lib libcharset.lib ws2_32.lib shell32.lib advapi32.lib zlib.lib"
OutputFile="$(outdir)/mtn.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(ProjectDir)\..";"$(ProjectDir)\Release""
+ AdditionalLibraryDirectories=""$(OutDir)""
GenerateDebugInformation="true"
GenerateMapFile="false"
SubSystem="1"
@@ -591,6 +591,26 @@
>
+
+
+
+
+
+
+
+
@@ -615,6 +635,26 @@
>
+
+
+
+
+
+
+
+
@@ -623,6 +663,26 @@
>
+
+
+
+
+
+
+
+
@@ -639,6 +699,26 @@
>
+
+
+
+
+
+
+
+
@@ -1073,10 +1153,10 @@
>
+
+
@@ -1123,10 +1209,10 @@
>
@@ -1149,8 +1236,8 @@
@@ -1159,7 +1246,8 @@
>
@@ -1173,10 +1261,10 @@
>
============================================================
--- visualc/tester.vcproj 63ef1a3ac1a34f71c5def17e03b3a38d0ca9acad
+++ visualc/tester.vcproj ef7eb6c66a7426ad7ce5ae3b56f12c95248d297b
@@ -63,7 +63,7 @@
Name="VCLinkerTool"
AdditionalDependencies="botan.lib lua.lib stringprep.lib libiconv.lib"
LinkIncremental="2"
- AdditionalLibraryDirectories=""$(ProjectDir)\Debug""
+ AdditionalLibraryDirectories=""$(OutDir)""
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
@@ -147,7 +147,7 @@
AdditionalOptions="/NODEFAULTLIB:LIBCMTD.lib"
AdditionalDependencies="botan.lib lua.lib stringprep.lib libiconv.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(ProjectDir)\Release""
+ AdditionalLibraryDirectories=""$(OutDir)""
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
@@ -261,6 +261,26 @@
>
+
+
+
+
+
+
+
+
@@ -350,17 +370,28 @@
>
+
+
+