@@ -107,7 +107,7 @@ bool SqlQueryHolder::SetQuery(size_t index, const char *sql) } /// not executed yet, just stored (it's not called a holder for nothing) - m_queries[index] = SqlResultPair(strdup(sql), NULL); + m_queries[index] = SqlResultPair(strdup(sql), (QueryResult*)NULL); return true; } src/shared/Database/SqlOperations.cpp @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8713" + #define REVISION_NR "8714" #endif // __REVISION_NR_H__ src/shared/revision_nr.h @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug_NoPCH|Win32"> <Configuration>Debug_NoPCH</Configuration> @@ -196,7 +197,7 @@ <RuntimeTypeInfo>true</RuntimeTypeInfo> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings> + <DisableSpecificWarnings>4355;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -269,7 +270,7 @@ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeTypeInfo>true</RuntimeTypeInfo> <WarningLevel>Level3</WarningLevel> - <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings> + <DisableSpecificWarnings>4355;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -348,7 +349,7 @@ <RuntimeTypeInfo>true</RuntimeTypeInfo> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <DisableSpecificWarnings>4355;%(DisableSpecificWarnings)</DisableSpecificWarnings> + <DisableSpecificWarnings>4355;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> win/VC100/ACE_vc10.vcxproj @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug_NoPCH|Win32"> <Configuration>Debug_NoPCH</Configuration> @@ -187,7 +188,7 @@ <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>$(OutDir)mangosd.lib</ImportLibrary> + <ImportLibrary>$(IntDir)mangosd.lib</ImportLibrary> </Link> <PostBuildEvent> <Command>copy ..\..\dep\lib\$(Platform)_$(Configuration)\*.dll ..\..\bin\$(Platform)_$(Configuration)</Command> @@ -236,7 +237,7 @@ <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>$(OutDir)mangosd.lib</ImportLibrary> + <ImportLibrary>$(IntDir)mangosd.lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> <PostBuildEvent> @@ -288,7 +289,7 @@ <FixedBaseAddress>false</FixedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>$(OutDir)mangosd.lib</ImportLibrary> + <ImportLibrary>$(IntDir)mangosd.lib</ImportLibrary> </Link> <PostBuildEvent> <Command>copy ..\..\dep\lib\$(Platform)_$(Configuration)\*.dll ..\..\bin\$(Platform)_$(Configuration)</Command> @@ -338,7 +339,7 @@ <FixedBaseAddress>false</FixedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>$(OutDir)mangosd.lib</ImportLibrary> + <ImportLibrary>$(IntDir)mangosd.lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> <PostBuildEvent> @@ -390,7 +391,7 @@ <FixedBaseAddress>false</FixedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>$(OutDir)mangosd.lib</ImportLibrary> + <ImportLibrary>$(IntDir)mangosd.lib</ImportLibrary> </Link> <PostBuildEvent> <Command>copy ..\..\dep\lib\$(Platform)_debug\*.dll ..\..\bin\$(Platform)_$(Configuration)</Command> @@ -440,7 +441,7 @@ <FixedBaseAddress>false</FixedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>$(OutDir)mangosd.lib</ImportLibrary> + <ImportLibrary>$(IntDir)mangosd.lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> <PostBuildEvent> win/VC100/mangosd.vcxproj @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug_NoPCH|Win32"> <Configuration>Debug_NoPCH</Configuration> @@ -161,7 +162,7 @@ <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>$(OutDir)MaNGOSScript.lib</ImportLibrary> + <ImportLibrary>$(IntDir)MaNGOSScript.lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -192,7 +193,7 @@ <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>$(OutDir)MaNGOSScript.lib</ImportLibrary> + <ImportLibrary>$(IntDir)MaNGOSScript.lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -219,7 +220,7 @@ <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>$(OutDir)MaNGOSScript.lib</ImportLibrary> + <ImportLibrary>$(IntDir)MaNGOSScript.lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -249,7 +250,7 @@ <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>$(OutDir)MaNGOSScript.lib</ImportLibrary> + <ImportLibrary>$(IntDir)MaNGOSScript.lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -277,7 +278,7 @@ <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>$(OutDir)MaNGOSScript.lib</ImportLibrary> + <ImportLibrary>$(IntDir)MaNGOSScript.lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -308,7 +309,7 @@ <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>$(OutDir)MaNGOSScript.lib</ImportLibrary> + <ImportLibrary>$(IntDir)MaNGOSScript.lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> win/VC100/script.vcxproj 8e5bdc73c8fd7335fca613d430c02fc20b777701 Ambal pogrebniak@gala.net http://github.com/apoc/mangos/commit/124d04d5497ded70f3547e731e13a9bc048d974f 124d04d5497ded70f3547e731e13a9bc048d974f 2009-10-23T04:51:35-07:00 2009-10-23T04:51:30-07:00 [8714] Fix compilation on Visual Studio 2010 Beta 2. Signed-off-by: Ambal <pogrebniak@gala.net> ac513866a31cb374e0de45cba3d1579601d6d0ed Ambal pogrebniak@gala.net