Skip to content

GitLab

Commit ed9f00ba authored by Davis King's avatar Davis King
Browse files

Fully qualified the char_traits references to avoid name conflicts in 

certain rare cases.
parent 1b23bb13
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
dlib/string/string.h
View file @ ed9f00ba
...@@ -295,7 +295,7 @@ namespace dlib ...@@ -295,7 +295,7 @@ namespace dlib
T temp; T temp;
sin >> temp; sin >> temp;
if (!sin) throw string_cast_error(narrow(str)); if (!sin) throw string_cast_error(narrow(str));
if (sin.get() != char_traits<charT>::eof()) throw string_cast_error(narrow(str)); if (sin.get() != std::char_traits<charT>::eof()) throw string_cast_error(narrow(str));
return temp; return temp;
} }
}; };
...@@ -355,7 +355,7 @@ namespace dlib ...@@ -355,7 +355,7 @@ namespace dlib
else \ else \
sin >> temp; \ sin >> temp; \
if (!sin) throw string_cast_error(narrow(str)); \ if (!sin) throw string_cast_error(narrow(str)); \
if (sin.get() != char_traits<charT>::eof()) throw string_cast_error(narrow(str)); \ if (sin.get() != std::char_traits<charT>::eof()) throw string_cast_error(narrow(str)); \
return temp; \ return temp; \
} \ } \
}; };
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment