From 26c93433dafaabfd6f61d15c03fde68c9f214bf5 Mon Sep 17 00:00:00 2001
From: Keegan McAllister <kmcallister@mozilla.com>
Date: Sun, 23 Nov 2014 10:21:47 -0800
Subject: Require <T: Send> for AtomicOption

Fixes #19247.
---
 src/libsync/atomic.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/libsync')

diff --git a/src/libsync/atomic.rs b/src/libsync/atomic.rs
index b4b2ef5218c..0bc5dd11c25 100644
--- a/src/libsync/atomic.rs
+++ b/src/libsync/atomic.rs
@@ -96,7 +96,7 @@
 
 use alloc::boxed::Box;
 use core::mem;
-use core::prelude::{Drop, None, Option, Some};
+use core::prelude::{Send, Drop, None, Option, Some};
 
 pub use core::atomic::{AtomicBool, AtomicInt, AtomicUint, AtomicPtr};
 pub use core::atomic::{Ordering, Relaxed, Release, Acquire, AcqRel, SeqCst};
@@ -114,7 +114,7 @@ pub struct AtomicOption<T> {
     p: AtomicUint,
 }
 
-impl<T> AtomicOption<T> {
+impl<T: Send> AtomicOption<T> {
     /// Create a new `AtomicOption`
     pub fn new(p: Box<T>) -> AtomicOption<T> {
         unsafe { AtomicOption { p: AtomicUint::new(mem::transmute(p)) } }
@@ -170,7 +170,7 @@ impl<T> AtomicOption<T> {
 }
 
 #[unsafe_destructor]
-impl<T> Drop for AtomicOption<T> {
+impl<T: Send> Drop for AtomicOption<T> {
     fn drop(&mut self) {
         let _ = self.take(SeqCst);
     }
-- 
cgit 1.4.1-3-g733a5