diff options
| author | Neil Hodgson <nyamatongwe@gmail.com> | 2016-09-14 15:06:13 +1000 |
|---|---|---|
| committer | Neil Hodgson <nyamatongwe@gmail.com> | 2016-09-14 15:06:13 +1000 |
| commit | 427f3dabfedb6f9b66c15d93a013b9beaf089e37 (patch) | |
| tree | eda7a1c73570b20202a46081707d1fe9949a475a /cocoa | |
| parent | 5ca7dd65bb30f05ad8aa6bfd269d812e766930da (diff) | |
| download | scintilla-mirror-427f3dabfedb6f9b66c15d93a013b9beaf089e37.tar.gz | |
Casts for 64 to 32-bit conversions on OS X.
Diffstat (limited to 'cocoa')
| -rw-r--r-- | cocoa/ScintillaCocoa.mm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm index ec9844bb0..9fe70e3a8 100644 --- a/cocoa/ScintillaCocoa.mm +++ b/cocoa/ScintillaCocoa.mm @@ -1676,7 +1676,7 @@ int ScintillaCocoa::TargetAsUTF8(char *text) if (text) memcpy(text, tmputf.c_str(), tmputf.length()); CFRelease(cfsVal); - return tmputf.length(); + return static_cast<int>(tmputf.length()); } return targetLength; } @@ -1687,7 +1687,7 @@ int ScintillaCocoa::TargetAsUTF8(char *text) // Return the length of the result in bytes. int ScintillaCocoa::EncodedFromUTF8(char *utf8, char *encoded) const { - const int inputLength = (lengthForEncode >= 0) ? lengthForEncode : strlen(utf8); + const int inputLength = (lengthForEncode >= 0) ? lengthForEncode : static_cast<int>(strlen(utf8)); if (IsUnicodeMode()) { if (encoded) @@ -1707,7 +1707,7 @@ int ScintillaCocoa::EncodedFromUTF8(char *utf8, char *encoded) const if (encoded) memcpy(encoded, sEncoded.c_str(), sEncoded.length()); CFRelease(cfsVal); - return sEncoded.length(); + return static_cast<int>(sEncoded.length()); } } @@ -2196,10 +2196,10 @@ int ScintillaCocoa::InsertText(NSString* input) */ NSRange ScintillaCocoa::PositionsFromCharacters(NSRange range) const { - long start = pdoc->GetRelativePositionUTF16(0, range.location); + long start = pdoc->GetRelativePositionUTF16(0, static_cast<int>(range.location)); if (start == INVALID_POSITION) start = pdoc->Length(); - long end = pdoc->GetRelativePositionUTF16(start, range.length); + long end = pdoc->GetRelativePositionUTF16(static_cast<int>(start), static_cast<int>(range.length)); if (end == INVALID_POSITION) end = pdoc->Length(); return NSMakeRange(start, end - start); @@ -2212,8 +2212,8 @@ NSRange ScintillaCocoa::PositionsFromCharacters(NSRange range) const */ NSRange ScintillaCocoa::CharactersFromPositions(NSRange range) const { - const long start = pdoc->CountUTF16(0, range.location); - const long len = pdoc->CountUTF16(range.location, NSMaxRange(range)); + const long start = pdoc->CountUTF16(0, static_cast<int>(range.location)); + const long len = pdoc->CountUTF16(static_cast<int>(range.location), static_cast<int>(NSMaxRange(range))); return NSMakeRange(start, len); } |