make the build more reproducible

Gbp-Pq: Name reprobuild

diff --git a/c++/include/algo/blast/core/blast_message.h b/c++/include/algo/blast/core/blast_message.h
index c16545e12c5bf32e75a6f2444c56118f13a99c08..928d517014104fc7b19c4117ff9a8e976b0b9de3 100644 (file)
--- a/c++/include/algo/blast/core/blast_message.h
+++ b/c++/include/algo/blast/core/blast_message.h
@@ -117,7 +117,7 @@ void Blast_Perror(Blast_Message* *msg, Int2 error_code, int context);
 
 /** 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)
 
 /** Extended version of Blast_Perror which includes parameters for the file
  * name and line number where the error/warning occurred. This function should

diff --git a/c++/include/connect/ncbi_util.h b/c++/include/connect/ncbi_util.h
index 4b75772603d8e5a4699e1a57187e30242d214d6a..171b63b22014f54925e391522eea1b4a2d1a62ed 100644 (file)
--- a/c++/include/connect/ncbi_util.h
+++ b/c++/include/connect/ncbi_util.h
@@ -135,7 +135,7 @@ extern NCBI_XCONNECT_EXPORT MT_LOCK CORE_GetLOCK(void);
  */
 #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)
 
 #ifdef   LOG_DATA
 /* AIX's <pthread.h> defines LOG_DATA to be an integer constant;
@@ -144,7 +144,7 @@ extern NCBI_XCONNECT_EXPORT MT_LOCK CORE_GetLOCK(void);
 #endif
 #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)
 
 
 /** Default for THIS_MODULE.

diff --git a/c++/include/corelib/impl/ncbi_java.h b/c++/include/corelib/impl/ncbi_java.h
index 04adda92662c899e7075dd724b4d1e398b2c1f44..1c438bea5e5819c01b42aa5e23138f1780f5b8d5 100644 (file)
--- a/c++/include/corelib/impl/ncbi_java.h
+++ b/c++/include/corelib/impl/ncbi_java.h
@@ -63,7 +63,7 @@
 
 #define JAVA_ABORT(msg) \
     { \
-        NcbiCerr << __FILE__ << ": " << NCBI_CURRENT_FUNCTION << ": " msg << endl; \
+        NcbiCerr << "c++/include/corelib/impl/ncbi_java.h" << ": " << NCBI_CURRENT_FUNCTION << ": " msg << endl; \
         abort(); \
     }
 

diff --git a/c++/include/corelib/ncbidiag.hpp b/c++/include/corelib/ncbidiag.hpp
index d54f3045565f5e28cb7ec36af4e0fee67bb3ce85..692871367a0f4c9f8cbcc54e418fdf872d7cfde8 100644 (file)
--- a/c++/include/corelib/ncbidiag.hpp
+++ b/c++/include/corelib/ncbidiag.hpp
@@ -168,7 +168,7 @@ NCBI_XNCBI_EXPORT const char* g_DiagUnknownFunction(void);
 /// @sa
 ///   CDiagCompileInfo
 #define DIAG_COMPILE_INFO                                           \
-    NCBI_NS_NCBI::CDiagCompileInfo(__FILE__,                        \
+    NCBI_NS_NCBI::CDiagCompileInfo("c++/include/corelib/ncbidiag.hpp",                        \
                                    __LINE__,                        \
                                    NCBI_CURRENT_FUNCTION,           \
                                    NCBI_MAKE_MODULE(NCBI_MODULE))

diff --git a/c++/include/corelib/test_boost.hpp b/c++/include/corelib/test_boost.hpp
index ec834e6657ae29d6f4a129dabf84a12693d8da6a..8dc5c530ea067e65a59471e9063d5dc55cc842d5 100644 (file)
--- a/c++/include/corelib/test_boost.hpp
+++ b/c++/include/corelib/test_boost.hpp
@@ -344,7 +344,7 @@ static ::NCBI_NS_NCBI::SNcbiTestRegistrar                               \
 BOOST_JOIN( BOOST_JOIN( test_name, _registrar ), __LINE__ ) (           \
     boost::unit_test::make_test_case(                                   \
         &BOOST_AUTO_TC_INVOKER( test_name ), #test_name,                \
-        __FILE__, __LINE__ ),                                           \
+        "c++/include/corelib/test_boost.hpp", __LINE__ ),                                           \
     ::NCBI_NS_NCBI::SNcbiTestTCTimeout<                                 \
         BOOST_AUTO_TC_UNIQUE_ID( test_name )>::instance()->value(),     \
     decorators );                                                       \

diff --git a/c++/include/objtools/blast/seqdb_reader/impl/seqdbgeneral.hpp b/c++/include/objtools/blast/seqdb_reader/impl/seqdbgeneral.hpp
index d958c5997b11437666d1f724397f855dc2f2ef07..db3c0299f617d49a9a3e1789f752002b7e28e40e 100644 (file)
--- a/c++/include/objtools/blast/seqdb_reader/impl/seqdbgeneral.hpp
+++ b/c++/include/objtools/blast/seqdb_reader/impl/seqdbgeneral.hpp
@@ -1123,7 +1123,7 @@ void SeqDB_FileIntegrityAssert(const string & file,
 #define SEQDB_FILE_ASSERT(YESNO)                                        \
     do {                                                                \
         if (! (YESNO)) {                                                \
-            SeqDB_FileIntegrityAssert(__FILE__, __LINE__, (#YESNO));    \
+            SeqDB_FileIntegrityAssert("c++/include/objtools/blast/seqdb_reader/impl/seqdbgeneral.hpp", __LINE__, (#YESNO));    \
         }                                                               \
     } while(0)
 

diff --git a/c++/include/util/ddump_viewer.hpp b/c++/include/util/ddump_viewer.hpp
index f25fa60257186feec0cde6ec9570bddcffdb6776..8826628896fdfac79808ee17da183a32c4f19872 100644 (file)
--- a/c++/include/util/ddump_viewer.hpp
+++ b/c++/include/util/ddump_viewer.hpp
@@ -49,7 +49,7 @@ BEGIN_NCBI_SCOPE
 //
 
 #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)
 
 
 //---------------------------------------------------------------------------

diff --git a/c++/include/util/static_set.hpp b/c++/include/util/static_set.hpp
index 4e77ec5e9ef2e3eeeaa848858bc87324b594d243..dff6e0ccdaacabff222125938b46227f111be025 100644 (file)
--- a/c++/include/util/static_set.hpp
+++ b/c++/include/util/static_set.hpp
@@ -886,17 +886,17 @@ public:
     static const Type Var
 
 #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__)
 
 #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__)
 
 #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__, \
                             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__,        \
                      NCBI_NS_NCBI::NStaticArray::eCopyWarn_hide)
 
 

diff --git a/c++/src/build-system/configure.ac b/c++/src/build-system/configure.ac
index c4346bf366696b53fcc4bb036a60f53a3ed38377..e521a773653ec6bdbd92feeac8c355ff41e3944d 100644 (file)
--- a/c++/src/build-system/configure.ac
+++ b/c++/src/build-system/configure.ac
@@ -2962,13 +2962,13 @@ case "$host_os" in
    linux*)
       kver=`uname -r | sed -e 's/-.*//'`
       libcver=`ldd --version | awk 'NR == 1 { print $NF }'`
