Page MenuHome
Files F18639

warning-fixes-02052012.patch
Public
Actions

warning-fixes-02052012.patch
View Options

Index: extern/carve/lib/intersect.cpp
===================================================================
--- extern/carve/lib/intersect.cpp (revision 46215)
+++ extern/carve/lib/intersect.cpp (working copy)
@@ -774,7 +774,7 @@
void carve::csg::CSG::generateVertexFaceIntersections(carve::mesh::MeshSet<3>::face_t *a,
const std::vector<carve::mesh::MeshSet<3>::face_t *> &b) {
- carve::mesh::MeshSet<3>::edge_t *ea, *eb;
+ carve::mesh::MeshSet<3>::edge_t *eb;
for (size_t i = 0; i < b.size(); ++i) {
carve::mesh::MeshSet<3>::face_t *t = b[i];
@@ -806,7 +806,7 @@
void carve::csg::CSG::generateEdgeFaceIntersections(carve::mesh::MeshSet<3>::face_t *a,
const std::vector<carve::mesh::MeshSet<3>::face_t *> &b) {
- carve::mesh::MeshSet<3>::edge_t *ea, *eb;
+ carve::mesh::MeshSet<3>::edge_t *eb;
for (size_t i = 0; i < b.size(); ++i) {
carve::mesh::MeshSet<3>::face_t *t = b[i];
Index: extern/Eigen3/Eigen/src/Geometry/OrthoMethods.h
===================================================================
--- extern/Eigen3/Eigen/src/Geometry/OrthoMethods.h (revision 46215)
+++ extern/Eigen3/Eigen/src/Geometry/OrthoMethods.h (working copy)
@@ -43,8 +43,8 @@
// Note that there is no need for an expression here since the compiler
// optimize such a small temporary very well (even within a complex expression)
- const typename internal::nested<Derived,2>::type lhs(derived());
- const typename internal::nested<OtherDerived,2>::type rhs(other.derived());
+ typename internal::nested<const Derived,2>::type lhs(derived());
+ typename internal::nested<const OtherDerived,2>::type rhs(other.derived());
return typename cross_product_return_type<OtherDerived>::type(
internal::conj(lhs.coeff(1) * rhs.coeff(2) - lhs.coeff(2) * rhs.coeff(1)),
internal::conj(lhs.coeff(2) * rhs.coeff(0) - lhs.coeff(0) * rhs.coeff(2)),
Index: extern/libmv/third_party/gflags/util.h
===================================================================
--- extern/libmv/third_party/gflags/util.h (revision 46215)
+++ extern/libmv/third_party/gflags/util.h (working copy)
@@ -256,7 +256,9 @@
#define strtouint64 _strtoui64
#define strcasecmp _stricmp
#define va_copy(dst, src) ((dst) = (src))
+#undef strto64
#define strto64 _strtoi64
+#undef strtou64
#define strtou64 _strtoui64
#else
inline void MakeTmpdir(std::string* path) {
Index: intern/smoke/intern/VEC3.h
===================================================================
--- intern/smoke/intern/VEC3.h (revision 46215)
+++ intern/smoke/intern/VEC3.h (working copy)
@@ -8,12 +8,24 @@
#ifndef BASICVECTOR_H
#define BASICVECTOR_H
+#ifdef _MSC_VER
+#define _USE_MATH_DEFINES 1
+#endif
+
#include <math.h>
#include <stdlib.h>
#include <stdio.h>
#include <iostream>
#include <sstream>
+#ifdef _MSC_VER
+#if _MSC_VER >= 1300
+#include <float.h>
+#endif
+#else
+#include <float.h>
+#endif
+
// use which fp-precision? 1=float, 2=double
#ifndef FLOATINGPOINT_PRECISION
#if DDF_DEBUG==1
@@ -30,15 +42,12 @@
#if FLOATINGPOINT_PRECISION==1
typedef float Real;
-#define FP_REAL_MAX __FLT_MAX__
#define VECTOR_EPSILON (1e-5f)
#else
typedef double Real;
-#define FP_REAL_MAX __DBL_MAX__
#define VECTOR_EPSILON (1e-10)
#endif
-
// hardcoded limits for now...
// for e.g. MSVC compiler...
// some of these defines can be needed
@@ -67,12 +76,15 @@
#endif
#ifndef M_PI
-# define M_PI 3.1415926536
-# define M_E 2.7182818284
+#define M_PI 3.1415926536
#endif
+#ifndef M_E
+#define M_E 2.7182818284
+#endif
+
namespace BasicVector {
Index: source/blender/quicktime/apple/quicktime_import.c
===================================================================
--- source/blender/quicktime/apple/quicktime_import.c (revision 46215)
+++ source/blender/quicktime/apple/quicktime_import.c (working copy)
@@ -136,7 +136,7 @@
#ifdef _WIN32
-char *get_valid_qtname(char *name)
+char *get_valid_qtname(const char *name)
{
TCHAR Buffer[MAX_PATH];
DWORD dwRet;
Index: source/blender/quicktime/quicktime_import.h
===================================================================
--- source/blender/quicktime/quicktime_import.h (revision 46215)
+++ source/blender/quicktime/quicktime_import.h (working copy)
@@ -61,7 +61,7 @@
#endif /* _WIN32 _ */
-char *get_valid_qtname(char *name);
+char *get_valid_qtname(const char *name);
// quicktime movie import functions
Index: source/gameengine/VideoTexture/VideoFFmpeg.cpp
===================================================================
--- source/gameengine/VideoTexture/VideoFFmpeg.cpp (revision 46215)
+++ source/gameengine/VideoTexture/VideoFFmpeg.cpp (working copy)
@@ -588,7 +588,7 @@
AVInputFormat *inputFormat;
AVFormatParameters formatParams;
AVRational frameRate;
- char *p, filename[28], rateStr[20];
+ char filename[28], rateStr[20];
do_init_ffmpeg();
@@ -630,6 +630,8 @@
return;
if (file && strncmp(file, "/dev", 4) == 0)
{
+ char *p;
+
// user does not specify a driver
strncpy(filename, file, sizeof(filename));
filename[sizeof(filename)-1] = 0;

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
b6/9c/8c76ec7ca04f2ebf63f6134ba729

Event Timeline