Permalink
Browse files

Compilation under Visual C++ 2010

Got rid of compilation errors and warnings.
  • Loading branch information...
1 parent f2bb335 commit 4b7b605bc18f9db9529c648ee76d2c872409a396 @ddemidov committed Jun 11, 2012
Showing with 166 additions and 134 deletions.
  1. +6 −2 examples/benchmark.cpp
  2. +99 −102 examples/utests.cpp
  3. +5 −1 vexcl/devlist.hpp
  4. +4 −0 vexcl/profiler.hpp
  5. +8 −1 vexcl/reduce.hpp
  6. +10 −5 vexcl/spmat.hpp
  7. +7 −3 vexcl/util.hpp
  8. +23 −20 vexcl/vector.hpp
  9. +4 −0 vexcl/vexcl.hpp
View
@@ -14,6 +14,10 @@ typedef double real;
#define BENCHMARK_SPMAT
#define BENCHMARK_CPU
+#ifdef WIN32
+# pragma warning(disable : 4267)
+#endif
+
//---------------------------------------------------------------------------
std::pair<double,double> benchmark_vector(
const std::vector<cl::CommandQueue> &queue, profiler &prof
@@ -304,8 +308,8 @@ std::pair<double,double> benchmark_spmv_ccsr(
col[0] = 0;
val[0] = 1;
- col[1] = -(n * n);
- col[2] = -n;
+ col[1] = -static_cast<int>(n * n);
+ col[2] = -static_cast<int>(n);
col[3] = -1;
col[4] = 0;
col[5] = 1;
Oops, something went wrong.

0 comments on commit 4b7b605

Please sign in to comment.