Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-14 01:45:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update rustc to 00b112c45a604fa6f4b59af2a40c9deeadfdb7c6/rustc-1.0.0-dev.

Browse source
This commit is contained in:
Josh Matthews 2015-01-15 13:26:44 -05:00 • committed by Glenn Watson
parent ff8cbff810
commit 95fc29fa0d
255 changed files with 3550 additions and 3362 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ports/cef/string_map.rs
View file

@ -4,15 +4,15 @@
use eutil::slice_to_str;
use libc::{c_int};
use std::collections::TreeMap;
use std::collections::BTreeMap;
use std::mem;
use std::string::String;
use string::{cef_string_userfree_utf16_alloc, cef_string_userfree_utf16_free};
use string::{cef_string_utf16_set};
use types::{cef_string_map_t, cef_string_t};
fn string_map_to_treemap(sm: *mut cef_string_map_t) -> *mut TreeMap<String, *mut cef_string_t> {
sm as *mut TreeMap<String, *mut cef_string_t>
fn string_map_to_treemap(sm: *mut cef_string_map_t) -> *mut BTreeMap<String, *mut cef_string_t> {
sm as *mut BTreeMap<String, *mut cef_string_t>
}
//cef_string_map
@ -20,7 +20,7 @@ fn string_map_to_treemap(sm: *mut cef_string_map_t) -> *mut TreeMap<String, *mut
#[no_mangle]
pub extern "C" fn cef_string_map_alloc() -> *mut cef_string_map_t {
unsafe {
let sm: Box<TreeMap<String, *mut cef_string_t>> = box TreeMap::new();
let sm: Box<BTreeMap<String, *mut cef_string_t>> = box BTreeMap::new();
mem::transmute(sm)
}
}
@ -119,7 +119,7 @@ pub extern "C" fn cef_string_map_clear(sm: *mut cef_string_map_t) {
pub extern "C" fn cef_string_map_free(sm: *mut cef_string_map_t) {
unsafe {
if sm.is_null() { return; }
let _v: Box<TreeMap<String, *mut cef_string_t>> = mem::transmute(sm);
let _v: Box<BTreeMap<String, *mut cef_string_t>> = mem::transmute(sm);
cef_string_map_clear(sm);
}
}