- Timestamp:
- May 20, 2009, 4:54:39 PM (15 years ago)
- Location:
- CMT/HEAD
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
CMT/HEAD/ChangeLog
r503 r504 1 2009-05-20 <rybkin@lal.in2p3.fr> 399 2 3 * source/cmt_parser.cxx: In function set_standard_macros, if the Verbose 4 level is activated, check whether the names of different packages in upper 5 case coincide and issue a warning appropriately 6 * source/cmt_pattern.cxx: In function ApplyPattern::action, add the package 7 name (and offset) to the warning message about an undefined pattern 8 1 9 2009-05-19 <rybkin@lal.in2p3.fr> 398 2 10 -
CMT/HEAD/source/cmt_parser.cxx
r503 r504 8126 8126 Me.m_standard_macros_done = true; 8127 8127 8128 Use::UsePtrVector& Uses = Use::get_ordered_uses ();8128 // Use::UsePtrVector& Uses = Use::get_ordered_uses (); 8129 8129 Use& current_use = Use::current (); 8130 8130 … … 8133 8133 cmt_string pwd = CmtSystem::pwd (); 8134 8134 8135 /** 8136 * This is a check for package names 8137 */ 8138 if (CmtMessage::active (Verbose)) 8139 { 8140 Use::UsePtrVector uses (Use::get_ordered_uses ()); 8141 uses.push_back (¤t_use); 8142 for (int i = uses.size () - 1; i >= 0; i--) 8143 { 8144 Use* use = uses[i]; 8145 if (use->discarded) continue; 8146 if (use->m_hidden) continue; 8147 if (!use->located ()) continue; 8148 for (int j = i - 1; j >= 0; j--) 8149 { 8150 Use* use2 = uses[j]; 8151 if (use2->discarded) continue; 8152 if (use2->m_hidden) continue; 8153 if (!use2->located ()) continue; 8154 if (use->prefix == use2->prefix) 8155 { 8156 CmtMessage::warning (use->prefix + "ROOT, " 8157 + use->prefix + "VERSION ill-defined: " 8158 + use->get_package_name () + " and " 8159 + use2->get_package_name () 8160 + " package name conflict"); 8161 } 8162 } 8163 } 8164 } 8135 8165 /** 8136 8166 * This is already done in -
CMT/HEAD/source/cmt_pattern.cxx
r494 r504 846 846 CmtError::set (CmtError::pattern_not_found, name); 847 847 if (CmtMessage::active (Verbose)) 848 CmtMessage::warning (CmtError::get_last_error ()); 848 { 849 cmt_string cmtpath, offset; 850 use->get_cmtpath_and_offset (cmtpath, offset); 851 CmtMessage::warning ((offset != "" ? offset + "/" : "") 852 + use->get_package_name () 853 + ": " + CmtError::get_last_error ()); 854 //CmtMessage::warning (CmtError::get_last_error ()); 855 } 849 856 return; 850 857 }
Note: See TracChangeset
for help on using the changeset viewer.