# # # patch "visualc/config.h" # from [961df8e32c5cc075146643b3a702485585643235] # to [852edf1d237cdd1ddbd88e7ed5f47fe4846161d5] # # patch "visualc/monotone.sln" # from [99b8d257f38880517ac82c8875168d34b98b8f3f] # to [1b6044d626f607b778aa61b703d9b5f1bc304b8b] # # patch "visualc/stringprep.vcproj" # from [806a61f05bcf84614e857e5345df8179d4d588e7] # to [2ce9953f8cde929f1ad979b8ef30bb95011d0f30] # # patch "visualc/txt2c.vcproj" # from [aba563c3b634b48534503349de10fdf6ab427aa4] # to [51f8804a045f412dd6262dd65c9b85c9fddba74e] # ============================================================ --- visualc/config.h 961df8e32c5cc075146643b3a702485585643235 +++ visualc/config.h 852edf1d237cdd1ddbd88e7ed5f47fe4846161d5 @@ -55,4 +55,29 @@ typedef unsigned int os_err_t; */ #define _CRT_SECURE_NO_WARNINGS +/* + * Disable MS specific warning C4290: + * C++ exception specification ignored except to indicate a function is not __declspec(nothrow) + * + * A function is declared using exception specification, which Visual C++ accepts but does not implement. + * Code with exception specifications that are ignored during compilation may need to be recompiled and + * linked to be reused in future versions supporting exception specifications. + */ +#pragma warning( disable : 4290 ) + + +/* + * Disable MS specific warning C4250: + * Two or more members have the same name. The one in class2 is inherited because it is a base class + * for the other classes that contained this member. + * Because a virtual base class is shared among multiple derived classes, a name in a derived class + * dominates a name in a base class. + * For example, given the following class hierarchy, there are two definitions of func inherited within diamond: + * the vbc::func() instance through the weak class, and the dominant::func() through the dominant class. + * An unqualified call of func() through a diamond class object, always calls the dominate::func() instance. + * If the weak class were to introduce an instance of func(), neither definition would dominate, and the call would be flagged as ambiguous. + */ +#pragma warning( disable : 4250 ) + + #endif /* CONFIG_H */ ============================================================ --- visualc/monotone.sln 99b8d257f38880517ac82c8875168d34b98b8f3f +++ visualc/monotone.sln 1b6044d626f607b778aa61b703d9b5f1bc304b8b @@ -1,14 +1,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C9  Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monotone", "monotone.vcproj", "{83E1EB91-ABA9-4DC5-9423-87B3D977F015}" ProjectSection(ProjectDependencies) = postProject - {84286BE1-7522-4A9E-853C-27CD329B96D1} = {84286BE1-7522-4A9E-853C-27CD329B96D1} - {4B57DCC2-608A-42E3-B54F-89DAA495D7BA} = {4B57DCC2-608A-42E3-B54F-89DAA495D7BA} - {FF042D9E-E5DC-4C89-AB5B-6CD03990A595} = {FF042D9E-E5DC-4C89-AB5B-6CD03990A595} + {36249158-B5C6-46BD-9FAF-15454CBE722F} = {36249158-B5C6-46BD-9FAF-15454CBE722F} + {CA00DD78-49F0-43BD-B5BB-D649C796FA95} = {CA00DD78-49F0-43BD-B5BB-D649C796FA95} + {A075E27B-893B-4426-9B52-D6A795F699DE} = {A075E27B-893B-4426-9B52-D6A795F699DE} {EFC02287-836F-470D-9955-44A8F81FB764} = {EFC02287-836F-470D-9955-44A8F81FB764} - {A075E27B-893B-4426-9B52-D6A795F699DE} = {A075E27B-893B-4426-9B52-D6A795F699DE} - {CA00DD78-49F0-43BD-B5BB-D649C796FA95} = {CA00DD78-49F0-43BD-B5BB-D649C796FA95} + {FF042D9E-E5DC-4C89-AB5B-6CD03990A595} = {FF042D9E-E5DC-4C89-AB5B-6CD03990A595} + {4B57DCC2-608A-42E3-B54F-89DAA495D7BA} = {4B57DCC2-608A-42E3-B54F-89DAA495D7BA} + {84286BE1-7522-4A9E-853C-27CD329B96D1} = {84286BE1-7522-4A9E-853C-27CD329B96D1} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{36B323F6-E1FE-4B73-846C-21F62E28CC90}" @@ -29,11 +30,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C9 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tester", "tester.vcproj", "{56C03BD7-0CFA-404B-B666-58020593A071}" ProjectSection(ProjectDependencies) = postProject - {36249158-B5C6-46BD-9FAF-15454CBE722F} = {36249158-B5C6-46BD-9FAF-15454CBE722F} - {4B57DCC2-608A-42E3-B54F-89DAA495D7BA} = {4B57DCC2-608A-42E3-B54F-89DAA495D7BA} + {EFC02287-836F-470D-9955-44A8F81FB764} = {EFC02287-836F-470D-9955-44A8F81FB764} + {FF042D9E-E5DC-4C89-AB5B-6CD03990A595} = {FF042D9E-E5DC-4C89-AB5B-6CD03990A595} {84286BE1-7522-4A9E-853C-27CD329B96D1} = {84286BE1-7522-4A9E-853C-27CD329B96D1} - {FF042D9E-E5DC-4C89-AB5B-6CD03990A595} = {FF042D9E-E5DC-4C89-AB5B-6CD03990A595} - {EFC02287-836F-470D-9955-44A8F81FB764} = {EFC02287-836F-470D-9955-44A8F81FB764} + {4B57DCC2-608A-42E3-B54F-89DAA495D7BA} = {4B57DCC2-608A-42E3-B54F-89DAA495D7BA} + {36249158-B5C6-46BD-9FAF-15454CBE722F} = {36249158-B5C6-46BD-9FAF-15454CBE722F} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unit_tests", "unit_tests.vcproj", "{8F951705-66C4-4B67-A585-C8CF75EA2644}" ============================================================ --- visualc/stringprep.vcproj 806a61f05bcf84614e857e5345df8179d4d588e7 +++ visualc/stringprep.vcproj 2ce9953f8cde929f1ad979b8ef30bb95011d0f30 @@ -114,6 +114,7 @@ AdditionalIncludeDirectories=""$(ProjectDir)\..\visualc";"$(ProjectDir)\..";"$(ProjectDir)"" PreprocessorDefinitions="WIN32;NDEBUG;_MBCS;_CONSOLE;HAVE_CONFIG_H;HAVE_ICONV;ICONV_CONST=" StringPooling="true" + RuntimeLibrary="2" EnableFunctionLevelLinking="false" UsePrecompiledHeader="0" WarningLevel="3" ============================================================ --- visualc/txt2c.vcproj aba563c3b634b48534503349de10fdf6ab427aa4 +++ visualc/txt2c.vcproj 51f8804a045f412dd6262dd65c9b85c9fddba74e @@ -124,6 +124,7 @@ OmitFramePointers="true" PreprocessorDefinitions="WIN32;NDEBUG;_MBCS;_CONSOLE" StringPooling="true" + RuntimeLibrary="2" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3"