/** Convenient define to call the function Blast_PerrorEx. */
#define Blast_PerrorWithLocation(msg, error_code, context) \
-Blast_PerrorEx(msg, error_code, __FILE__, __LINE__, context)
-+Blast_PerrorEx(msg, error_code, 'c++/include/algo/blast/core/blast_message.h', __LINE__, context)
++Blast_PerrorEx(msg, error_code, "c++/include/algo/blast/core/blast_message.h", __LINE__, context)
/** Extended version of Blast_Perror which includes parameters for the file
* name and line number where the error/warning occurred. This function should
#define LOG_WRITE(lg, code, subcode, level, message) \
LOG_Write(lg, code, subcode, level, THIS_MODULE, CORE_CURRENT_FUNCTION, \
- __FILE__, __LINE__, message, 0, 0)
-+ 'c++/include/connect/ncbi_util.h', __LINE__, message, 0, 0)
++ "c++/include/connect/ncbi_util.h", __LINE__, message, 0, 0)
#ifdef LOG_DATA
/* AIX's <pthread.h> defines LOG_DATA to be an integer constant;
#define LOG_DATA(lg, code, subcode, level, data, size, message) \
LOG_Write(lg, code, subcode, level, THIS_MODULE, CORE_CURRENT_FUNCTION, \
- __FILE__, __LINE__, message, data, size)
-+ 'c++/include/connect/ncbi_util.h', __LINE__, message, data, size)
++ "c++/include/connect/ncbi_util.h", __LINE__, message, data, size)
/** Default for THIS_MODULE.
#define JAVA_ABORT(msg) \
{ \
- NcbiCerr << __FILE__ << ": " << NCBI_CURRENT_FUNCTION << ": " msg << endl; \
-+ NcbiCerr << 'c++/include/corelib/impl/ncbi_java.h' << ": " << NCBI_CURRENT_FUNCTION << ": " msg << endl; \
++ NcbiCerr << "c++/include/corelib/impl/ncbi_java.h" << ": " << NCBI_CURRENT_FUNCTION << ": " msg << endl; \
abort(); \
}
--- ncbi-blastplus.orig/c++/include/corelib/ncbidiag.hpp
+++ ncbi-blastplus/c++/include/corelib/ncbidiag.hpp
-@@ -55,7 +55,7 @@
- BEGIN_NCBI_SCOPE
-
- /// Incapsulate compile time information such as
--/// __FILE__, __LINE__, NCBI_MODULE, current function.
-+/// 'c++/include/corelib/ncbidiag.hpp', __LINE__, NCBI_MODULE, current function.
- /// @note
- /// NCBI_MODULE is used only in .cpp files
- /// @sa
@@ -167,7 +167,7 @@
/// @sa
/// CDiagCompileInfo
#define DIAG_COMPILE_INFO \
- NCBI_NS_NCBI::CDiagCompileInfo(__FILE__, \
-+ NCBI_NS_NCBI::CDiagCompileInfo('c++/include/corelib/ncbidiag.hpp', \
++ NCBI_NS_NCBI::CDiagCompileInfo("c++/include/corelib/ncbidiag.hpp", \
__LINE__, \
NCBI_CURRENT_FUNCTION, \
NCBI_MAKE_MODULE(NCBI_MODULE))
boost::unit_test::make_test_case( \
&BOOST_AUTO_TC_INVOKER( test_name ), #test_name, \
- __FILE__, __LINE__ ), \
-+ 'c++/include/corelib/test_boost.hpp', __LINE__ ), \
++ "c++/include/corelib/test_boost.hpp", __LINE__ ), \
::NCBI_NS_NCBI::SNcbiTestTCTimeout< \
BOOST_AUTO_TC_UNIQUE_ID( test_name )>::instance()->value(), \
decorators ); \
do { \
if (! (YESNO)) { \
- SeqDB_FileIntegrityAssert(__FILE__, __LINE__, (#YESNO)); \
-+ SeqDB_FileIntegrityAssert('c++/include/objtools/blast/seqdb_reader/impl/seqdbgeneral.hpp', __LINE__, (#YESNO)); \
++ SeqDB_FileIntegrityAssert("c++/include/objtools/blast/seqdb_reader/impl/seqdbgeneral.hpp", __LINE__, (#YESNO)); \
} \
} while(0)
#define DEBUGDUMP_BPT(name,obj) \
- do {CDebugDumpViewer().Bpt(name,&(obj),__FILE__,__LINE__);} while (0)
-+ do {CDebugDumpViewer().Bpt(name,&(obj),'c++/include/util/ddump_viewer.hpp',__LINE__);} while (0)
++ do {CDebugDumpViewer().Bpt(name,&(obj),"c++/include/util/ddump_viewer.hpp",__LINE__);} while (0)
//---------------------------------------------------------------------------
#define DEFINE_STATIC_ARRAY_MAP(Type, Var, Array) \
- static const Type (Var)((Array), sizeof(Array), __FILE__, __LINE__)
-+ static const Type (Var)((Array), sizeof(Array), 'c++/include/util/static_set.hpp', __LINE__)
++ static const Type (Var)((Array), sizeof(Array), "c++/include/util/static_set.hpp", __LINE__)
#define DEFINE_CLASS_STATIC_ARRAY_MAP(Type, Var, Array) \
- const Type (Var)((Array), sizeof(Array), __FILE__, __LINE__)
-+ const Type (Var)((Array), sizeof(Array), 'c++/include/util/static_set.hpp', __LINE__)
++ const Type (Var)((Array), sizeof(Array), "c++/include/util/static_set.hpp", __LINE__)
#define DEFINE_STATIC_ARRAY_MAP_WITH_COPY(Type, Var, Array) \
- static const Type (Var)((Array), sizeof(Array), __FILE__, __LINE__, \
-+ static const Type (Var)((Array), sizeof(Array), 'c++/include/util/static_set.hpp', __LINE__, \
++ static const Type (Var)((Array), sizeof(Array), "c++/include/util/static_set.hpp", __LINE__, \
NCBI_NS_NCBI::NStaticArray::eCopyWarn_hide)
#define DEFINE_CLASS_STATIC_ARRAY_MAP_WITH_COPY(Type, Var, Array) \
- const Type (Var)((Array), sizeof(Array), __FILE__, __LINE__, \
-+ const Type (Var)((Array), sizeof(Array), 'c++/include/util/static_set.hpp', __LINE__, \
++ const Type (Var)((Array), sizeof(Array), "c++/include/util/static_set.hpp", __LINE__, \
NCBI_NS_NCBI::NStaticArray::eCopyWarn_hide)
#define MBEDTLS_SSL_DEBUG_MSG( level, args ) \
- mbedtls_debug_print_msg( ssl, level, __FILE__, __LINE__, \
-+ mbedtls_debug_print_msg( ssl, level, 'c++/src/connect/mbedtls/mbedtls/debug.h', __LINE__, \
++ mbedtls_debug_print_msg( ssl, level, "c++/src/connect/mbedtls/mbedtls/debug.h", __LINE__, \
MBEDTLS_DEBUG_STRIP_PARENS args )
#define MBEDTLS_SSL_DEBUG_RET( level, text, ret ) \
- mbedtls_debug_print_ret( ssl, level, __FILE__, __LINE__, text, ret )
-+ mbedtls_debug_print_ret( ssl, level, 'c++/src/connect/mbedtls/mbedtls/debug.h', __LINE__, text, ret )
++ mbedtls_debug_print_ret( ssl, level, "c++/src/connect/mbedtls/mbedtls/debug.h", __LINE__, text, ret )
#define MBEDTLS_SSL_DEBUG_BUF( level, text, buf, len ) \
- mbedtls_debug_print_buf( ssl, level, __FILE__, __LINE__, text, buf, len )
-+ mbedtls_debug_print_buf( ssl, level, 'c++/src/connect/mbedtls/mbedtls/debug.h', __LINE__, text, buf, len )
++ mbedtls_debug_print_buf( ssl, level, "c++/src/connect/mbedtls/mbedtls/debug.h", __LINE__, text, buf, len )
#if defined(MBEDTLS_BIGNUM_C)
#define MBEDTLS_SSL_DEBUG_MPI( level, text, X ) \
- mbedtls_debug_print_mpi( ssl, level, __FILE__, __LINE__, text, X )
-+ mbedtls_debug_print_mpi( ssl, level, 'c++/src/connect/mbedtls/mbedtls/debug.h', __LINE__, text, X )
++ mbedtls_debug_print_mpi( ssl, level, "c++/src/connect/mbedtls/mbedtls/debug.h", __LINE__, text, X )
#endif
#if defined(MBEDTLS_ECP_C)
#define MBEDTLS_SSL_DEBUG_ECP( level, text, X ) \
- mbedtls_debug_print_ecp( ssl, level, __FILE__, __LINE__, text, X )
-+ mbedtls_debug_print_ecp( ssl, level, 'c++/src/connect/mbedtls/mbedtls/debug.h', __LINE__, text, X )
++ mbedtls_debug_print_ecp( ssl, level, "c++/src/connect/mbedtls/mbedtls/debug.h", __LINE__, text, X )
#endif
#if defined(MBEDTLS_X509_CRT_PARSE_C)
#define MBEDTLS_SSL_DEBUG_CRT( level, text, crt ) \
- mbedtls_debug_print_crt( ssl, level, __FILE__, __LINE__, text, crt )
-+ mbedtls_debug_print_crt( ssl, level, 'c++/src/connect/mbedtls/mbedtls/debug.h', __LINE__, text, crt )
++ mbedtls_debug_print_crt( ssl, level, "c++/src/connect/mbedtls/mbedtls/debug.h", __LINE__, text, crt )
#endif
#else /* MBEDTLS_DEBUG_C */
/* Hostname should not be empty in any case */
if (hostname.empty()) {
- throw CLBOSException(CDiagCompileInfo(__FILE__, __LINE__), NULL,
-+ throw CLBOSException(CDiagCompileInfo('c++/src/connect/ncbi_lbos_cxx.cpp', __LINE__), NULL,
++ throw CLBOSException(CDiagCompileInfo("c++/src/connect/ncbi_lbos_cxx.cpp", __LINE__), NULL,
CLBOSException::eUnknown,
"Internal error in LBOS Client IP Cache. Please contact developer",
eLBOS_BadRequest);
message << " " << lbos_answer;
}
- throw CLBOSException(CDiagCompileInfo(__FILE__, __LINE__), NULL,
-+ throw CLBOSException(CDiagCompileInfo('c++/src/connect/ncbi_lbos_cxx.cpp', __LINE__), NULL,
++ throw CLBOSException(CDiagCompileInfo("c++/src/connect/ncbi_lbos_cxx.cpp", __LINE__), NULL,
CLBOSException::s_HTTPCodeToEnum(result),
message.str(), result);
}
if (cur_host.empty()) {
ConnNetInfo_Destroy(healthcheck_info);
- throw CLBOSException(CDiagCompileInfo(__FILE__, __LINE__), NULL,
-+ throw CLBOSException(CDiagCompileInfo('c++/src/connect/ncbi_lbos_cxx.cpp', __LINE__), NULL,
++ throw CLBOSException(CDiagCompileInfo("c++/src/connect/ncbi_lbos_cxx.cpp", __LINE__), NULL,
CLBOSException::eInvalidArgs,
NStr::IntToString(eLBOS_InvalidArgs),
eLBOS_InvalidArgs);
}
catch (...) {
- throw CLBOSException(CDiagCompileInfo(__FILE__, __LINE__), NULL,
-+ throw CLBOSException(CDiagCompileInfo('c++/src/connect/ncbi_lbos_cxx.cpp', __LINE__), NULL,
++ throw CLBOSException(CDiagCompileInfo("c++/src/connect/ncbi_lbos_cxx.cpp", __LINE__), NULL,
CLBOSException::eInvalidArgs,
"Could not parse port \"" + port_str +
"\" in section \"" + reg_section + "\"",
if (port_int < 1 || port_int > 65535)
{
- throw CLBOSException(CDiagCompileInfo(__FILE__, __LINE__), NULL,
-+ throw CLBOSException(CDiagCompileInfo('c++/src/connect/ncbi_lbos_cxx.cpp', __LINE__), NULL,
++ throw CLBOSException(CDiagCompileInfo("c++/src/connect/ncbi_lbos_cxx.cpp", __LINE__), NULL,
CLBOSException::eInvalidArgs,
"Invalid server port \"" + port_str +
"\" in section \"" + reg_section + "\"",
if (name == "version" || name == "ip" || name == "port" || name == "check"
|| name == "format" || name == "name") {
- throw CLBOSException(CDiagCompileInfo(__FILE__, __LINE__), NULL,
-+ throw CLBOSException(CDiagCompileInfo('c++/src/connect/ncbi_lbos_cxx.cpp', __LINE__), NULL,
++ throw CLBOSException(CDiagCompileInfo("c++/src/connect/ncbi_lbos_cxx.cpp", __LINE__), NULL,
CLBOSException::eInvalidArgs,
"This name cannot be used for metadata",
eLBOS_InvalidArgs);
}
catch (const CStringException&) {
- throw CLBOSException(CDiagCompileInfo(__FILE__, __LINE__), NULL,
-+ throw CLBOSException(CDiagCompileInfo('c++/src/connect/ncbi_lbos_cxx.cpp', __LINE__), NULL,
++ throw CLBOSException(CDiagCompileInfo("c++/src/connect/ncbi_lbos_cxx.cpp", __LINE__), NULL,
CLBOSException::eInvalidArgs,
"Could not parse string value for SetRate",
eLBOS_InvalidArgs);
}
catch (const CStringException&) {
- throw CLBOSException(CDiagCompileInfo(__FILE__, __LINE__), NULL,
-+ throw CLBOSException(CDiagCompileInfo('c++/src/connect/ncbi_lbos_cxx.cpp', __LINE__), NULL,
++ throw CLBOSException(CDiagCompileInfo("c++/src/connect/ncbi_lbos_cxx.cpp", __LINE__), NULL,
CLBOSException::eInvalidArgs,
"Value in \"rate\" meta parameter cannot "
"be represented as an integer",
{
if (host_type.find_first_of(" \t\n\v\f\r") != string::npos) {
- throw CLBOSException(CDiagCompileInfo(__FILE__, __LINE__), NULL,
-+ throw CLBOSException(CDiagCompileInfo('c++/src/connect/ncbi_lbos_cxx.cpp', __LINE__), NULL,
++ throw CLBOSException(CDiagCompileInfo("c++/src/connect/ncbi_lbos_cxx.cpp", __LINE__), NULL,
CLBOSException::eInvalidArgs,
"This convenience function throws on whitespace characters "
"in \"type\" meta parameter. If you know what you are doing, "
break;
default:
- throw CLBOSException(CDiagCompileInfo(__FILE__, __LINE__), NULL,
-+ throw CLBOSException(CDiagCompileInfo('c++/src/connect/ncbi_lbos_cxx.cpp', __LINE__), NULL,
++ throw CLBOSException(CDiagCompileInfo("c++/src/connect/ncbi_lbos_cxx.cpp", __LINE__), NULL,
CLBOSException::eInvalidArgs, "Unknown EHostType "
"value. If you are sure that a correct value is "
"used, please tell the developer about this issue",
break;
default:
- throw CLBOSException(CDiagCompileInfo(__FILE__, __LINE__), NULL,
-+ throw CLBOSException(CDiagCompileInfo('c++/src/connect/ncbi_lbos_cxx.cpp', __LINE__), NULL,
++ throw CLBOSException(CDiagCompileInfo("c++/src/connect/ncbi_lbos_cxx.cpp", __LINE__), NULL,
CLBOSException::eInvalidArgs, "Unknown ESERV_Type "
"value. If you are sure that a correct value is "
"used, please tell the developer about this issue",
break;
default:
- throw CLBOSException(CDiagCompileInfo(__FILE__, __LINE__), NULL,
-+ throw CLBOSException(CDiagCompileInfo('c++/src/connect/ncbi_lbos_cxx.cpp', __LINE__), NULL,
++ throw CLBOSException(CDiagCompileInfo("c++/src/connect/ncbi_lbos_cxx.cpp", __LINE__), NULL,
CLBOSException::eInvalidArgs, "Unknown EHostType "
"value. If you are sure that a correct value is "
"used, please tell the developer about this issue",
{
if (extra.find_first_of(" \t\n\v\f\r") != string::npos) {
- throw CLBOSException(CDiagCompileInfo(__FILE__, __LINE__), NULL,
-+ throw CLBOSException(CDiagCompileInfo('c++/src/connect/ncbi_lbos_cxx.cpp', __LINE__), NULL,
++ throw CLBOSException(CDiagCompileInfo("c++/src/connect/ncbi_lbos_cxx.cpp", __LINE__), NULL,
CLBOSException::eInvalidArgs,
"This convenience function throws on whitespace characters "
"in \"extra\" meta parameter. If you know what you are doing, "
#define PARAM_TWICE_EXCEPTION(param) \
- throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__), \
-+ throw CMonkeyException(CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__), \
++ throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__), \
NULL, CMonkeyException::e_MonkeyInvalidArgs, \
string("Parameter \"" param "\" is set " \
"twice in [") + GetSection() + "]" + \
return "write";
default:
- throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__),
-+ throw CMonkeyException(CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__),
++ throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
NULL, CMonkeyException::e_MonkeyInvalidArgs,
string("Unknown EMonkeyActionType value"));
}
return "connect()";
default:
- throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__),
-+ throw CMonkeyException(CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__),
++ throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
NULL, CMonkeyException::e_MonkeyInvalidArgs,
string("Unknown EMonkeyActionType value"));
}
if (m_RunPos.find(sock) == m_RunPos.end()) {
throw CMonkeyException(
- CDiagCompileInfo(__FILE__, __LINE__),
-+ CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__),
++ CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
NULL, CMonkeyException::e_MonkeyInvalidArgs,
"The socket provided has not been registered with current rule");
}
} else if (eIOStatus == "eio_invalidarg") {
throw CMonkeyException(
- CDiagCompileInfo(__FILE__, __LINE__),
-+ CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__),
++ CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
NULL, CMonkeyException::e_MonkeyInvalidArgs,
string("Unsupported 'return_status': ") + eIOStatus_in);
} else if (eIOStatus == "eio_interrupt") {
} else {
throw CMonkeyException(
- CDiagCompileInfo(__FILE__, __LINE__),
-+ CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__),
++ CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
NULL, CMonkeyException::e_MonkeyInvalidArgs,
string("Could not parse 'return_status': ") + eIOStatus_in);
}
vector<string> runs_list = s_Monkey_Split(runs, ',');
if (runs_list.size() == 0)
- throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__),
-+ throw CMonkeyException(CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__),
++ throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
NULL, CMonkeyException::e_MonkeyInvalidArgs,
string("Parameter \"runs\" is empty in [")
+ m_Section + "]" +
if (*run.rbegin() != '%') {
throw CMonkeyException(
- CDiagCompileInfo(__FILE__, __LINE__),
-+ CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__),
++ CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
NULL, CMonkeyException::e_MonkeyInvalidArgs,
"Value is not percentage: " + run +
", values have to be either only percentages or "
if (last_step == 0 && step != 1) {
throw CMonkeyException(
- CDiagCompileInfo(__FILE__, __LINE__),
-+ CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__),
++ CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
NULL, CMonkeyException::e_MonkeyInvalidArgs,
"In the string of runs: " + runs + " the first "
"element MUST set value for the first run");
if (*run.rbegin() == '%') {
throw CMonkeyException(
- CDiagCompileInfo(__FILE__, __LINE__),
-+ CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__),
++ CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
NULL, CMonkeyException::e_MonkeyInvalidArgs,
string("Value is percentage: ") + run +
string(", values have to be either only percentages or "
if (m_Runs.size() > 0 && val <= *m_Runs.rbegin()) {
throw CMonkeyException(
- CDiagCompileInfo(__FILE__, __LINE__),
-+ CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__),
++ CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
NULL, CMonkeyException::e_MonkeyInvalidArgs,
string("\"runs\" should contain values in "
"increasing order"));
if (name == "allow") {
if (allow_set) {
- throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__),
-+ throw CMonkeyException(CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__),
++ throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
NULL,
CMonkeyException::e_MonkeyInvalidArgs,
string("Parameter \"allow\" is set "
}
if (!allow_set)
- throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__),
-+ throw CMonkeyException(CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__),
++ throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
NULL, CMonkeyException::e_MonkeyInvalidArgs,
string("Parameter \"allow\" not set in [")
+ GetSection() + "]" +
if (name == "ignore") {
if (ignore_set) {
- throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__),
-+ throw CMonkeyException(CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__),
++ throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
NULL,
CMonkeyException::e_MonkeyInvalidArgs,
string("Parameter \"ignore\" is set "
}
if (!ignore_set) {
- throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__),
-+ throw CMonkeyException(CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__),
++ throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
NULL, CMonkeyException::e_MonkeyInvalidArgs,
string("Parameter \"ignore\" not set in [")
+ GetSection() + "]" +
if (filtered.find_first_of("[]()+^?{}$.*\\") != string::npos) {
throw CMonkeyException(
- CDiagCompileInfo(__FILE__, __LINE__),
-+ CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__),
++ CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
NULL,
CMonkeyException::e_MonkeyInvalidArgs,
exception_message);
else {
throw CMonkeyException(
- CDiagCompileInfo(__FILE__, __LINE__),
-+ CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__),
++ CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
NULL,
CMonkeyException::e_MonkeyInvalidArgs,
exception_message);
<< ". Check config!";
throw CMonkeyException(
- CDiagCompileInfo(__FILE__, __LINE__),
-+ CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__),
++ CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
NULL, CMonkeyException::e_MonkeyInvalidArgs,
ss.str());
}
ss << "Probability below zero for write rule in plan " << m_Name
<< ". Check config!";
- throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__),
-+ throw CMonkeyException(CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__),
++ throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
NULL, CMonkeyException::e_MonkeyInvalidArgs,
ss.str());
}
ss << "Probability below zero for write rule in plan " << m_Name
<< ". Check config!";
- throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__),
-+ throw CMonkeyException(CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__),
++ throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
NULL, CMonkeyException::e_MonkeyInvalidArgs,
ss.str());
}
<< ". Check config!";
throw CMonkeyException(
- CDiagCompileInfo(__FILE__, __LINE__),
-+ CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__),
++ CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
NULL, CMonkeyException::e_MonkeyInvalidArgs,
ss.str());
}
if (sm_HookSwitch == NULL) {
throw CMonkeyException(
- CDiagCompileInfo(__FILE__, __LINE__),
-+ CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__),
++ CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
NULL, CMonkeyException::e_MonkeyInvalidArgs,
"Launch CONNECT_Init() before initializing CMonkey instance");
}
}
if (prob < 0 || prob > 100) {
- throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__),
-+ throw CMonkeyException(CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__),
++ throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
NULL,
CMonkeyException::e_MonkeyInvalidArgs,
"Parameter \"probability\"=" + prob_str
}
catch (const CStringException&) {
- throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__),
-+ throw CMonkeyException(CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__),
++ throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
NULL, CMonkeyException::e_MonkeyInvalidArgs,
"Parameter \"probability\"=" + prob_str
+ " for section [" + monkey_section
if (m_RegisteredTokens.find(token) != m_RegisteredTokens.end()) {
throw CMonkeyException(
- CDiagCompileInfo(__FILE__, __LINE__),
-+ CDiagCompileInfo('c++/src/connect/ncbi_monkey.cpp', __LINE__),
++ CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
NULL, CMonkeyException::e_MonkeyInvalidArgs,
ss.str());
}
_mess.module = THIS_MODULE; \
_mess.func = CORE_CURRENT_FUNCTION; \
- _mess.file = __FILE__; \
-+ _mess.file = 'c++/src/connect/ncbi_priv.h'; \
++ _mess.file = "c++/src/connect/ncbi_priv.h"; \
_mess.line = __LINE__; \
_mess.raw_data = (_raw_data); \
_mess.raw_size = (_raw_size); \
typedef CStaticArraySet<const char*, PNocase_CStr> TCIgnoreCaseQualsSet;
-static const TCIgnoreCaseQualsSet s_IgnoreCaseQualsSet(s_IgnoreCaseQuals, sizeof(s_IgnoreCaseQuals), __FILE__, __LINE__);
-+static const TCIgnoreCaseQualsSet s_IgnoreCaseQualsSet(s_IgnoreCaseQuals, sizeof(s_IgnoreCaseQuals), 'c++/src/objects/seqfeat/BioSource.cpp', __LINE__);
++static const TCIgnoreCaseQualsSet s_IgnoreCaseQualsSet(s_IgnoreCaseQuals, sizeof(s_IgnoreCaseQuals), "c++/src/objects/seqfeat/BioSource.cpp", __LINE__);
bool s_MayIgnoreCase(const string& value)
{
typedef CStaticArraySet<const char*, PNocase_CStr> TCTaxNameElementQualsSet;
-static const TCTaxNameElementQualsSet s_TaxNameElementQualsSet(s_TaxNameElementQuals, sizeof(s_TaxNameElementQuals), __FILE__, __LINE__);
-+static const TCTaxNameElementQualsSet s_TaxNameElementQualsSet(s_TaxNameElementQuals, sizeof(s_TaxNameElementQuals), 'c++/src/objects/seqfeat/BioSource.cpp', __LINE__);
++static const TCTaxNameElementQualsSet s_TaxNameElementQualsSet(s_TaxNameElementQuals, sizeof(s_TaxNameElementQuals), "c++/src/objects/seqfeat/BioSource.cpp", __LINE__);
bool s_IsTaxNameElement(const string& value)
{
typedef CStaticArraySet<const char*, PNocase_CStr> TCStopWordStrSet;
-static const TCStopWordStrSet s_StopWordsSet(s_StopWords, sizeof(s_StopWords), __FILE__, __LINE__);
-+static const TCStopWordStrSet s_StopWordsSet(s_StopWords, sizeof(s_StopWords), 'c++/src/objects/seqfeat/BioSource.cpp', __LINE__);
++static const TCStopWordStrSet s_StopWordsSet(s_StopWords, sizeof(s_StopWords), "c++/src/objects/seqfeat/BioSource.cpp", __LINE__);
bool CBioSource::IsStopWord(const string& value)
};
typedef CStaticArraySet<const char*, PCase_CStr> TCStrSet;
-static const TCStrSet s_CountriesSet(s_Countries, sizeof(s_Countries), __FILE__, __LINE__);
-+static const TCStrSet s_CountriesSet(s_Countries, sizeof(s_Countries), 'c++/src/objects/seqfeat/SubSource.cpp', __LINE__);
++static const TCStrSet s_CountriesSet(s_Countries, sizeof(s_Countries), "c++/src/objects/seqfeat/SubSource.cpp", __LINE__);
// former legal country names, must be in alphabetical order (case sensitive)
static const char* const s_Former_Countries[] = {
"Zaire"
};
-static const TCStrSet s_Former_CountriesSet(s_Former_Countries, sizeof(s_Former_Countries), __FILE__, __LINE__);
-+static const TCStrSet s_Former_CountriesSet(s_Former_Countries, sizeof(s_Former_Countries), 'c++/src/objects/seqfeat/SubSource.cpp', __LINE__);
++static const TCStrSet s_Former_CountriesSet(s_Former_Countries, sizeof(s_Former_Countries), "c++/src/objects/seqfeat/SubSource.cpp", __LINE__);
bool CCountries::IsValid(const string& country)
{
" ThrowUnassigned("<<member_index;
#if 0
- code.Methods(inl) << ", __FILE__, __LINE__";
-+ code.Methods(inl) << ", 'c++/src/serial/datatool/classstr.cpp', __LINE__";
++ code.Methods(inl) << ", "c++/src/serial/datatool/classstr.cpp", __LINE__";
#endif
code.Methods(inl) << ");\n"
" }\n";
#undef DIAG_COMPILE_INFO
#define DIAG_COMPILE_INFO \
- NCBI_NS_NCBI::CDiagCompileInfo(file_name? file_name: __FILE__, \
-+ NCBI_NS_NCBI::CDiagCompileInfo(file_name? file_name: 'c++/src/serial/serialobject.cpp', \
++ NCBI_NS_NCBI::CDiagCompileInfo(file_name? file_name: "c++/src/serial/serialobject.cpp", \
file_line? file_line: __LINE__, \
NCBI_CURRENT_FUNCTION, \
NCBI_MAKE_MODULE(NCBI_MODULE))
#undef DIAG_COMPILE_INFO
#define DIAG_COMPILE_INFO \
- NCBI_NS_NCBI::CDiagCompileInfo(__FILE__, \
-+ NCBI_NS_NCBI::CDiagCompileInfo('c++/src/serial/serialobject.cpp', \
++ NCBI_NS_NCBI::CDiagCompileInfo("c++/src/serial/serialobject.cpp", \
__LINE__, \
NCBI_CURRENT_FUNCTION, \
NCBI_MAKE_MODULE(NCBI_MODULE))
#ifndef NDEBUG
# define mdb_assert0(env, expr, expr_txt) ((expr) ? (void)0 : \
- mdb_assert_fail(env, expr_txt, mdb_func_, __FILE__, __LINE__))
-+ mdb_assert_fail(env, expr_txt, mdb_func_, 'c++/src/util/lmdb/mdb.c', __LINE__))
++ mdb_assert_fail(env, expr_txt, mdb_func_, "c++/src/util/lmdb/mdb.c", __LINE__))
static void ESECT
mdb_assert_fail(MDB_env *env, const char *expr_txt,
#define RES(err, expr) ((rc = expr) == (err) || (CHECK(!rc, #expr), 0))
#define CHECK(test, msg) ((test) ? (void)0 : ((void)fprintf(stderr, \
- "%s:%d: %s: %s\n", __FILE__, __LINE__, msg, mdb_strerror(rc)), abort()))
-+ "%s:%d: %s: %s\n", 'c++/src/util/lmdb/mtest.c', __LINE__, msg, mdb_strerror(rc)), abort()))
++ "%s:%d: %s: %s\n", "c++/src/util/lmdb/mtest.c", __LINE__, msg, mdb_strerror(rc)), abort()))
int main(int argc,char * argv[])
{
#define RES(err, expr) ((rc = expr) == (err) || (CHECK(!rc, #expr), 0))
#define CHECK(test, msg) ((test) ? (void)0 : ((void)fprintf(stderr, \
- "%s:%d: %s: %s\n", __FILE__, __LINE__, msg, mdb_strerror(rc)), abort()))
-+ "%s:%d: %s: %s\n", 'c++/src/util/lmdb/mtest2.c', __LINE__, msg, mdb_strerror(rc)), abort()))
++ "%s:%d: %s: %s\n", "c++/src/util/lmdb/mtest2.c", __LINE__, msg, mdb_strerror(rc)), abort()))
int main(int argc,char * argv[])
{
#define RES(err, expr) ((rc = expr) == (err) || (CHECK(!rc, #expr), 0))
#define CHECK(test, msg) ((test) ? (void)0 : ((void)fprintf(stderr, \
- "%s:%d: %s: %s\n", __FILE__, __LINE__, msg, mdb_strerror(rc)), abort()))
-+ "%s:%d: %s: %s\n", 'c++/src/util/lmdb/mtest3.c', __LINE__, msg, mdb_strerror(rc)), abort()))
++ "%s:%d: %s: %s\n", "c++/src/util/lmdb/mtest3.c", __LINE__, msg, mdb_strerror(rc)), abort()))
int main(int argc,char * argv[])
{
#define RES(err, expr) ((rc = expr) == (err) || (CHECK(!rc, #expr), 0))
#define CHECK(test, msg) ((test) ? (void)0 : ((void)fprintf(stderr, \
- "%s:%d: %s: %s\n", __FILE__, __LINE__, msg, mdb_strerror(rc)), abort()))
-+ "%s:%d: %s: %s\n", 'c++/src/util/lmdb/mtest4.c', __LINE__, msg, mdb_strerror(rc)), abort()))
++ "%s:%d: %s: %s\n", "c++/src/util/lmdb/mtest4.c", __LINE__, msg, mdb_strerror(rc)), abort()))
int main(int argc,char * argv[])
{
#define RES(err, expr) ((rc = expr) == (err) || (CHECK(!rc, #expr), 0))
#define CHECK(test, msg) ((test) ? (void)0 : ((void)fprintf(stderr, \
- "%s:%d: %s: %s\n", __FILE__, __LINE__, msg, mdb_strerror(rc)), abort()))
-+ "%s:%d: %s: %s\n", 'c++/src/util/lmdb/mtest5.c', __LINE__, msg, mdb_strerror(rc)), abort()))
++ "%s:%d: %s: %s\n", "c++/src/util/lmdb/mtest5.c", __LINE__, msg, mdb_strerror(rc)), abort()))
int main(int argc,char * argv[])
{
#define RES(err, expr) ((rc = expr) == (err) || (CHECK(!rc, #expr), 0))
#define CHECK(test, msg) ((test) ? (void)0 : ((void)fprintf(stderr, \
- "%s:%d: %s: %s\n", __FILE__, __LINE__, msg, mdb_strerror(rc)), abort()))
-+ "%s:%d: %s: %s\n", 'c++/src/util/lmdb/mtest6.c', __LINE__, msg, mdb_strerror(rc)), abort()))
++ "%s:%d: %s: %s\n", "c++/src/util/lmdb/mtest6.c", __LINE__, msg, mdb_strerror(rc)), abort()))
char dkbuf[1024];
if ( (a) != (b) ) { \
fprintf(stderr, "%s:%d: Check failed because %s != %s\n", \
- __FILE__, __LINE__, #a, #b); \
-+ 'c++/src/util/regexp/pcre_scanner_unittest.cc', __LINE__, #a, #b); \
++ "c++/src/util/regexp/pcre_scanner_unittest.cc", __LINE__, #a, #b); \
exit(1); \
} \
} while (0)
if (!(condition)) { \
fprintf(stderr, "%s:%d: Check failed: %s\n", \
- __FILE__, __LINE__, #condition); \
-+ 'c++/src/util/regexp/pcre_stringpiece_unittest.cc', __LINE__, #condition); \
++ "c++/src/util/regexp/pcre_stringpiece_unittest.cc", __LINE__, #condition); \
exit(1); \
} \
} while (0)
// report incorrect usage
CDiagCompileInfo diag_compile_info
- (file? file: __FILE__,
-+ (file? file: 'c++/src/util/static_set.cpp',
++ (file? file: "c++/src/util/static_set.cpp",
file? line: __LINE__,
NCBI_CURRENT_FUNCTION,
NCBI_MAKE_MODULE(NCBI_MODULE));
// report incorrect usage
CDiagCompileInfo diag_compile_info
- (file? file: __FILE__,
-+ (file? file: 'c++/src/util/static_set.cpp',
++ (file? file: "c++/src/util/static_set.cpp",
file? line: __LINE__,
NCBI_CURRENT_FUNCTION,
NCBI_MAKE_MODULE(NCBI_MODULE));
{ // report incorrect usage
CDiagCompileInfo diag_compile_info
- (file? file: __FILE__,
-+ (file? file: 'c++/src/util/static_set.cpp',
++ (file? file: "c++/src/util/static_set.cpp",
file? line: __LINE__,
NCBI_CURRENT_FUNCTION,
NCBI_MAKE_MODULE(NCBI_MODULE));
projects / ncbi-blast+.git / commitdiff