usa	2012-12-19 21:14:45 +0900 (Wed, 19 Dec 2012)

  New Revision: 38469

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=38469

  Log:
    merge revision(s) 36593: [Backport #7407]
    
    * gc.c: return true or false. Patch by Dirkjan Bussink. [Bug #6821]
    
    * test/ruby/test_gc.rb: add test-case for this bug.

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/gc.c
    branches/ruby_1_9_3/test/ruby/test_gc.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 38468)
+++ ruby_1_9_3/ChangeLog	(revision 38469)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Wed Dec 19 21:14:28 2012  Narihiro Nakamura  <authornari@g...>
+
+	* gc.c: return true or false. Patch by Dirkjan Bussink. [Bug #6821]
+
+	* test/ruby/test_gc.rb: add test-case for this bug.
+
 Wed Dec 19 21:12:49 2012  Shugo Maeda  <shugo@r...>
 
 	* marshal.c (r_entry0): don't taint classes and modules because
Index: ruby_1_9_3/gc.c
===================================================================
--- ruby_1_9_3/gc.c	(revision 38468)
+++ ruby_1_9_3/gc.c	(revision 38469)
@@ -627,7 +627,7 @@ static VALUE https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/gc.c#L627
 gc_profile_enable_get(VALUE self)
 {
     rb_objspace_t *objspace = &rb_objspace;
-    return objspace->profile.run;
+    return objspace->profile.run ? Qtrue : Qfalse;
 }
 
 /*
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 38468)
+++ ruby_1_9_3/version.h	(revision 38469)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 342
+#define RUBY_PATCHLEVEL 343
 
 #define RUBY_RELEASE_DATE "2012-12-19"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/test/ruby/test_gc.rb
===================================================================
--- ruby_1_9_3/test/ruby/test_gc.rb	(revision 38468)
+++ ruby_1_9_3/test/ruby/test_gc.rb	(revision 38469)
@@ -97,4 +97,13 @@ class TestGc < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/test/ruby/test_gc.rb#L97
     assert_in_out_err([env, "-W1", "-e", "exit"], "", [], [], "[ruby-core:39795]")
     assert_in_out_err([env, "-w", "-e", "exit"], "", [], /heap_min_slots=100000/, "[ruby-core:39795]")
   end
+
+  def test_profiler_enabled
+    GC::Profiler.enable
+    assert_equal(true, GC::Profiler.enabled?)
+    GC::Profiler.disable
+    assert_equal(false, GC::Profiler.enabled?)
+  ensure
+    GC::Profiler.disable
+  end
 end

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r36593


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/