diff options
| author | nyamatongwe <nyamatongwe@gmail.com> | 2013-01-30 11:19:56 +1100 |
|---|---|---|
| committer | nyamatongwe <nyamatongwe@gmail.com> | 2013-01-30 11:19:56 +1100 |
| commit | c9be849f2ed9a972c9e0a7d2eaa89593fc375a2c (patch) | |
| tree | 56088c49e6995dcc54c0b287cce4f6ef86517ff1 /cocoa/ScintillaCocoa.mm | |
| parent | a829b2334bda5567113d9c63e91ceb041ed99f34 (diff) | |
| download | scintilla-mirror-c9be849f2ed9a972c9e0a7d2eaa89593fc375a2c.tar.gz | |
Type casts so will build in std=c++11 mode.
Diffstat (limited to 'cocoa/ScintillaCocoa.mm')
| -rw-r--r-- | cocoa/ScintillaCocoa.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm index 9dc572fc8..7e9823762 100644 --- a/cocoa/ScintillaCocoa.mm +++ b/cocoa/ScintillaCocoa.mm @@ -1387,7 +1387,7 @@ bool ScintillaCocoa::GetPasteboardData(NSPasteboard* board, SelectionText* selec { CFStringEncoding encoding = EncodingFromCharacterSet(IsUnicodeMode(), vs.styles[STYLE_DEFAULT].characterSet); - CFRange rangeAll = {0, [data length]}; + CFRange rangeAll = {0, static_cast<CFIndex>([data length])}; CFIndex usedLen = 0; CFStringGetBytes((CFStringRef)data, rangeAll, encoding, '?', false, NULL, 0, &usedLen); @@ -1873,7 +1873,7 @@ int ScintillaCocoa::InsertText(NSString* input) { CFStringEncoding encoding = EncodingFromCharacterSet(IsUnicodeMode(), vs.styles[STYLE_DEFAULT].characterSet); - CFRange rangeAll = {0, [input length]}; + CFRange rangeAll = {0, static_cast<CFIndex>([input length])}; CFIndex usedLen = 0; CFStringGetBytes((CFStringRef)input, rangeAll, encoding, '?', false, NULL, 0, &usedLen); |