Skip to content

Fixed warning in unicode.cpp causing build failure #897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 9, 2017
Merged

Fixed warning in unicode.cpp causing build failure #897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e63380
Fixed warning in unicode.cpp causing build failure
NathanJPhillips May 9, 2017
10eb073
Enabled warnings as errors in config.inc to match travis settings
NathanJPhillips May 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ build_script:
cp -r deps/minisat2-2.2.1 minisat-2.2.1
patch -d minisat-2.2.1 -p1 < scripts/minisat-2.2.1-patch
call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x64
sed -i "s/BUILD_ENV.*/BUILD_ENV = MSVC/" src/config.inc
sed -i "s/BUILD_ENV[ ]*=.*/BUILD_ENV = MSVC/" src/config.inc
make -C src -j2

test_script:
Expand Down
11 changes: 6 additions & 5 deletions src/config.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
# Build platform (use one of AUTO, Unix, OSX_Universal, MSVC, Cygwin, MinGW)
BUILD_ENV = AUTO

# Enable all warnings
#CXXFLAGS += -Wall -Wno-long-long -Wno-sign-compare -Wno-parentheses -Wno-strict-aliasing -pedantic

# Treat warnings as errors
#CXXFLAGS += -Werror
# Enable all warnings and treat them as errors
ifeq ($(BUILD_ENV),MSVC)
#CXXFLAGS += /Wall /WX
else
CXXFLAGS += -Wall -pedantic -Werror
endif

# Select optimisation or debug info
#CXXFLAGS += -O2 -DNDEBUG
Expand Down
2 changes: 1 addition & 1 deletion src/util/unicode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ std::wstring utf8_to_utf16(const std::string& in, bool swap_bytes)
{
std::wstring result;
result.reserve(in.size());
int i=0;
std::string::size_type i=0;
while(i<in.size())
{
unsigned char c=in[i++];
Expand Down