diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-02-11 14:40:09 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-02-11 15:05:39 -0800 |
| commit | 315730fb273c4d55c4c25d4fba2b68dcd6a54093 (patch) | |
| tree | 7d7a342c44200e32783db6e73b2bd4a90857ac9a /src/libstd/thread_local | |
| parent | aa0db172de42a981a64730df146ccf3d737c5762 (diff) | |
| download | rust-315730fb273c4d55c4c25d4fba2b68dcd6a54093.tar.gz rust-315730fb273c4d55c4c25d4fba2b68dcd6a54093.zip | |
Test fixes and rebase conflicts
Diffstat (limited to 'src/libstd/thread_local')
| -rw-r--r-- | src/libstd/thread_local/mod.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libstd/thread_local/mod.rs b/src/libstd/thread_local/mod.rs index 0ec241a65e2..eab9cd84539 100644 --- a/src/libstd/thread_local/mod.rs +++ b/src/libstd/thread_local/mod.rs @@ -452,6 +452,7 @@ mod imp { } #[doc(hidden)] + #[stable(feature = "rust1", since = "1.0.0")] pub unsafe extern fn destroy_value<T>(ptr: *mut u8) { let ptr = ptr as *mut Key<T>; // Right before we run the user destructor be sure to flag the @@ -523,6 +524,7 @@ mod imp { } #[doc(hidden)] + #[stable(feature = "rust1", since = "1.0.0")] pub unsafe extern fn destroy_value<T: 'static>(ptr: *mut u8) { // The OS TLS ensures that this key contains a NULL value when this // destructor starts to run. We set it back to a sentinel value of 1 to |