Mercurial > hg > octave-nkf

comparison src/bitfcns.cc @ 11586:12df7854fa7c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
strip trailing whitespace from source files
author John W. Eaton <jwe@octave.org>
date Thu, 20 Jan 2011 17:24:59 -0500
parents fd0a3ac60b0e
children 7a5aacf65f81
comparison
equal deleted inserted replaced
11585:1473d0cf86d2 11586:12df7854fa7c
442 int nargin = args.length (); 442 int nargin = args.length ();
443 443
444 if (nargin == 2 || nargin == 3) 444 if (nargin == 2 || nargin == 3)
445 { 445 {
446 int nbits = 64; 446 int nbits = 64;
447 447
448 NDArray n = args(1).array_value (); 448 NDArray n = args(1).array_value ();
449 449
450 if (error_state) 450 if (error_state)
451 error ("bitshift: expecting integer as second argument"); 451 error ("bitshift: expecting integer as second argument");
452 else 452 else
458 if (args(2).numel () > 1) 458 if (args(2).numel () > 1)
459 error ("bitshift: expecting scalar integer as third argument"); 459 error ("bitshift: expecting scalar integer as third argument");
460 else 460 else
461 { 461 {
462 nbits = args(2).int_value (); 462 nbits = args(2).int_value ();
463 463
464 if (error_state) 464 if (error_state)
465 error ("bitshift: expecting integer as third argument"); 465 error ("bitshift: expecting integer as third argument");
466 else if (nbits < 0) 466 else if (nbits < 0)
467 error ("bitshift: number of bits to mask must be positive"); 467 error ("bitshift: number of bits to mask must be positive");
468 } 468 }