X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Ftrivstring.cpp;h=d2325cbbabf37a4025e4e858f4b39a158a6efb4f;hb=cf14e814124ccbc8155fa1dde98d03be319c0e87;hp=fad1565c6a621cb4182b75eef9b57e00cb0d1690;hpb=0af021878b66dedda445d120b4b81a5568195bea;p=lyx.git

diff --git a/src/support/trivstring.cpp b/src/support/trivstring.cpp
index fad1565c6a..d2325cbbab 100644
--- a/src/support/trivstring.cpp
+++ b/src/support/trivstring.cpp
@@ -59,8 +59,7 @@ trivial_string<Char>::trivial_string(Char const * that, size_t n) : size_(n)
 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()) {
@@ -108,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_;
@@ -167,8 +166,8 @@ 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 == basic_string<Char, char_traits<Char>, allocator<Char> >::npos)
-		n = length() - pos; 
+	if (n == _stdstring::npos)
+		n = length() - pos;
 	size_t const l = min(pos + n, length());
 	return trivial_string(c_str() + pos, l - pos);
 }
@@ -177,19 +176,19 @@ trivial_string<Char> trivial_string<Char>::substr(size_t pos, size_t n) const
 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();
 }
 
 
+template char const * trivial_string<char>::c_str() const;
+template char_type const * trivial_string<char_type>::c_str() const;
 template<typename Char> Char const * trivial_string<Char>::c_str() const
 {
 	if (use_sso())
@@ -228,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;
 }
 
 
@@ -237,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;
 }
 
 
@@ -246,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;
 }