Merge branch 'master' of git://factorcode.org/git/factor

db4
Slava Pestov 2010-02-22 18:30:50 +13:00
commit 708c752f66
3 changed files with 10 additions and 10 deletions

View File

@ -55,8 +55,8 @@ TUPLE: ConnectEx-args port
[ lpOverlapped>> ] [ lpOverlapped>> ]
[ ptr>> ] [ ptr>> ]
} cleave } cleave
"int" int
{ "SOCKET" "sockaddr_in*" "int" "PVOID" "DWORD" "LPDWORD" "void*" } { SOCKET void* int PVOID DWORD LPDWORD void* }
"stdcall" alien-indirect drop "stdcall" alien-indirect drop
winsock-error-string [ throw ] when* ; inline winsock-error-string [ throw ] when* ; inline

View File

@ -305,10 +305,10 @@ M: MATRIX pprint-delims
: define-complex-blas-matrix ( TYPE T -- ) : define-complex-blas-matrix ( TYPE T -- )
"U" "C" (define-blas-matrix) ; "U" "C" (define-blas-matrix) ;
"float" "S" define-real-blas-matrix float "S" define-real-blas-matrix
"double" "D" define-real-blas-matrix double "D" define-real-blas-matrix
"complex-float" "C" define-complex-blas-matrix complex-float "C" define-complex-blas-matrix
"complex-double" "Z" define-complex-blas-matrix complex-double "Z" define-complex-blas-matrix
>> >>

View File

@ -238,10 +238,10 @@ M: VECTOR Vasum
[ drop (define-blas-vector) ] [ drop (define-blas-vector) ]
[ (define-complex-blas-vector) ] 3bi ; [ (define-complex-blas-vector) ] 3bi ;
"float" "S" define-real-blas-vector float "S" define-real-blas-vector
"double" "D" define-real-blas-vector double "D" define-real-blas-vector
"complex-float" "C" "S" define-complex-blas-vector complex-float "C" "S" define-complex-blas-vector
"complex-double" "Z" "D" define-complex-blas-vector complex-double "Z" "D" define-complex-blas-vector
>> >>