-      verbose_host=$host_cpu-$host_vendor-linux$kver-gnu$libcver
+      verbose_host=$host_cpu-$host_vendor-linux-gnu$libcver
       ;;
    *) verbose_host=$host ;;
 esac
 
 #### Overall configuration mode summary
-signature_hostname=`(hostname || uname -n) 2>/dev/null \
+signature_hostname=`echo debian_build 2>/dev/null \
     | sed 's/\..*//; s/-/_/g; 1q'`
 signature="${signature_compiler}_${compiler_version}-${release_debug}${mt_sfx}${dll_sfx}${bit64_sfx}${prof_sfx}--${verbose_host}-${signature_hostname}"
 AC_DEFINE_UNQUOTED(NCBI_SIGNATURE, "$signature",

diff --git a/c++/src/connect/mbedtls/mbedtls/debug.h b/c++/src/connect/mbedtls/mbedtls/debug.h
index efc7e9fff987e9913ab9f5341afb84d83907bce2..16cc233f3dcbe7fca30dc80e36f40b678e4f5073 100644 (file)
--- a/c++/src/connect/mbedtls/mbedtls/debug.h
+++ b/c++/src/connect/mbedtls/mbedtls/debug.h
@@ -66,28 +66,28 @@
 #define MBEDTLS_DEBUG_STRIP_PARENS( ... )   __VA_ARGS__
 
 #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_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 )
 
 #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 )
 
 #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 )
 #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 )
 #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 )
 #endif
 
 #else /* MBEDTLS_DEBUG_C */

diff --git a/c++/src/connect/ncbi_lbos_cxx.cpp b/c++/src/connect/ncbi_lbos_cxx.cpp
index 13f8fbcac64e426e0727fe0892ebdd782de2854e..fff444bc6d838fe2b83d3cf7bd9b1e8c362f460c 100644 (file)
--- a/c++/src/connect/ncbi_lbos_cxx.cpp
+++ b/c++/src/connect/ncbi_lbos_cxx.cpp
@@ -146,7 +146,7 @@ std::string CLBOSIpCache::HostnameResolve(const string& service,
 {
     /* 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,
             CLBOSException::eUnknown, 
             "Internal error in LBOS Client IP Cache. Please contact developer",
             eLBOS_BadRequest);
@@ -218,7 +218,7 @@ static void s_ProcessResult(unsigned short result,
     if (lbos_answer != NULL) {
         message << " " << lbos_answer;
     }
-    throw CLBOSException(CDiagCompileInfo(__FILE__, __LINE__), NULL,
+    throw CLBOSException(CDiagCompileInfo("c++/src/connect/ncbi_lbos_cxx.cpp", __LINE__), NULL,
             CLBOSException::s_HTTPCodeToEnum(result),
             message.str(), result);
 }
@@ -249,7 +249,7 @@ void LBOS::Announce(const string&  service,
         /* If we could not parse healthcheck URL, throw "Invalid Arguments" */
         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,
                                  CLBOSException::eInvalidArgs,
                                  NStr::IntToString(eLBOS_InvalidArgs),
                                  eLBOS_InvalidArgs);
@@ -308,7 +308,7 @@ void LBOS::AnnounceFromRegistry(const string& reg_sec)
         port_int = NStr::StringToInt(port_str);
     }
     catch (...) {
-        throw CLBOSException(CDiagCompileInfo(__FILE__, __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 + "\"",
@@ -316,7 +316,7 @@ void LBOS::AnnounceFromRegistry(const string& reg_sec)
     }
     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,
                              CLBOSException::eInvalidArgs, 
                              "Invalid server port \"" + port_str + 
                              "\" in section \"" + reg_section + "\"",
@@ -624,7 +624,7 @@ void LBOS::CMetaData::Set(const CTempString name_in, const CTempString val_in)
     /* Forbidden names for meta parameters */
     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,
                              CLBOSException::eInvalidArgs, 
                              "This name cannot be used for metadata", 
                              eLBOS_InvalidArgs);
@@ -680,7 +680,7 @@ void LBOS::CMetaData::SetRate(const string& rate)
             SetRate(NStr::StringToInt(rate));
         } 
         catch (const CStringException&) {
-            throw CLBOSException(CDiagCompileInfo(__FILE__, __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);
@@ -707,7 +707,7 @@ double LBOS::CMetaData::GetRate() const
         return NStr::StringToDouble(rate);
     }
     catch (const CStringException&) {
-        throw CLBOSException(CDiagCompileInfo(__FILE__, __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",
@@ -719,7 +719,7 @@ double LBOS::CMetaData::GetRate() const
 void LBOS::CMetaData::SetType(const string& host_type)
 {
     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,
             CLBOSException::eInvalidArgs,
             "This convenience function throws on whitespace characters "
             "in \"type\" meta parameter. If you know what you are doing, "
@@ -760,7 +760,7 @@ void LBOS::CMetaData::SetType(EHostType host_type)
         SetType("");
         break;
     default:
-        throw CLBOSException(CDiagCompileInfo(__FILE__, __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", 
@@ -794,7 +794,7 @@ void LBOS::CMetaData::SetType(ESERV_Type host_type)
         SetType("FIREWALL");
         break;
     default:
-        throw CLBOSException(CDiagCompileInfo(__FILE__, __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", 
@@ -825,7 +825,7 @@ void LBOS::CMetaData::SetType(int host_type)
         SetType("");
         break;
     default:
-        throw CLBOSException(CDiagCompileInfo(__FILE__, __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",
@@ -871,7 +871,7 @@ LBOS::CMetaData::EHostType LBOS::CMetaData::GetType() const
 void LBOS::CMetaData::SetExtra(const string& extra)
 {
     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,
             CLBOSException::eInvalidArgs,
             "This convenience function throws on whitespace characters "
             "in \"extra\" meta parameter. If you know what you are doing, "

diff --git a/c++/src/connect/ncbi_monkey.cpp b/c++/src/connect/ncbi_monkey.cpp
index 0c4046674f5c67bcc7cbf26fa279531990a41971..0dea9a2b5e59f35039f8b054c9f30e180a9a842b 100644 (file)
--- a/c++/src/connect/ncbi_monkey.cpp
+++ b/c++/src/connect/ncbi_monkey.cpp
@@ -83,7 +83,7 @@ const string             kEnablField     = "enabled";
 const string             kSeedField      = "seed";
 
 #define PARAM_TWICE_EXCEPTION(param)                                        \
-    throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__),            \
+    throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),            \
                            NULL, CMonkeyException::e_MonkeyInvalidArgs,     \
                            string("Parameter \"" param "\" is set "         \
                            "twice in [") + GetSection() + "]" +             \
@@ -371,7 +371,7 @@ static string s_RuleTypeString(EMonkeyActionType type)
     case eMonkey_Send:
         return "write";
     default:
-        throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__),
+        throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
                                NULL, CMonkeyException::e_MonkeyInvalidArgs,
                                string("Unknown EMonkeyActionType value"));
     }
@@ -390,7 +390,7 @@ static string s_SocketCallString(EMonkeyActionType action)
     case eMonkey_Connect:
         return "connect()";
     default:
-        throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__),
+        throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
                                NULL, CMonkeyException::e_MonkeyInvalidArgs,
                                string("Unknown EMonkeyActionType value"));
     }
@@ -467,7 +467,7 @@ unsigned short CMonkeyRuleBase::GetProbability(MONKEY_SOCKTYPE sock) const
 {
     if (m_RunPos.find(sock) == m_RunPos.end()) {
         throw CMonkeyException(
-            CDiagCompileInfo(__FILE__, __LINE__),
+            CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
             NULL, CMonkeyException::e_MonkeyInvalidArgs,
             "The socket provided has not been registered with current rule");
     }
@@ -511,7 +511,7 @@ void CMonkeyRuleBase::x_ReadEIOStatus(const string& eIOStatus_in)
         m_ReturnStatus = eIO_Closed;
     } else if (eIOStatus == "eio_invalidarg") {
         throw CMonkeyException(
-            CDiagCompileInfo(__FILE__, __LINE__),
+            CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
             NULL, CMonkeyException::e_MonkeyInvalidArgs,
             string("Unsupported 'return_status': ") + eIOStatus_in);
     } else if (eIOStatus == "eio_interrupt") {
@@ -526,7 +526,7 @@ void CMonkeyRuleBase::x_ReadEIOStatus(const string& eIOStatus_in)
         m_ReturnStatus = eIO_NotSupported;
     } else {
         throw CMonkeyException(
-            CDiagCompileInfo(__FILE__, __LINE__),
+            CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
             NULL, CMonkeyException::e_MonkeyInvalidArgs,
             string("Could not parse 'return_status': ") + eIOStatus_in);
     }
@@ -543,7 +543,7 @@ void CMonkeyRuleBase::x_ReadRuns(const string& runs)
        split it on commas*/
     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__),
                                NULL, CMonkeyException::e_MonkeyInvalidArgs,
                                string("Parameter \"runs\" is empty in [")
                                + m_Section + "]" +
@@ -573,7 +573,7 @@ void CMonkeyRuleBase::x_ReadRuns(const string& runs)
         if (m_RunMode == eMonkey_RunProbability) {
             if (*run.rbegin() != '%') {
                 throw CMonkeyException(
-                        CDiagCompileInfo(__FILE__, __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 "
@@ -593,7 +593,7 @@ void CMonkeyRuleBase::x_ReadRuns(const string& runs)
                 size_t last_step = m_Runs.size();
                 if (last_step == 0 && step != 1) {
                     throw CMonkeyException(
-                            CDiagCompileInfo(__FILE__, __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");
@@ -610,7 +610,7 @@ void CMonkeyRuleBase::x_ReadRuns(const string& runs)
             assert(run_format == eMonkey_RunSequence);
             if (*run.rbegin() == '%') {
                 throw CMonkeyException(
-                        CDiagCompileInfo(__FILE__, __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 "
@@ -619,7 +619,7 @@ void CMonkeyRuleBase::x_ReadRuns(const string& runs)
             int val = NStr::StringToInt(run);
             if (m_Runs.size() > 0 && val <= *m_Runs.rbegin()) {
                 throw CMonkeyException(
-                    CDiagCompileInfo(__FILE__, __LINE__),
+                    CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
                     NULL, CMonkeyException::e_MonkeyInvalidArgs,
                     string("\"runs\" should contain values in "
                            "increasing order"));
@@ -815,7 +815,7 @@ CMonkeyConnectRule::CMonkeyConnectRule(string                section,
         string value = name_value[1];
         if (name == "allow") {
             if (allow_set) {
-                throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__),
+                throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
                                        NULL, 
                                        CMonkeyException::e_MonkeyInvalidArgs,
                                        string("Parameter \"allow\" is set "
@@ -827,7 +827,7 @@ CMonkeyConnectRule::CMonkeyConnectRule(string                section,
         }
     }
     if (!allow_set)
-        throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__),
+        throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
                                NULL, CMonkeyException::e_MonkeyInvalidArgs,
                                string("Parameter \"allow\" not set in [")
                                + GetSection() + "]" +
@@ -902,7 +902,7 @@ CMonkeyPollRule::CMonkeyPollRule(string section, const vector<string>& params)
         string value = name_value[1];
         if (name == "ignore") {
             if (ignore_set) {
-                throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__),
+                throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
                                        NULL,
                                        CMonkeyException::e_MonkeyInvalidArgs,
                                        string("Parameter \"ignore\" is set "
@@ -914,7 +914,7 @@ CMonkeyPollRule::CMonkeyPollRule(string section, const vector<string>& params)
         }
     }
     if (!ignore_set) {
-        throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__),
+        throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
                                NULL, CMonkeyException::e_MonkeyInvalidArgs,
                                string("Parameter \"ignore\" not set in [")
                                + GetSection() + "]" +
@@ -1032,7 +1032,7 @@ static bool s_MatchRegex(const string& to_match, const string& regex)
                                                              ".*" , "");
     if (filtered.find_first_of("[]()+^?{}$.*\\") != string::npos) {
         throw CMonkeyException(
-            CDiagCompileInfo(__FILE__, __LINE__),
+            CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
             NULL,
             CMonkeyException::e_MonkeyInvalidArgs,
             exception_message);
@@ -1051,7 +1051,7 @@ static bool s_MatchRegex(const string& to_match, const string& regex)
         }
         else {
             throw CMonkeyException(
-                CDiagCompileInfo(__FILE__, __LINE__),
+                CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
                 NULL,
                 CMonkeyException::e_MonkeyInvalidArgs,
                 exception_message);
@@ -1179,7 +1179,7 @@ bool CMonkeyPlan::WriteRule(MONKEY_SOCKTYPE        sock,
             ss << "Probability below zero for write rule in plan " << m_Name
                 << ". Check config!";
             throw CMonkeyException(
-                        CDiagCompileInfo(__FILE__, __LINE__),
+                        CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
                         NULL, CMonkeyException::e_MonkeyInvalidArgs, 
                         ss.str());
         }
@@ -1221,7 +1221,7 @@ bool CMonkeyPlan::ReadRule(MONKEY_SOCKTYPE        sock,
             stringstream ss;
             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__),
                                    NULL, CMonkeyException::e_MonkeyInvalidArgs,
                                    ss.str());
         }
@@ -1270,7 +1270,7 @@ bool CMonkeyPlan::ConnectRule(MONKEY_SOCKTYPE        sock,
             stringstream ss;
             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__),
                                    NULL, CMonkeyException::e_MonkeyInvalidArgs,
                                    ss.str());
         }
@@ -1313,7 +1313,7 @@ bool CMonkeyPlan::PollRule(size_t*     n,
             ss << "Probability below zero for write rule in plan " << m_Name
                 << ". Check config!";
             throw CMonkeyException(
-                        CDiagCompileInfo(__FILE__, __LINE__),
+                        CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
                         NULL, CMonkeyException::e_MonkeyInvalidArgs, 
                         ss.str());
         }
@@ -1372,7 +1372,7 @@ CMonkey::CMonkey() : m_Probability(100), m_Enabled(false)
 {
     if (sm_HookSwitch == NULL) {
         throw CMonkeyException(
-            CDiagCompileInfo(__FILE__, __LINE__),
+            CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
             NULL, CMonkeyException::e_MonkeyInvalidArgs,
             "Launch CONNECT_Init() before initializing CMonkey instance");
     }
@@ -1458,7 +1458,7 @@ void CMonkey::ReloadConfig(const string& config)
                 prob = (int)(NStr::StringToDouble(prob_str) * 100);
             }
             if (prob < 0 || prob > 100) {
-                throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__),
+                throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
                                        NULL,
                                        CMonkeyException::e_MonkeyInvalidArgs,
                                        "Parameter \"probability\"=" + prob_str
@@ -1469,7 +1469,7 @@ void CMonkey::ReloadConfig(const string& config)
             m_Probability = (unsigned short)prob;
         }
         catch (const CStringException&) {
-            throw CMonkeyException(CDiagCompileInfo(__FILE__, __LINE__),
+            throw CMonkeyException(CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
                                    NULL, CMonkeyException::e_MonkeyInvalidArgs,
                                    "Parameter \"probability\"=" + prob_str
                                    + " for section [" + monkey_section
@@ -1757,7 +1757,7 @@ bool CMonkey::RegisterThread(int token)
        << " has been already registered in CMonkey and cannot be used again";
     if (m_RegisteredTokens.find(token) != m_RegisteredTokens.end()) {
         throw CMonkeyException(
-            CDiagCompileInfo(__FILE__, __LINE__),
+            CDiagCompileInfo("c++/src/connect/ncbi_monkey.cpp", __LINE__),
             NULL, CMonkeyException::e_MonkeyInvalidArgs,
             ss.str());
     }

diff --git a/c++/src/connect/ncbi_priv.h b/c++/src/connect/ncbi_priv.h
index 91cb741e72e04dd7175a5b0affe23bdbf63329c6..de8315e72277aef84b00c4fbc3374b294a06a163 100644 (file)
--- a/c++/src/connect/ncbi_priv.h
+++ b/c++/src/connect/ncbi_priv.h
@@ -222,7 +222,7 @@ extern NCBI_XCONNECT_EXPORT LOG g_CORE_Log;
             _mess.level       = _xx_level;                              \
             _mess.module      = THIS_MODULE;                            \
             _mess.func        = CORE_CURRENT_FUNCTION;                  \
-            _mess.file        = __FILE__;                               \
+            _mess.file        = "c++/src/connect/ncbi_priv.h";                               \
             _mess.line        = __LINE__;                               \
             _mess.raw_data    = (_raw_data);                            \
             _mess.raw_size    = (_raw_size);                            \

diff --git a/c++/src/objects/seqfeat/BioSource.cpp b/c++/src/objects/seqfeat/BioSource.cpp
index 5731345d0edc0a29f7d3b4f6628213a27659ec71..d62678a16e8ef06b3f0968d8d518607395af4c61 100644 (file)
--- a/c++/src/objects/seqfeat/BioSource.cpp
+++ b/c++/src/objects/seqfeat/BioSource.cpp
@@ -941,7 +941,7 @@ static const char* const s_IgnoreCaseQuals[] = {
 };
 
 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__);
 
 bool s_MayIgnoreCase(const string& value)
 {
@@ -963,7 +963,7 @@ static const char* const s_TaxNameElementQuals[] = {
 };
 
 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__);
 
 bool s_IsTaxNameElement(const string& value)
 {
@@ -1367,7 +1367,7 @@ static const char* const s_StopWords[] = {
 };
 
 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__);
 
 
 bool CBioSource::IsStopWord(const string& value)

diff --git a/c++/src/objects/seqfeat/SubSource.cpp b/c++/src/objects/seqfeat/SubSource.cpp
index 8f16df78a849798bd64a23904d7df6d306825e00..dfded1cc09160dbaf338e9bb29f5570dc11c4814 100644 (file)
--- a/c++/src/objects/seqfeat/SubSource.cpp
+++ b/c++/src/objects/seqfeat/SubSource.cpp
@@ -3127,7 +3127,7 @@ static const char* const s_Countries[] = {
     "Zimbabwe"
 };
 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__);
 
 // former legal country names, must be in alphabetical order (case sensitive)
 static const char* const s_Former_Countries[] = {
@@ -3147,7 +3147,7 @@ static const char* const s_Former_Countries[] = {
     "Yugoslavia",
     "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__);
 
 bool CCountries::IsValid(const string& country)
 {

diff --git a/c++/src/serial/datatool/classstr.cpp b/c++/src/serial/datatool/classstr.cpp
index 60d7f78a0cbeca02c4c9d8222094b8420babeda4..e0a67b88cf2835c03f129acf2e6cdb0bf72d461d 100644 (file)
--- a/c++/src/serial/datatool/classstr.cpp
+++ b/c++/src/serial/datatool/classstr.cpp
@@ -850,7 +850,7 @@ mem_simple = false;
                         "    if (!CanGet"<< mem_cName<<"()) {\n"
                         "        ThrowUnassigned("<<member_index;
 #if 0
-                    code.Methods(inl) << ", __FILE__, __LINE__";
+                    code.Methods(inl) << ", "c++/src/serial/datatool/classstr.cpp", __LINE__";
 #endif
                     code.Methods(inl) << ");\n"
                         "    }\n";

diff --git a/c++/src/serial/serialobject.cpp b/c++/src/serial/serialobject.cpp
index de76870475a04ef6b7f3e7d1cc76fb21b1748516..77e1c9dc767f90be1eaed975b5c666fdfd6e8f52 100644 (file)
--- a/c++/src/serial/serialobject.cpp
+++ b/c++/src/serial/serialobject.cpp
@@ -295,7 +295,7 @@ void CSerialObject::ThrowUnassigned(TMemberIndex index,
 // set temporary diag compile info to use argument file name and line
 #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",  \
                                        file_line? file_line: __LINE__,  \
                                        NCBI_CURRENT_FUNCTION,           \
                                        NCBI_MAKE_MODULE(NCBI_MODULE))
@@ -303,7 +303,7 @@ void CSerialObject::ThrowUnassigned(TMemberIndex index,
 // restore original diag compile info definition
 #undef DIAG_COMPILE_INFO
 #define DIAG_COMPILE_INFO                                               \
-        NCBI_NS_NCBI::CDiagCompileInfo(__FILE__,                        \
+        NCBI_NS_NCBI::CDiagCompileInfo("c++/src/serial/serialobject.cpp",                        \
                                        __LINE__,                        \
                                        NCBI_CURRENT_FUNCTION,           \
                                        NCBI_MAKE_MODULE(NCBI_MODULE))

diff --git a/c++/src/util/lmdb/mdb.c b/c++/src/util/lmdb/mdb.c
index 7cdfca9066393787428764d779cb76e8bec78e8d..593299dd74b594d35346b8e70739fb41331047af 100644 (file)
--- a/c++/src/util/lmdb/mdb.c
+++ b/c++/src/util/lmdb/mdb.c
@@ -1533,7 +1533,7 @@ mdb_strerror(int err)
 
 #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__))
 
 static void ESECT
 mdb_assert_fail(MDB_env *env, const char *expr_txt,

diff --git a/c++/src/util/lmdb/mtest.c b/c++/src/util/lmdb/mtest.c
index 6fc5840c3f870db893adc5e342136a27343860cd..efddcf2edac9ddbebcd3b4bfa998a1fcbe3ba2a0 100644 (file)
--- a/c++/src/util/lmdb/mtest.c
+++ b/c++/src/util/lmdb/mtest.c
@@ -19,7 +19,7 @@
 #define E(expr) CHECK((rc = (expr)) == MDB_SUCCESS, #expr)
 #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()))
 
 int main(int argc,char * argv[])
 {

diff --git a/c++/src/util/lmdb/mtest2.c b/c++/src/util/lmdb/mtest2.c
index 64b742aa4677f13091ba88f44642c6123ebb8b8d..c62413e4334e65707fdcbfb487dc8f07746c9e4e 100644 (file)
--- a/c++/src/util/lmdb/mtest2.c
+++ b/c++/src/util/lmdb/mtest2.c
@@ -22,7 +22,7 @@
 #define E(expr) CHECK((rc = (expr)) == MDB_SUCCESS, #expr)
 #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()))
 
 int main(int argc,char * argv[])
 {

diff --git a/c++/src/util/lmdb/mtest3.c b/c++/src/util/lmdb/mtest3.c
index 81e4bbf9b050b0641f3036b9932d0e3e91cc9a5a..67308c1799928c69be6000367e73edd840181fb0 100644 (file)
--- a/c++/src/util/lmdb/mtest3.c
+++ b/c++/src/util/lmdb/mtest3.c
@@ -22,7 +22,7 @@
 #define E(expr) CHECK((rc = (expr)) == MDB_SUCCESS, #expr)
 #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()))
 
 int main(int argc,char * argv[])
 {

diff --git a/c++/src/util/lmdb/mtest4.c b/c++/src/util/lmdb/mtest4.c
index c355cf105a96d825a5dbd355baf2de63ab07d990..77cfe264ad3887095fd418e7271b5ce0f0d4bd9e 100644 (file)
--- a/c++/src/util/lmdb/mtest4.c
+++ b/c++/src/util/lmdb/mtest4.c
@@ -22,7 +22,7 @@
 #define E(expr) CHECK((rc = (expr)) == MDB_SUCCESS, #expr)
 #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()))
 
 int main(int argc,char * argv[])
 {

diff --git a/c++/src/util/lmdb/mtest5.c b/c++/src/util/lmdb/mtest5.c
index 95793ec1fb76596a80ee0a8125db3d42d71457b7..2d32347dff92fa4c1a8dc9cd0e7f2b4eb8ab8371 100644 (file)
--- a/c++/src/util/lmdb/mtest5.c
+++ b/c++/src/util/lmdb/mtest5.c
@@ -22,7 +22,7 @@
 #define E(expr) CHECK((rc = (expr)) == MDB_SUCCESS, #expr)
 #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()))
 
 int main(int argc,char * argv[])
 {

diff --git a/c++/src/util/lmdb/mtest6.c b/c++/src/util/lmdb/mtest6.c
index cb0d4d73c9a6c51b87540ead7fd55455ef57dfd8..e272ab1bf7bb4998e7798e9039017b9e9e8fc0e6 100644 (file)
--- a/c++/src/util/lmdb/mtest6.c
+++ b/c++/src/util/lmdb/mtest6.c
@@ -22,7 +22,7 @@
 #define E(expr) CHECK((rc = (expr)) == MDB_SUCCESS, #expr)
 #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()))
 
 char dkbuf[1024];
 

diff --git a/c++/src/util/regexp/pcre_scanner_unittest.cc b/c++/src/util/regexp/pcre_scanner_unittest.cc
index 623e2afda807afc8753a1699982b6af136a51262..958b99a5ba7679248e49556c7af49e69e10a5a80 100644 (file)
--- a/c++/src/util/regexp/pcre_scanner_unittest.cc
+++ b/c++/src/util/regexp/pcre_scanner_unittest.cc
@@ -51,7 +51,7 @@
 #define CHECK_EQ(a, b)  do {                                    \
   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);                        \
     exit(1);                                                    \
   }                                                             \
 } while (0)

diff --git a/c++/src/util/regexp/pcre_stringpiece_unittest.cc b/c++/src/util/regexp/pcre_stringpiece_unittest.cc
index 88e73a1f976b7491b901ab3170192569852e235c..c2b688d0390d01edbf6b2bc10dd65356535a6c6b 100644 (file)
--- a/c++/src/util/regexp/pcre_stringpiece_unittest.cc
+++ b/c++/src/util/regexp/pcre_stringpiece_unittest.cc
@@ -19,7 +19,7 @@
 #define CHECK(condition) do {                           \
   if (!(condition)) {                                   \
     fprintf(stderr, "%s:%d: Check failed: %s\n",        \
-            __FILE__, __LINE__, #condition);            \
+            "c++/src/util/regexp/pcre_stringpiece_unittest.cc", __LINE__, #condition);            \
     exit(1);                                            \
   }                                                     \
 } while (0)

diff --git a/c++/src/util/static_set.cpp b/c++/src/util/static_set.cpp
index bb97ba3770c91f40b7987d164ad46857278c3d41..02aa0f2db41ebff33edc2cadeb403e1e27a565bb 100644 (file)
--- a/c++/src/util/static_set.cpp
+++ b/c++/src/util/static_set.cpp
@@ -87,7 +87,7 @@ void CArrayHolder::Convert(const void* src_array,
           TParamStaticArrayCopyWarning::GetDefault()) ) {
         // report incorrect usage
         CDiagCompileInfo diag_compile_info
-            (file? file: __FILE__,
+            (file? file: "c++/src/util/static_set.cpp",
              file? line: __LINE__,
              NCBI_CURRENT_FUNCTION,
              NCBI_MAKE_MODULE(NCBI_MODULE));
@@ -122,7 +122,7 @@ void ReportUnsafeStaticType(const char* type_name,
     if ( TParamStaticArrayUnsafeTypeWarning::GetDefault() ) {
         // report incorrect usage
         CDiagCompileInfo diag_compile_info
-            (file? file: __FILE__,
+            (file? file: "c++/src/util/static_set.cpp",
              file? line: __LINE__,
              NCBI_CURRENT_FUNCTION,
              NCBI_MAKE_MODULE(NCBI_MODULE));
@@ -145,7 +145,7 @@ void ReportIncorrectOrder(size_t curr_index,
 {
     { // report incorrect usage
         CDiagCompileInfo diag_compile_info
-            (file? file: __FILE__,
+            (file? file: "c++/src/util/static_set.cpp",
              file? line: __LINE__,
              NCBI_CURRENT_FUNCTION,
              NCBI_MAKE_MODULE(NCBI_MODULE));