Skip to content

Commit

Permalink
Merge branch 'android-mem-leak'
Browse files Browse the repository at this point in the history
  • Loading branch information
graeme-hill committed Jun 18, 2017
2 parents ef91787 + e1318d7 commit 5c30454
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.5.1)
project(CrossGuid)

set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")

option(XG_TESTS "Build test runner" ON)

Expand Down
3 changes: 2 additions & 1 deletion Guid.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,8 @@ unsigned char hexPairToChar(char a, char b)
// create a guid from string
Guid::Guid(const std::string &fromString)
{
char charOne, charTwo;
char charOne = '\0';
char charTwo = '\0';
bool lookingForFirstChar = true;
unsigned nextByte = 0;

Expand Down

0 comments on commit 5c30454

Please sign in to comment.