From 01313ebd4b2e2da9625d4bda2a22b4c409333525 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Mon, 24 Jun 2013 15:55:52 -0700
Subject: [PATCH] Bug 886205 (part 1) - Move some function definitions from
 gc/Barrier-inl.h to gc/Barrier.h.  r=terrence.

--HG--
extra : rebase_source : d6eeb4f6273c36069a8bbb28033737c2aec40ba0
---
 js/src/gc/Barrier-inl.h | 14 --------------
 js/src/gc/Barrier.h     | 10 ++++++++--
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/js/src/gc/Barrier-inl.h b/js/src/gc/Barrier-inl.h
index 7be0c1dfafc..93116e645dc 100644
--- a/js/src/gc/Barrier-inl.h
+++ b/js/src/gc/Barrier-inl.h
@@ -56,20 +56,6 @@ EncapsulatedValue::~EncapsulatedValue()
     pre();
 }
 
-inline void
-EncapsulatedValue::init(const Value &v)
-{
-    JS_ASSERT(!IsPoisonedValue(v));
-    value = v;
-}
-
-inline void
-EncapsulatedValue::init(JSRuntime *rt, const Value &v)
-{
-    JS_ASSERT(!IsPoisonedValue(v));
-    value = v;
-}
-
 inline EncapsulatedValue &
 EncapsulatedValue::operator=(const Value &v)
 {
diff --git a/js/src/gc/Barrier.h b/js/src/gc/Barrier.h
index 05d0d925c06..bbf49aad0a1 100644
--- a/js/src/gc/Barrier.h
+++ b/js/src/gc/Barrier.h
@@ -384,8 +384,14 @@ class EncapsulatedValue : public ValueOperations<EncapsulatedValue>
     }
     inline ~EncapsulatedValue();
 
-    inline void init(const Value &v);
-    inline void init(JSRuntime *rt, const Value &v);
+    void init(const Value &v) {
+        JS_ASSERT(!IsPoisonedValue(v));
+        value = v;
+    }
+    void init(JSRuntime *rt, const Value &v) {
+        JS_ASSERT(!IsPoisonedValue(v));
+        value = v;
+    }
 
     inline EncapsulatedValue &operator=(const Value &v);
     inline EncapsulatedValue &operator=(const EncapsulatedValue &v);