diff options
-rw-r--r-- | intern/iksolver/intern/TNT/vec.h | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/exotic.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/intern/iksolver/intern/TNT/vec.h b/intern/iksolver/intern/TNT/vec.h index 2aff4d59628..d4f7c2f4021 100644 --- a/intern/iksolver/intern/TNT/vec.h +++ b/intern/iksolver/intern/TNT/vec.h @@ -296,11 +296,11 @@ std::ostream& operator<<(std::ostream &s, const Vector<T> &A) { Subscript N=A.dim(); - s << N << endl; + s << N << std::endl; for (Subscript i=0; i<N; i++) - s << A[i] << " " << endl; - s << endl; + s << A[i] << " " << std::endl; + s << std::endl; return s; } diff --git a/source/blender/blenkernel/intern/exotic.c b/source/blender/blenkernel/intern/exotic.c index 57c8a56f2be..dcc9575d8cb 100644 --- a/source/blender/blenkernel/intern/exotic.c +++ b/source/blender/blenkernel/intern/exotic.c @@ -1192,8 +1192,8 @@ static int iv_finddata(struct IvNode *iv, char *field, int fieldnr) /* atof doesn't stop after the first float * in a long string at Windows... so we copy * the float to a new string then atof... */ - - i= (long)(strpbrk(cpa, ", \n")-cpa); + char *cpa_temp = strpbrk(cpa, ", \n"); + i = cpa_temp - cpa; if (i>63) *fp= 0.0; else { |