# # # patch "app_state.cc" # from [85f0c6a076033bbd3c12037bf78535b2fbc65ef3] # to [6da7b0dd5d17b5eca5a7ec2d27205a3d9b602045] # # patch "automate.cc" # from [7a7bc1ea0a4d2786823bbda4b90f216cbe738602] # to [0bebfcd96c0b983e0e9bf655a7eb0649f6a503e8] # # patch "diff_patch.cc" # from [c538374230aa5c4eb9c455418cfa55e443af7244] # to [c7b6c61eaf5327babcf5d6d806727005e639fc3e] # # patch "file_io.cc" # from [7fc3a9cac7cb770a2a4fa826d3a23797cda1242e] # to [de853ef2271725cd31bd915e07fc9557d3f7564c] # # patch "keys.hh" # from [0d9dd1748b92aac5bc2298f0f798fb4fec868ec4] # to [8ef7487642f3f7cc3e9bfa80ce88770467edac3d] # # patch "legacy.hh" # from [8245f22d6f31a2e1b5f590a34620c3913d875453] # to [4759323523ca05da97a2d525c629b3b0e446a674] # # patch "lua_hooks.hh" # from [47ca4cb38e28c8c060be2fd96d7fbeb59a5ef165] # to [4808b67b1e1cf6250e423ffd16d2153cba51ca78] # # patch "netsync.cc" # from [a5ab2de52961f815123bd9df387f96e883f75571] # to [f4a72eaef9b394609b40c82d94f0295e02d7aac6] # # patch "paths.cc" # from [5680d2c2726d5894fe21cc4c7dd9f149ba1efb32] # to [f48e08a5f1b6df1f4bac400fed493bde312c0d62] # # patch "rcs_import.cc" # from [36d442b3ce162881956dffeb17d9ff88d70ea794] # to [18551740fdafb84f5f2bd78896725da0c19bd67e] # # patch "transforms.cc" # from [079c3479e99dda5711ca148a67c93f756641b0d1] # to [e117cdc138e0e0c293b4eaf5333a8860ee4932c8] # # patch "update.cc" # from [72640e049731be496bd0791f60eb04e3dd220fc2] # to [2e6155771b60acaa2b08ec72951cad1ee55d68f8] # # patch "visualc/cryptopp.vcproj" # from [60282847f7cd1c9574c0c1b90a5d39ab9cacfd50] # to [7a132b49577e93f1d515dbe1c891bfdb3a45797c] # # patch "visualc/lua.vcproj" # from [80cf26112ebad55f5e19ae77aa0c554931258d19] # to [522ef32cdfc95ac46716957dfb40eae92f21dc92] # # patch "visualc/monotone.vcproj" # from [e52b7ab761938efb46bf8692f961b2a7a7314158] # to [383ea893a09dda04c7779e285d92d9012d084116] # # patch "visualc/netxx.vcproj" # from [f9ff174725df6d4e446ed387ace6829831cdc3d1] # to [d694d8c7e66473c56be2a03d64471635fafb68cc] # # patch "visualc/popt.vcproj" # from [24f60674ea05f1e23837af6415d7d800b67973b3] # to [a3c52ab65e31e7b191f5361d5940290c51af9858] # # patch "visualc/sqlite3.vcproj" # from [66e19e52bb4b61ab5df46b327e043413e57503e7] # to [972fcccadc56f8b6b9cc9fc84f67efb8c14e464f] # # patch "visualc/stringprep.vcproj" # from [8a8b24123026364d51b67fae3dc7d1b1d8a573b3] # to [e15a222ec5641953b1ec2730bf829d90bb141dc2] # # patch "visualc/txt2c.vcproj" # from [6128ea545bd948b35605ebce08b57423d49a58be] # to [dfb288751acab18d96cfd409b6024ff846e8cf93] # # patch "work.cc" # from [0d47dba0c23494d21067c094cca9cba8acd71f3b] # to [adb912ec2cfa818b144031343e46c7109b7f0cc4] # ============================================================ --- app_state.cc 85f0c6a076033bbd3c12037bf78535b2fbc65ef3 +++ app_state.cc 6da7b0dd5d17b5eca5a7ec2d27205a3d9b602045 @@ -415,7 +415,7 @@ read_options_map(dat, options); } } - catch(std::exception & e) + catch(std::exception &) { W(F("Failed to read options file %s") % o_path); } @@ -432,7 +432,7 @@ write_options_map(dat, options); write_data(o_path, dat); } - catch(std::exception & e) + catch(std::exception &) { W(F("Failed to write options file %s") % o_path); } ============================================================ --- automate.cc 7a7bc1ea0a4d2786823bbda4b90f216cbe738602 +++ automate.cc 0bebfcd96c0b983e0e9bf655a7eb0649f6a503e8 @@ -1502,7 +1502,7 @@ err=0; automate_command(cmd, args, help_name, app, s); } - catch(usage & u) + catch(usage &) { if(sb.str().size()) s.flush(); ============================================================ --- diff_patch.cc c538374230aa5c4eb9c455418cfa55e443af7244 +++ diff_patch.cc c7b6c61eaf5327babcf5d6d806727005e639fc3e @@ -458,7 +458,7 @@ { merge_via_edit_scripts(ancestor, left, right, merged); } - catch(conflict & c) + catch(conflict &) { L(FL("conflict detected. no merge.\n")); return false; ============================================================ --- file_io.cc 7fc3a9cac7cb770a2a4fa826d3a23797cda1242e +++ file_io.cc de853ef2271725cd31bd915e07fc9557d3f7564c @@ -18,6 +18,7 @@ #include "simplestring_xform.hh" #include "charset.hh" #include "platform.hh" +#include "numeric_vocab.hh" // this file deals with talking to the filesystem, loading and // saving files. ============================================================ --- keys.hh 0d9dd1748b92aac5bc2298f0f798fb4fec868ec4 +++ keys.hh 8ef7487642f3f7cc3e9bfa80ce88770467edac3d @@ -9,8 +9,8 @@ #include "vocab.hh" #include -struct lua_hooks; -struct app_state; +class lua_hooks; +class app_state; // keys.{hh,cc} does all the "delicate" crypto (meaning: that which needs // to read passphrases and manipulate raw, decrypted private keys). it ============================================================ --- legacy.hh 8245f22d6f31a2e1b5f590a34620c3913d875453 +++ legacy.hh 4759323523ca05da97a2d525c629b3b0e446a674 @@ -13,7 +13,7 @@ #include "paths.hh" -struct app_state; +class app_state; namespace legacy { ============================================================ --- lua_hooks.hh 47ca4cb38e28c8c060be2fd96d7fbeb59a5ef165 +++ lua_hooks.hh 4808b67b1e1cf6250e423ffd16d2153cba51ca78 @@ -17,7 +17,7 @@ #include "paths.hh" struct uri; -struct app_state; +class app_state; struct lua_State; class lua_hooks ============================================================ --- netsync.cc a5ab2de52961f815123bd9df387f96e883f75571 +++ netsync.cc f4a72eaef9b394609b40c82d94f0295e02d7aac6 @@ -2806,7 +2806,7 @@ } } // This exception is thrown when bind() fails somewhere in Netxx. - catch (Netxx::NetworkException &e) + catch (Netxx::NetworkException &) { // If we tried with IPv6 and failed, we want to try again using IPv4. if (try_again) @@ -2820,7 +2820,7 @@ // This exception is thrown when there is no support for the type of // connection we want to do in the kernel, for example when a socket() // call fails somewhere in Netxx. - catch (Netxx::Exception &e) + catch (Netxx::Exception &) { // If we tried with IPv6 and failed, we want to try again using IPv4. if (try_again) ============================================================ --- paths.cc 5680d2c2726d5894fe21cc4c7dd9f149ba1efb32 +++ paths.cc f48e08a5f1b6df1f4bac400fed493bde312c0d62 @@ -277,7 +277,7 @@ relative = fs::path(path, fs::native); out = (base / relative).normalize(); } - catch (std::exception & e) + catch (std::exception &) { N(false, F("path '%s' is invalid") % path); } ============================================================ --- rcs_import.cc 36d442b3ce162881956dffeb17d9ff88d70ea794 +++ rcs_import.cc 18551740fdafb84f5f2bd78896725da0c19bd67e @@ -397,7 +397,7 @@ else throw oops("unknown directive '" + directive + "'"); } - catch (std::out_of_range & oor) + catch (std::out_of_range &) { throw oops("std::out_of_range while processing " + directive + " with source.size() == " ============================================================ --- transforms.cc 079c3479e99dda5711ca148a67c93f756641b0d1 +++ transforms.cc e117cdc138e0e0c293b4eaf5333a8860ee4932c8 @@ -112,9 +112,11 @@ { if (c >= '0' && c <= '9') return c - '0'; - if (c >= 'a' && c <= 'f') - return c - 'a' + 10; - I(false); + else + { + I(c >= 'a' && c <= 'f'); + return c - 'a' + 10; + } } static inline void ============================================================ --- update.cc 72640e049731be496bd0791f60eb04e3dd220fc2 +++ update.cc 2e6155771b60acaa2b08ec72951cad1ee55d68f8 @@ -61,7 +61,7 @@ bool test_ok = lexical_cast(cv()); results.insert(make_pair(i->inner().key, test_ok)); } - catch(boost::bad_lexical_cast & e) + catch(boost::bad_lexical_cast &) { W(F("failed to decode boolean testresult cert value '%s'\n") % cv); } ============================================================ --- visualc/cryptopp.vcproj 60282847f7cd1c9574c0c1b90a5d39ab9cacfd50 +++ visualc/cryptopp.vcproj 7a132b49577e93f1d515dbe1c891bfdb3a45797c @@ -113,7 +113,6 @@ AdditionalIncludeDirectories=""C:\Program Files\GnuWin32\include";"C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\PlatformSDK\Include";"$(ProjectDir)\..";"$(ProjectDir)"" PreprocessorDefinitions="WIN32;NDEBUG;_MBCS;_CONSOLE" StringPooling="true" - RuntimeLibrary="1" EnableFunctionLevelLinking="false" UsePrecompiledHeader="0" WarningLevel="3" ============================================================ --- visualc/lua.vcproj 80cf26112ebad55f5e19ae77aa0c554931258d19 +++ visualc/lua.vcproj 522ef32cdfc95ac46716957dfb40eae92f21dc92 @@ -112,7 +112,6 @@ AdditionalIncludeDirectories=""C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\PlatformSDK\Include"" PreprocessorDefinitions="WIN32;NDEBUG;_MBCS;_CONSOLE" StringPooling="true" - RuntimeLibrary="0" EnableFunctionLevelLinking="false" UsePrecompiledHeader="0" WarningLevel="3" ============================================================ --- visualc/monotone.vcproj e52b7ab761938efb46bf8692f961b2a7a7314158 +++ visualc/monotone.vcproj 383ea893a09dda04c7779e285d92d9012d084116 @@ -136,7 +136,6 @@ PreprocessorDefinitions="WIN32;NDEBUG;_MBCS;_CONSOLE;BOOST_MSVC_STD_ITERATOR;_CRT_SECURE_NO_DEPRECATE;min=min;max=max" StringPooling="true" MinimalRebuild="true" - RuntimeLibrary="1" EnableFunctionLevelLinking="false" UsePrecompiledHeader="1" PrecompiledHeaderThrough="pch.hh" @@ -157,12 +156,13 @@ /> + + @@ -362,10 +366,18 @@ > + + + + @@ -515,6 +527,10 @@ > + + @@ -535,6 +551,10 @@ > + + @@ -576,6 +596,10 @@ > + + @@ -668,6 +692,10 @@ > + + @@ -676,6 +704,10 @@ > + + @@ -796,6 +828,10 @@ > + + @@ -832,6 +868,10 @@ > + + ============================================================ --- visualc/netxx.vcproj f9ff174725df6d4e446ed387ace6829831cdc3d1 +++ visualc/netxx.vcproj d694d8c7e66473c56be2a03d64471635fafb68cc @@ -112,7 +112,6 @@ AdditionalIncludeDirectories=""$(ProjectDir)\..\visualc";"$(ProjectDir)\..";"C:\Program Files\Microsoft Platform SDK\Include"" PreprocessorDefinitions="WIN32;_CONSOLE;NETXX_NO_INET6;NETXX_NO_PTON;NETXX_NO_NTOP" StringPooling="true" - RuntimeLibrary="1" EnableFunctionLevelLinking="false" UsePrecompiledHeader="0" WarningLevel="3" ============================================================ --- visualc/popt.vcproj 24f60674ea05f1e23837af6415d7d800b67973b3 +++ visualc/popt.vcproj a3c52ab65e31e7b191f5361d5940290c51af9858 @@ -104,7 +104,6 @@ Name="VCCLCompilerTool" WholeProgramOptimization="false" PreprocessorDefinitions="WIN32;NDEBUG;HAVE_STRERROR" - RuntimeLibrary="0" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" ============================================================ --- visualc/sqlite3.vcproj 66e19e52bb4b61ab5df46b327e043413e57503e7 +++ visualc/sqlite3.vcproj 972fcccadc56f8b6b9cc9fc84f67efb8c14e464f @@ -113,7 +113,6 @@ AdditionalIncludeDirectories=""C:\Program Files\Microsoft Platform SDK\Include"" PreprocessorDefinitions="WIN32;NDEBUG;_MBCS;_CONSOLE;SQLITE_OMIT_CURSOR" StringPooling="true" - RuntimeLibrary="0" EnableFunctionLevelLinking="false" UsePrecompiledHeader="0" WarningLevel="3" ============================================================ --- visualc/stringprep.vcproj 8a8b24123026364d51b67fae3dc7d1b1d8a573b3 +++ visualc/stringprep.vcproj e15a222ec5641953b1ec2730bf829d90bb141dc2 @@ -114,7 +114,6 @@ AdditionalIncludeDirectories=""C:\Program Files\GnuWin32\include";"$(ProjectDir)\..\visualc";"$(ProjectDir)\..";"$(ProjectDir)"" PreprocessorDefinitions="WIN32;NDEBUG;_MBCS;_CONSOLE;HAVE_CONFIG_H;HAVE_ICONV;ICONV_CONST=" StringPooling="true" - RuntimeLibrary="0" EnableFunctionLevelLinking="false" UsePrecompiledHeader="0" WarningLevel="3" ============================================================ --- visualc/txt2c.vcproj 6128ea545bd948b35605ebce08b57423d49a58be +++ visualc/txt2c.vcproj dfb288751acab18d96cfd409b6024ff846e8cf93 @@ -124,7 +124,6 @@ OmitFramePointers="true" PreprocessorDefinitions="WIN32;NDEBUG;_MBCS;_CONSOLE" StringPooling="true" - RuntimeLibrary="0" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" ============================================================ --- work.cc 0d47dba0c23494d21067c094cca9cba8acd71f3b +++ work.cc adb912ec2cfa818b144031343e46c7109b7f0cc4 @@ -580,7 +580,7 @@ { read_data(c_path, c_data); } - catch(std::exception & e) + catch(std::exception &) { N(false, F("Problem with workspace: %s is unreadable") % c_path); }