diff options
| author | U-NORTHAMERICA\jcl <jcl@JCL.northamerica.corp.microsoft.com> | 2014-07-11 23:29:41 +0400 |
|---|---|---|
| committer | U-NORTHAMERICA\jcl <jcl@JCL.northamerica.corp.microsoft.com> | 2014-07-11 23:29:41 +0400 |
| commit | 0f0d25d5ae8095424d43b57c72378723ab16bda6 (patch) | |
| tree | b395595bc3fe3ef9496e8edee020ecdbf578547a | |
| parent | 7c2d9132dae30f3262a10bf9c782d9e3eae72c3e (diff) | |
windows compile tweaks
| -rw-r--r-- | vowpalwabbit/example.cc | 2 | ||||
| -rw-r--r-- | vowpalwabbit/libvw.vcxproj | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vowpalwabbit/example.cc b/vowpalwabbit/example.cc index c4d11ce1..d57c2950 100644 --- a/vowpalwabbit/example.cc +++ b/vowpalwabbit/example.cc @@ -121,7 +121,7 @@ feature* get_features(vw& all, example* ec, size_t& feature_map_len) { features_and_source fs; fs.stride_shift = all.reg.stride_shift; - fs.mask = all.reg.weight_mask >> all.reg.stride_shift; + fs.mask = (uint32_t)all.reg.weight_mask >> all.reg.stride_shift; fs.base = all.reg.weight_vector; GD::foreach_feature<features_and_source, vec_store>(all, *ec, fs); feature_map_len = fs.feature_map.size(); diff --git a/vowpalwabbit/libvw.vcxproj b/vowpalwabbit/libvw.vcxproj index 689d4a62..efaea3c2 100644 --- a/vowpalwabbit/libvw.vcxproj +++ b/vowpalwabbit/libvw.vcxproj @@ -142,13 +142,13 @@ <PropertyGroup Condition="'$(Platform)'=='x64'">
<BoostIncludeDir>c:\boost\x64\include\boost-1_55</BoostIncludeDir>
<BoostLibDir>c:\boost\x64\lib</BoostLibDir>
- <ZlibIncludeDir>..\..\zlib-1.2.7</ZlibIncludeDir>
+ <ZlibIncludeDir>..\..\zlib-1.2.8</ZlibIncludeDir>
<ZlibLibDir>$(ZlibIncludeDir)\contrib\vstudio\vc10\x64\ZlibStat$(Configuration)</ZlibLibDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Platform)'=='Win32'">
<BoostIncludeDir>c:\boost\x86\include\boost-1_55</BoostIncludeDir>
<BoostLibDir>c:\boost\x86\lib</BoostLibDir>
- <ZlibIncludeDir>..\..\zlib-1.2.7</ZlibIncludeDir>
+ <ZlibIncludeDir>..\..\zlib-1.2.8</ZlibIncludeDir>
<ZlibLibDir>$(ZlibIncludeDir)\contrib\vstudio\vc10\x86\ZlibStat$(Configuration)</ZlibLibDir>
</PropertyGroup>
<Target Name="DepCheck">
|