Skip to content

Commit cc20878

Browse files
committed
Merge pull request SRombauts#67 from HNO3/fix-column-conversion-string
Fix implicit conversion to std::string of Column class for Visual C++ 2015
2 parents de2fd21 + d7603db commit cc20878

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

include/SQLiteCpp/Column.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,10 @@ class Column
187187
return getBlob();
188188
}
189189

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

0 commit comments

Comments
 (0)