Merge pull request #67 from HNO3/fix-column-conversion-string

Fix implicit conversion to std::string of Column class for Visual C++ 2015
This commit is contained in:
Sébastien Rombauts 2015-09-23 08:25:18 +02:00
commit cc20878146

View File

@ -187,10 +187,10 @@ public:
return getBlob(); return getBlob();
} }
#ifdef __GNUC__ #if !(defined(_MSC_VER) && _MSC_VER < 1900)
// NOTE : the following is required by GCC and Clang to cast a Column result in a std::string // NOTE : the following is required by GCC and Clang to cast a Column result in a std::string
// (error: conversion from SQLite::Column to non-scalar type std::string {aka std::basic_string<char>}) // (error: conversion from SQLite::Column to non-scalar type std::string {aka std::basic_string<char>})
// but is not working under Microsoft Visual Studio 2010 and 2012 // but is not working under Microsoft Visual Studio 2010, 2012 and 2013
// (error C2440: 'initializing' : cannot convert from 'SQLite::Column' to 'std::basic_string<_Elem,_Traits,_Ax>' // (error C2440: 'initializing' : cannot convert from 'SQLite::Column' to 'std::basic_string<_Elem,_Traits,_Ax>'
// [...] constructor overload resolution was ambiguous) // [...] constructor overload resolution was ambiguous)
/// Inline cast operator to std::string /// Inline cast operator to std::string