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 | 241a606303ea56321dcd975beca3e49bb5f1ca1f (patch) | |
| tree | 0739055d7a37bd8683698a2ff3424f7610d88970 /cocoa/ScintillaCocoa.mm | |
| parent | b6b784c701a33c9ba11330a5fb1ecdc745abdb04 (diff) | |
| download | scintilla-mirror-241a606303ea56321dcd975beca3e49bb5f1ca1f.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); |