- Fixed bug on Ubuntu whereby it wants std::string::size_type rather than unsigned int.
This commit is contained in:
@@ -308,7 +308,7 @@ int convertDuration (std::string& input)
|
|||||||
std::string expandPath (const std::string& in)
|
std::string expandPath (const std::string& in)
|
||||||
{
|
{
|
||||||
std::string copy = in;
|
std::string copy = in;
|
||||||
unsigned int tilde;
|
std::string::size_type tilde;
|
||||||
|
|
||||||
if ((tilde = copy.find ("~/")) != std::string::npos)
|
if ((tilde = copy.find ("~/")) != std::string::npos)
|
||||||
{
|
{
|
||||||
@@ -317,7 +317,7 @@ std::string expandPath (const std::string& in)
|
|||||||
}
|
}
|
||||||
else if ((tilde = copy.find ("~")) != std::string::npos)
|
else if ((tilde = copy.find ("~")) != std::string::npos)
|
||||||
{
|
{
|
||||||
unsigned int slash;
|
std::string::size_type slash;
|
||||||
if ((slash = copy.find ("/", tilde)) != std::string::npos)
|
if ((slash = copy.find ("/", tilde)) != std::string::npos)
|
||||||
{
|
{
|
||||||
std::string name = copy.substr (tilde + 1, slash - tilde - 1);
|
std::string name = copy.substr (tilde + 1, slash - tilde - 1);
|
||||||
|
|||||||
Reference in New Issue
Block a user