address upstream conflict

Merge branch 'develop' of https://github.com/cdeterman/gpuR into develop Conflicts: R/wrappers-utils.R
cdeterman · Jul 22, 2016 · c1b8891 · c1b8891
2 parents 3416277 + 46305a4
commit c1b8891
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/R/wrappers-utils.R b/R/wrappers-utils.R
@@ -198,8 +198,8 @@ cpuInfo <- function(platform_idx=NULL, device_idx=NULL){
         if(length(idx) == 0){
             stop("No CPUs found in intialized contexts")
         }else{
-            platform_idx <- contexts$platform_index[idx[1]]
-            device_idx <- contexts$device_index[idx[1]]
+            platform_idx <- contexts$platform_index[idx[1]] + 1
+            device_idx <- contexts$device_index[idx[1]] + 1
         }
     }