summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--ext/bigdecimal/lib/bigdecimal/newton.rb2
-rw-r--r--lib/tempfile.rb2
3 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index bd53310101..7c79dc684d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,18 @@
+Sat Jun 10 18:02:40 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/bigdecimal/lib/bigdecimal/newton.rb (Newton::nlsolve): typo
+ fixed: raize -> raise. [ruby-talk:196608]
+
Thu Jun 8 14:19:17 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.[ch] (rb_w32_read, rb_w32_write): new functions.
use recv() and send() when fd is socket. fixed: [ruby-dev:28694]
+Wed Jun 7 16:22:51 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/tempfile.rb (Tempfile::make_tmpname): put dot between
+ basename and pid. [ruby-talk:196272]
+
Wed Jun 7 14:53:04 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (errmap): add some winsock errors.
@@ -32,6 +42,7 @@ Wed Jun 7 10:45:10 2006 NAKAMURA Usaku <usa@ruby-lang.org>
instead of socket().
ifs socket support is backported from trunk.
+>>>>>>> 1.2673.2.1622
Wed Jun 7 09:14:44 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_call0): binding for the return event hook should have
diff --git a/ext/bigdecimal/lib/bigdecimal/newton.rb b/ext/bigdecimal/lib/bigdecimal/newton.rb
index f88fabe5dc..f1a55da789 100644
--- a/ext/bigdecimal/lib/bigdecimal/newton.rb
+++ b/ext/bigdecimal/lib/bigdecimal/newton.rb
@@ -60,7 +60,7 @@ module Newton
begin
fact *= p5
if fact < minfact then
- raize "Failed to reduce function values."
+ raise "Failed to reduce function values."
end
for i in 0...n do
x[i] = xs[i] - dx[i]*fact
diff --git a/lib/tempfile.rb b/lib/tempfile.rb
index 0e44e00d0e..b885444b15 100644
--- a/lib/tempfile.rb
+++ b/lib/tempfile.rb
@@ -67,7 +67,7 @@ class Tempfile < DelegateClass(File)
end
def make_tmpname(basename, n)
- sprintf('%s%d.%d', basename, $$, n)
+ sprintf('%s.%d.%d', basename, $$, n)
end
private :make_tmpname