Upgrade to latest rpmalloc develop branch (EmbarkStudios#8)

0mcandal0 · May 15, 2020 · 0fab1e9 · 0fab1e9
1 parent 82fe633
commit 0fab1e9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "rpmalloc-sys/rpmalloc"]
 	path = rpmalloc-sys/rpmalloc
 	url = https://github.com/mjansson/rpmalloc.git
+	branch = develop
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rpmalloc"
-version = "0.1.3"
+version = "0.2.0"
 description = "Cross-platform global memory allocator using rpmalloc"
 authors = ["Embark <[email protected]>", "Johan Andersson <[email protected]>"]
 license = "MIT OR Apache-2.0"
@@ -20,7 +20,7 @@ doctest = false
 test = false
 
 [dependencies]
-rpmalloc-sys = { version = "0.1.3", path = "rpmalloc-sys", features = ["preload"] }
+rpmalloc-sys = { version = "0.2.0", path = "rpmalloc-sys", features = ["preload"] }
 
 [features]
 default = []

diff --git a/rpmalloc-sys/Cargo.toml b/rpmalloc-sys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rpmalloc-sys"
-version = "0.1.3"
+version = "0.2.0+c4d2c05"
 description = "Unsafe FFI bindings to rpmalloc C library"
 authors = ["Embark <[email protected]>", "Johan Andersson <[email protected]>"]
 license = "MIT OR Apache-2.0"

diff --git a/rpmalloc-sys/rpmalloc b/rpmalloc-sys/rpmalloc
+3 −0		.github/FUNDING.yml
+2 −0		.gitignore
+15 −0		CHANGELOG
+27 −15		README.md
+213 −0		build/msvs/rpmalloc-test.vcxproj
+11 −1		build/msvs/rpmalloc.sln
+2 −2		build/msvs/test.vcxproj
+1 −1		build/ninja/android.py
+70 −38		build/ninja/clang.py
+13 −9		build/ninja/gcc.py
+5 −0		build/ninja/toolchain.py
+5 −5		build/ninja/xcode.py
+2 −1		configure.py
+12 −3		rpmalloc/malloc.c
+1,747 −1,161		rpmalloc/rpmalloc.c
+91 −4		rpmalloc/rpmalloc.h
+252 −26		test/main.c
+1 −18		test/thread.c
+0 −3		test/thread.h