Fix some warnings

[lyx.git] / src / support / trivstring.cpp

diff --git a/src/support/trivstring.cpp b/src/support/trivstring.cpp
index 6fda216674ebb33c1738c26540ad389cf774b370..d2325cbbabf37a4025e4e858f4b39a158a6efb4f 100644 (file)
--- a/src/support/trivstring.cpp
+++ b/src/support/trivstring.cpp
@@ -16,6 +16,7 @@
 #ifdef STD_STRING_USES_COW
 #include <algorithm>
 #include <ostream>
+#include <stdexcept>
 
 using namespace std;
 
@@ -31,16 +32,34 @@ trivial_string<Char>::trivial_string(trivial_string const & that) : size_(that.s
        else if (size_ > 0) {
                data_ = new Char[size_ + 1];
                copy(that.data_, that.data_ + size_ + 1, data_);
+       } else {
+               // Happens only for really big Char types
+               data_ = 0;
+       }
+}
+
+
+template<typename Char>
+trivial_string<Char>::trivial_string(Char const * that, size_t n) : size_(n)
+{
+       if (use_sso()) {
+               copy(that, that + size_, data_sso());
+               data_sso()[size_] = '\0';
+       } else if (size_ > 0) {
+               data_ = new Char[size_ + 1];
+               copy(that, that + size_, data_);
+               data_[size_] = '\0';
+       } else {
+               // Happens only for really big Char types
+               data_ = 0;
        }
-       // else Happens only for really big Char types
 }
 
 
 template trivial_string<char>::trivial_string(string const &);
 template trivial_string<char_type>::trivial_string(docstring const &);
 template<typename Char>
-trivial_string<Char>::trivial_string(
-               basic_string<Char, char_traits<Char>, allocator<Char> > const & that)
+trivial_string<Char>::trivial_string(_stdstring const & that)
        : size_(that.length())
 {
        if (use_sso()) {
@@ -50,8 +69,10 @@ trivial_string<Char>::trivial_string(
                data_ = new Char[size_ + 1];
                copy(that.begin(), that.end(), data_);
                data_[size_] = '\0';
+       } else {
+               // Happens only for really big Char types
+               data_ = 0;
        }
-       // else Happens only for really big Char types
 }
 
 
@@ -86,7 +107,7 @@ template trivial_string<char_type> &
 trivial_string<char_type>::operator=(docstring const &);
 template<typename Char>
 trivial_string<Char> &
-trivial_string<Char>::operator=(basic_string<Char, char_traits<Char>, allocator<Char> > const & that)
+trivial_string<Char>::operator=(_stdstring const & that)
 {
        if (!use_sso())
                delete[] data_;
@@ -138,19 +159,31 @@ int trivial_string<Char>::compare(trivial_string const & other) const
 }
 
 
+template trivial_string<char> trivial_string<char>::substr(size_t, size_t) const;
+template trivial_string<char_type> trivial_string<char_type>::substr(size_t, size_t) const;
+template<typename Char>
+trivial_string<Char> trivial_string<Char>::substr(size_t pos, size_t n) const
+{
+       if (pos > length())
+               throw out_of_range("trivial_string::substr");
+       if (n == _stdstring::npos)
+               n = length() - pos;
+       size_t const l = min(pos + n, length());
+       return trivial_string(c_str() + pos, l - pos);
+}
+
+
 template trivial_string<char>::operator string() const;
 template trivial_string<char_type>::operator docstring() const;
 template<typename Char>
-trivial_string<Char>::operator basic_string<Char, char_traits<Char>, allocator<Char> >() const
+trivial_string<Char>::operator _stdstring() const
 {
        if (use_sso())
-               return basic_string<Char, char_traits<Char>, allocator<Char> >(
-                               data_sso(), size_);
+               return _stdstring(data_sso(), size_);
        if (size_ > 0)
-               return basic_string<Char, char_traits<Char>, allocator<Char> >(
-                               data_, size_);
+               return _stdstring(data_, size_);
        // Happens only for really big Char types
-       return basic_string<Char, char_traits<Char>, allocator<Char> >();
+       return _stdstring();
 }
 
 
@@ -168,6 +201,14 @@ template<typename Char> Char const * trivial_string<Char>::c_str() const
 }
 
 
+template char trivial_string<char>::operator[](size_t) const;
+template char_type trivial_string<char_type>::operator[](size_t) const;
+template <typename Char> Char trivial_string<Char>::operator[](size_t i) const
+{
+       return c_str()[i];
+}
+
+
 template bool operator<(trivial_string<char> const &,
                         trivial_string<char> const &);
 template bool operator<(trivial_string<char_type> const &,
@@ -186,7 +227,7 @@ template bool operator==(trivial_string<char_type> const &,
 template <typename Char>
 bool operator==(trivial_string<Char> const & lhs, trivial_string<Char> const & rhs)
 {
-       return lhs.compare(rhs) == 0; 
+       return lhs.compare(rhs) == 0;
 }
 
 
@@ -195,7 +236,7 @@ template bool operator==(trivial_string<char_type> const &, char_type const *);
 template <typename Char>
 bool operator==(trivial_string<Char> const & lhs, Char const * rhs)
 {
-       return lhs.compare(trivial_string<Char>(rhs)) == 0; 
+       return lhs.compare(trivial_string<Char>(rhs)) == 0;
 }
 
 
@@ -204,7 +245,7 @@ template bool operator==(char_type const *, trivial_string<char_type> const &);
 template <typename Char>
 bool operator==(Char const * lhs, trivial_string<Char> const & rhs)
 {
-       return rhs.compare(trivial_string<Char>(lhs)) == 0; 
+       return rhs.compare(trivial_string<Char>(lhs)) == 0;
 }