Skip to content

Commit

Permalink
Pull request #145: Fix issue with char being unsigned on ARM
Browse files Browse the repository at this point in the history
Merge in OP/openkit-native from noissue/arm-signed-unsigned-issue-fix to release/2.0

* commit '4121e34f6e3103f80b66b29c8364f9961f61dcfc':
  public/CHANGELOG.md edited online with Bitbucket
  Fix issue with char being unsigned on ARM

GitOrigin-RevId: 5be5ef54d291eef55b017450bad3efcec543be68
  • Loading branch information
stefaneberl authored and openkitdt committed Jul 6, 2021
1 parent df9852f commit 6583ad9
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
### Added
- Add libatomic as additional link library if required.

### Changed
- Fix issue in JSON parser for compilers/platforms with unsigned char.

## 2.0.0 [Release date: 2021-05-19]
[GitHub Releases](https://github.com/Dynatrace/openkit-native/releases/tag/v2.0.0)

Expand Down
4 changes: 2 additions & 2 deletions src/OpenKit.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -375,12 +375,12 @@ macro(_generate_open_kit_version_rc)
endmacro()

macro(_check_for_additional_libs libs)
set(libs)
set(${libs})

# check if libatomic is required
include (CheckAtomic)
if (HAVE_CXX_ATOMICS_WITH_LIB)
list (append libs "atomic")
list (APPEND ${libs} "atomic")
endif ()

endmacro()
Expand Down
5 changes: 1 addition & 4 deletions src/util/json/reader/DefaultResettableReader.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,7 @@ int32_t DefaultResettableReader::read()
return EOF;
}

char character = EOF;
mReader->get(character);

return character;
return mReader->get();
}

void DefaultResettableReader::mark(int32_t lookAheadLimit)
Expand Down

0 comments on commit 6583ad9

Please sign in to comment.