diff --git a/config.h b/config.h index 8a26dd0a..db594544 100644 --- a/config.h +++ b/config.h @@ -449,7 +449,7 @@ NAMESPACE_END #endif // how to declare class constants -#if (defined(_MSC_VER) && _MSC_VER <= 1300) || defined(__INTEL_COMPILER) +#if (defined(_MSC_VER) && _MSC_VER <= 1300) || defined(__INTEL_COMPILER) || defined(__BORLANDC__) # define CRYPTOPP_CONSTANT(x) enum {x}; #else # define CRYPTOPP_CONSTANT(x) static const int x; diff --git a/seckey.h b/seckey.h index 287d38a9..a08eedee 100644 --- a/seckey.h +++ b/seckey.h @@ -80,7 +80,10 @@ protected: //! \throws InvalidRounds if the number of rounds are invalid inline void ThrowIfInvalidRounds(int rounds, const Algorithm *alg) { -#if (M==INT_MAX) // Coverity and result_independent_of_operands +#if defined(__BORLANDC__) + if (rounds < MIN_ROUNDS || rounds > MAX_ROUNDS) + throw InvalidRounds(alg ? alg->AlgorithmName() : std::string("VariableRounds"), rounds); +#elif (M==INT_MAX) // Coverity and result_independent_of_operands if (rounds < MIN_ROUNDS) throw InvalidRounds(alg ? alg->AlgorithmName() : "VariableRounds", rounds); #else