mirror of
https://github.com/aseprite/aseprite.git
synced 2025-03-30 04:20:23 +00:00
Fixed convert_to problems.
This commit is contained in:
parent
44b80672f2
commit
99e75b349e
22
third_party/vaca/include/Vaca/String.h
vendored
22
third_party/vaca/include/Vaca/String.h
vendored
@ -78,18 +78,9 @@ namespace Vaca {
|
||||
template<> VACA_DLL std::string convert_to(const Char* const& from);
|
||||
|
||||
template<> inline std::string convert_to(Char* const& from) {
|
||||
// return convert_to<std::string, const Char* const&>(from);
|
||||
return convert_to<std::string, Char*>(from);
|
||||
return convert_to<std::string, const Char*>(from);
|
||||
}
|
||||
|
||||
// template<> inline std::string convert_to(const Char* from) {
|
||||
// return convert_to<std::string, const Char* const&>(from);
|
||||
// }
|
||||
|
||||
// template<> inline std::string convert_to(const Char from[]) {
|
||||
// return convert_to<std::string, const Char* const&>(from);
|
||||
// }
|
||||
|
||||
// Convert to String
|
||||
template<> VACA_DLL String convert_to(const std::string& from);
|
||||
template<> VACA_DLL String convert_to(const int& from);
|
||||
@ -101,18 +92,9 @@ namespace Vaca {
|
||||
template<> VACA_DLL String convert_to(const char* const& from);
|
||||
|
||||
template<> inline String convert_to(char* const& from) {
|
||||
// return convert_to<String, const char* const&>(from);
|
||||
return convert_to<String, char*>(from);
|
||||
return convert_to<String, const char*>(from);
|
||||
}
|
||||
|
||||
// template<> inline String convert_to(const char* from) {
|
||||
// return convert_to<String, const char* const&>(from);
|
||||
// }
|
||||
|
||||
// template<> inline String convert_to(const char from[]) {
|
||||
// return convert_to<String, const char* const&>(from);
|
||||
// }
|
||||
|
||||
// Copy to a raw string
|
||||
VACA_DLL void copy_string_to(const String& src, Char* dest, int size);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user