[arrayfire] 09/79: Merge pull request #773 from shehzan10/devel

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository arrayfire.

commit 84cd31b0edb5a13e6e482b33edeffbffa878382a
Merge: c047384 3a802f3
Author: Pavan Yalamanchili <pavan at arrayfire.com>
Date:   Thu Jun 4 15:05:15 2015 -0400

    Merge pull request #773 from shehzan10/devel
    
    Build fixes for VS 2015

 CPack.txt                     | 11 ++++++-----
 include/af/defines.h          |  4 ----
 src/backend/ArrayInfo.hpp     |  1 +
 src/backend/cpu/math.cpp      |  1 +
 src/backend/cuda/math.hpp     |  1 +
 src/backend/defines.hpp       | 21 +++++++++++++++++++++
 src/backend/opencl/traits.hpp |  1 +
 test/array.cpp                |  2 +-
 test/constant.cpp             |  2 +-
 test/diagonal.cpp             |  6 +++---
 test/getting_started.cpp      |  2 +-
 test/matrix_manipulation.cpp  |  2 +-
 test/median.cpp               |  2 +-
 13 files changed, 39 insertions(+), 17 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git