* The grand 2005-2006 replace.

[lilypond.git] / flower / include / string.icc

diff --git a/flower/include/string.icc b/flower/include/string.icc
index ed6a5887eeb4801bcf6a33892931cf7c1de77500..52d221b5a0d74abbda527027569729fcafad731b 100644 (file)
--- a/flower/include/string.icc
+++ b/flower/include/string.icc
@@ -3,22 +3,66 @@
 
   source file of the Flower Library
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef STRING_ICC
 #define STRING_ICC
 
+/// for completeness (=handy)
+INLINE
+String
+to_string (String s)
+{
+  return s;
+}
+
+INLINE
+char const *
+String::to_str0 () const
+{
+  return strh_.to_str0 ();
+}
+
+// because char const* also has an operator ==, this is for safety:
+INLINE
+bool
+operator == (String s1, char const *s2)
+{
+  return s1 == String (s2);
+}
+
+INLINE
+bool
+operator == (char const *s1, String s2)
+{
+  return String (s1) == s2;
+}
+
+INLINE
+bool
+operator != (String s1, char const *s2)
+{
+  return s1 != String (s2);
+}
+
+INLINE
+bool
+operator != (char const *s1, String s2)
+{
+  return String (s2) != s1;
+}
+
 INLINE
 char &
-String::operator[] (int n)
+String::operator [] (int n)
 {
   return (char &) strh_[n];
 }
 
 INLINE
 char
-String::operator[] (int n) const
+String::operator [] (int n) const
 {
   return strh_[n];
 }