Fix a few naming conflicts in LinAlg/BLAS. Fixes #14268.

JuliaLang · Dec 8, 2015 · befbcec · marius311 · Apr 18, 2017 · andreasnoack
1 parent 55fd7b1
commit befbcec
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/base/linalg.jl b/base/linalg.jl
@@ -212,6 +212,7 @@ include("linalg/exceptions.jl")
 include("linalg/generic.jl")
 
 include("linalg/blas.jl")
+import .BLAS: gemv! # consider renaming gemv! in matmul
 include("linalg/matmul.jl")
 include("linalg/lapack.jl")
 

diff --git a/base/linalg/blas.jl b/base/linalg/blas.jl
@@ -2,15 +2,13 @@
 
 module BLAS
 
-import ..axpy!
 import Base: copy!, blasfunc
+import Base.LinAlg: axpy!, dot
 
 export
 # Level 1
     asum,
-    axpy!,
     blascopy!,
-    dot,
     dotc,
     dotu,
     scal!,