Merge branch 'MSVC-compiler-warnings'

* MSVC-compiler-warnings:
  Fix some MSVC compiler warnings in the test suite
This commit is contained in:
William S Fulton 2019-03-11 19:06:16 +00:00
commit b1f68b893b
3 changed files with 3 additions and 3 deletions

View file

@ -19,7 +19,7 @@ struct OuterTemplate<1>
struct ConcreteDerived : AbstractBase struct ConcreteDerived : AbstractBase
{ {
ConcreteDerived() : m_value(0.) {} ConcreteDerived() : m_value(0) {}
explicit ConcreteDerived(int value) : m_value(value) {} explicit ConcreteDerived(int value) : m_value(value) {}
virtual bool IsSameAs(const AbstractBase& other) const { virtual bool IsSameAs(const AbstractBase& other) const {

View file

@ -28,7 +28,7 @@
++count; ++count;
return count; return count;
} }
int func4(const char *buf4) size_t func4(const char *buf4)
{ {
return strlen(buf4); return strlen(buf4);
} }

View file

@ -2224,7 +2224,7 @@ public:
n = nn; n = nn;
Parm *parms = Getattr(n, "parms"); Parm *parms = Getattr(n, "parms");
bool varargs = parms ? emit_isvarargs(parms) : 0; int varargs = parms ? emit_isvarargs(parms) : 0;
/* We prefer to explicitly list all parameters of the C function in the /* We prefer to explicitly list all parameters of the C function in the
generated Python code as this makes the function more convenient to use, generated Python code as this makes the function more convenient to use,