summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/syck/rubyext.c6
-rw-r--r--lib/.document1
-rw-r--r--sprintf.c6
4 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index f4c7d1924c..d3e9837e34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep 16 12:02:12 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/syck/rubyext.c (syck_resolver_transfer): remove C++ style
+ comment (//). [ruby-core:05793]
+
Fri Sep 16 00:14:14 2005 NAKAMURA, Hiroshi <nakahiro@sarion.co.jp>
* test/logger/test_logger.rb: unintentionally overwritten changes by
diff --git a/ext/syck/rubyext.c b/ext/syck/rubyext.c
index 27e7adaa54..878f326803 100644
--- a/ext/syck/rubyext.c
+++ b/ext/syck/rubyext.c
@@ -1120,8 +1120,10 @@ syck_resolver_transfer( self, type, val )
}
else if ( rb_cObject == target_class && subclass_v == Qnil )
{
- // StringValue(subclass);
- // printf( "No class: %s\n", RSTRING(subclass)->ptr );
+ /*
+ StringValue(subclass);
+ printf( "No class: %s\n", RSTRING(subclass)->ptr );
+ */
target_class = cYObject;
type = subclass;
subclass = cYObject;
diff --git a/lib/.document b/lib/.document
index e93b0e63e2..4e89de07a7 100644
--- a/lib/.document
+++ b/lib/.document
@@ -30,4 +30,5 @@ test/unit.rb
thread.rb
thwait.rb
time.rb
+uri
yaml.rb
diff --git a/sprintf.c b/sprintf.c
index 9f4d8e404c..dabdc93e7e 100644
--- a/sprintf.c
+++ b/sprintf.c
@@ -146,7 +146,7 @@ sign_bits(base, p)
*
* Flag | Applies to | Meaning
* ---------+--------------+-----------------------------------------
- * space | bdeEfgGioxXu | Leave a space at the start of
+ * space | bdeEfgGiouxX | Leave a space at the start of
* | | positive numbers.
* ---------+--------------+-----------------------------------------
* (digit)$ | all | Specifies the absolute argument number
@@ -162,11 +162,11 @@ sign_bits(base, p)
* | | point to be added, even if no digits follow.
* | | For `g' and 'G', do not remove trailing zeros.
* ---------+--------------+-----------------------------------------
- * + | bdeEfgGioxXu | Add a leading plus sign to positive numbers.
+ * + | bdeEfgGiouxX | Add a leading plus sign to positive numbers.
* ---------+--------------+-----------------------------------------
* - | all | Left-justify the result of this conversion.
* ---------+--------------+-----------------------------------------
- * 0 (zero) | all | Pad with zeros, not spaces.
+ * 0 (zero) | bdeEfgGiouxX | Pad with zeros, not spaces.
* ---------+--------------+-----------------------------------------
* * | all | Use the next argument as the field width.
* | | If negative, left-justify the result. If the