Permalink
Browse files

[BALL] Remove BALL_STD_STRING_HAS_RVALUE_REFERENCES check

This feature is available on all supported platforms.
  • Loading branch information...
tkemmer committed Nov 20, 2017
1 parent 8f71dd4 commit c66bb528461e9e3a772a3be8223eb0f560fba7b9

This file was deleted.

Oops, something went wrong.
@@ -162,9 +162,6 @@ ENDIF()
## Check for thread_local
INCLUDE(cmake/BALLConfigThreadLocal.cmake)
## Check for rvalue reference
INCLUDE(cmake/BALLConfigRValueReferences.cmake)
## Check for the presence of C++11 noexcept
INCLUDE(cmake/BALLConfigNoexcept.cmake)
View
@@ -176,9 +176,6 @@
// BALL.
#cmakedefine BALL_HAS_THREAD_LOCAL
// Defines whether the c++ std lib implementation supports rvalue references in the std::string class
#cmakedefine BALL_STD_STRING_HAS_RVALUE_REFERENCES
// Defines whether the compiler supports c++11-style noexcept statements
#cmakedefine BALL_HAS_NOEXCEPT
@@ -154,7 +154,6 @@ namespace BALL
/// Copy constructor
String(const String& s);
#ifdef BALL_STD_STRING_HAS_RVALUE_REFERENCES
/// Move constructor
String(String&& s);
@@ -166,7 +165,6 @@ namespace BALL
/// Move assignment operator for STL string
String& operator=(string&& s);
#endif
/// QString copy constructor
explicit String(const QString& string);
@@ -656,7 +654,6 @@ namespace BALL
BALL_EXPORT
friend String operator + (char c, const String& s);
#ifdef BALL_STD_STRING_HAS_RVALUE_REFERENCES
/// Concatenates two strings
BALL_EXPORT
friend String operator + (String&& s1, const string& s2);
@@ -697,7 +694,6 @@ namespace BALL
/// Concatenates a character and a string
BALL_EXPORT
friend String operator + (char c, String&& s);
#endif
/// Swaps the contents with another String
void swap(String& s);
@@ -1166,10 +1162,8 @@ namespace BALL
///
String& assign(std::initializer_list<char> li);
#ifdef BALL_STD_STRING_HAS_RVALUE_REFERENCES
///
String& assign(string&& str) BALL_NOEXCEPT;
#endif
///
String& insert(size_t pos, const string& str);
@@ -1792,7 +1786,6 @@ namespace BALL
BALL_EXPORT
String operator + (char c, const String& s);
#ifdef BALL_STD_STRING_HAS_RVALUE_REFERENCES
/// Concatenates two strings
BALL_EXPORT
String operator + (String&& s1, const string& s2);
@@ -1836,7 +1829,6 @@ namespace BALL
/// Concatenates a character and a string
BALL_EXPORT
String operator + (char c, String&& s);
#endif
} // namespace BALL
namespace std
@@ -1855,12 +1847,10 @@ namespace std
istream& getline(istream& is, BALL::String& str);
#ifdef BALL_STD_STRING_HAS_RVALUE_REFERENCES
///
istream& getline(istream& is, BALL::String&& str, char delim);
///
istream& getline(istream& is, BALL::String&& str);
#endif
}
//@}
@@ -23,7 +23,6 @@ String::String(const string& s)
{
}
#ifdef BALL_STD_STRING_HAS_RVALUE_REFERENCES
BALL_INLINE
String::String(String&& s)
: str_(std::move(s))
@@ -54,7 +53,6 @@ String& String::operator=(string&& s)
return *this;
}
#endif
BALL_INLINE
String::String(const unsigned char c)
@@ -581,7 +579,6 @@ String operator + (const String& s1, char c)
return result;
}
#ifdef BALL_STD_STRING_HAS_RVALUE_REFERENCES
/// Concatenates two strings
BALL_INLINE
String operator + (String&& s1, const string& s2)
@@ -655,9 +652,7 @@ String operator + (char c, String&& s)
return std::move(s);
}
#endif
BALL_INLINE
BALL_INLINE
void String::destroy()
{
assign("");
@@ -1273,14 +1268,12 @@ String& String::assign(std::initializer_list<char> li)
return *this;
}
#ifdef BALL_STD_STRING_HAS_RVALUE_REFERENCES
BALL_INLINE
String& String::assign(string&& str) BALL_NOEXCEPT
{
str_.assign(str);
return *this;
}
#endif
BALL_INLINE
String& String::insert(size_t pos, const string& str)
@@ -1763,7 +1756,6 @@ istream& getline(istream& is, BALL::String& str)
return getline(is, (string&)str);
}
#ifdef BALL_STD_STRING_HAS_RVALUE_REFERENCES
BALL_INLINE
istream& getline(istream& is, BALL::String&& str, char delim)
{
@@ -1775,6 +1767,5 @@ istream& getline(istream& is, BALL::String&& str)
{
return getline(is, move((string&)str));
}
#endif
} // namespace std

0 comments on commit c66bb52

Please sign in to comment.