[arrayfire] 226/248: Merge branch 'devel' of https://github.com/shehzan10/arrayfire into unified_checks

[Ghislain Vaillant]

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

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

commit 4242378ba83ea1332d9ee31a5eb620d614e9317c
Merge: 6e19054 15411eb
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date:   Tue Nov 10 15:19:55 2015 -0500

    Merge branch 'devel' of https://github.com/shehzan10/arrayfire into unified_checks
    
    Conflicts:
    	include/af/defines.h

 include/af/backend.h        | 12 ++++++++++++
 include/af/defines.h        | 38 +++++++++++++++++++++++++++++++++++++-
 include/af/graphics.h       | 13 ++++++++++++-
 include/af/index.h          | 10 ++++++++++
 include/af/traits.hpp       |  4 ++++
 src/api/c/data.cpp          | 13 +++----------
 src/api/c/device.cpp        |  7 +++++--
 src/api/c/sift.cpp          |  4 ++--
 src/backend/cpu/sift.cpp    |  4 ++--
 src/backend/cuda/sift.cu    |  4 ++--
 src/backend/opencl/sift.cpp |  4 ++--
 11 files changed, 91 insertions(+), 22 deletions(-)

diff --cc include/af/backend.h
index d402eed,2d2b17c..1fe7567
--- a/include/af/backend.h
+++ b/include/af/backend.h
@@@ -37,16 -42,8 +42,17 @@@ AFAPI af_err af_get_backend_count(unsig
     \ingroup unified_func_getavailbackends
   */
  AFAPI af_err af_get_available_backends(int* backends);
+ #endif
  
 +/**
 +   \param[out] backend takes one of the values of enum \ref af_backend
 +   \param[in] in is the array who's backend is to be queried
 +   \returns \ref af_err error code
 +
 +   \ingroup unified_func_getbackendid
 + */
 +AFAPI af_err af_get_backend_id(af_backend *backend, const af_array in);
 +
  #ifdef __cplusplus
  }
  #endif
@@@ -54,8 -51,8 +60,9 @@@
  #ifdef __cplusplus
  namespace af
  {
 +class array;
  
+ #if AF_API_VERSION >= 32
  /**
     \param[in] bknd takes one of the values of enum \ref af_backend
  
@@@ -76,14 -77,7 +87,15 @@@ AFAPI unsigned getBackendCount()
     \ingroup unified_func_getavailbackends
   */
  AFAPI int getAvailableBackends();
+ #endif
  
 +/**
 +   \param[in] in is the array who's backend is to be queried
 +   \returns \ref af_backend which is the backend on which the array is created
 +
 +   \ingroup unified_func_getbackendid
 + */
 +AFAPI af::Backend getBackendId(const array &in);
 +
  }
  #endif
diff --cc include/af/defines.h
index 911779c,09f6acf..c549313
--- a/include/af/defines.h
+++ b/include/af/defines.h
@@@ -151,9 -153,21 +153,27 @@@ typedef enum 
      AF_ERR_NO_GFX         = 402,
  
      // 500-599 Errors specific to heterogenous API
+ 
+ #if AF_API_VERSION >= 32
+     ///
+     /// There was an error when loading the libraries
+     ///
      AF_ERR_LOAD_LIB       = 501,
+ #endif
+ 
+ #if AF_API_VERSION >= 32
+     ///
+     /// There was an error when loading the symbols
+     ///
      AF_ERR_LOAD_SYM       = 502,
+ #endif
+ 
++#if AF_API_VERSION >= 32
++    ///
++    /// There was a mismatch between the input array and the active backend
++    ///
 +    AF_ERR_ARR_BKND_MISMATCH    = 503,
++#endif
  
      // 900-999 Errors from upstream libraries and runtimes
  

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