0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1732 from GregoryLundberg/master

Browse source 
Fix warnings from VC15 (VS 2017)
This commit is contained in:
Celtic Minstrel 2017-05-28 03:16:27 -04:00 • committed by GitHub
commit aa21ca1200
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -63,6 +63,7 @@ src/**/*.vcproj
/WindowsTimeout.ilk
/WindowsTimeout.pdb
.vscode
/.vs
# eclipse
.settings

2
src/preferences/credentials.cpp
View file

@ -244,7 +244,7 @@ secure_buffer build_key(const std::string& server, const std::string& login)
{
std::string sysname = get_system_username();
secure_buffer result(std::max<size_t>(server.size() + login.size() + sysname.size(), 32));
size_t i = 0;
unsigned char i = 0;
std::generate(result.begin(), result.end(), [&i]() {return 'x' ^ i++;});
std::copy(login.begin(), login.end(), result.begin());
std::copy(sysname.begin(), sysname.end(), result.begin() + login.size());

4
src/widgets/textbox.cpp
View file

@ -232,8 +232,8 @@ void textbox::draw_contents()
const clip_rect_setter clipper(surf, &loc);
color_t c(0, 0, 160, 140);
sdl::fill_rectangle(rect, c);
color_t c2(0, 0, 160, 140);
sdl::fill_rectangle(rect, c2);
starty += int(line_height_);
startx = 0;