Changeset 581
- Timestamp:
- Jun 8, 2011, 3:12:36 PM (13 years ago)
- Location:
- CMT/HEAD
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
CMT/HEAD/ChangeLog
r576 r581 1 2011-06-08 <rybkin@lal.in2p3.fr> 459 2 3 * source/cmt_regexp.h: In class cmt_regexp, introduce clear function 4 * source/cmt_regexp.cxx: In class cmt_regexp, implement clear function 5 * source/cmt_use.h: In class Use, make class Project friend (to give access 6 to function clear) 7 * source/cmt_use.cxx: In class Use, function clear, clear new members 8 alternate_is_head_versions and m_head_version, in class UseProjectAction, 9 function run, clear Use new member alternate_is_head_versions 10 * source/cmt_project.h: In class Project, make copy constructor and 11 assignment operator private 12 * source/cmt_project.cxx: In class Project, function container_action, 13 invoke clear function on container (rather than destructor) 14 1 15 2011-05-10 <rybkin@lal.in2p3.fr> 458 2 16 -
CMT/HEAD/source/cmt_project.cxx
r568 r581 2305 2305 // omission does not permit <path>) 2306 2306 // 2307 Use* use = &m_container;2308 use->~Use ();2309 2307 if (words.size () < 2) return; 2310 2308 … … 2337 2335 if (ewords.size () > 2) path = ewords[2]; 2338 2336 2339 if (name != "") 2340 { 2341 use->set (name, version, path); 2342 use->get_package ()->remove_use (use); 2343 CmtSystem::cd (m_cmtpath_pwd); 2344 if (use->move_to ("", true) && 2345 !CmtSystem::absolute_path (use->real_path)) 2346 { 2347 use->change_path (m_cmtpath_pwd); 2348 } 2349 CmtSystem::cd (m_cmtpath_pwd + CmtSystem::file_separator () + "cmt"); 2350 } 2337 Use* use = &m_container; 2338 if (name == "") 2339 { 2340 use->clear (); 2341 return; 2342 } 2343 if (version == "") version = "*"; 2344 2345 use->set (name, version, path); 2346 use->get_package ()->remove_use (use); 2347 CmtSystem::cd (m_cmtpath_pwd); 2348 if (use->move_to ("", true) && 2349 !CmtSystem::absolute_path (use->real_path)) 2350 { 2351 use->change_path (m_cmtpath_pwd); 2352 } 2353 CmtSystem::cd (m_cmtpath_pwd + CmtSystem::file_separator () + "cmt"); 2351 2354 2352 2355 set_container_name (name); -
CMT/HEAD/source/cmt_project.h
r550 r581 180 180 void use_action (const cmt_string& name, const cmt_string& release); 181 181 182 Project& operator = (const Project& other);182 // Project& operator = (const Project& other); 183 183 bool operator == (const cmt_string& name) const; 184 184 bool operator != (const cmt_string& name) const; … … 215 215 private: 216 216 217 Project& operator = (const Project& other); 218 Project (const Project& other); 219 217 220 void fill_cmtpath (cmt_string& buffer); 218 221 -
CMT/HEAD/source/cmt_regexp.cxx
r400 r581 1581 1581 } 1582 1582 1583 //---------------------------------------------------------- 1584 void cmt_regexp::clear () 1585 { 1586 if (_root != 0) 1587 { 1588 delete _root; 1589 _root = 0; 1590 } 1591 } 1592 1593 //---------------------------------------------------------- 1583 1594 bool cmt_regexp::is_valid () const 1584 1595 { -
CMT/HEAD/source/cmt_regexp.h
r11 r581 18 18 cmt_regexp (const cmt_string& expression); 19 19 ~cmt_regexp (); 20 void clear (); 20 21 21 22 void set (const cmt_string& expression); -
CMT/HEAD/source/cmt_use.cxx
r576 r581 1869 1869 alternate_versions.clear (); 1870 1870 alternate_paths.clear (); 1871 alternate_is_head_versions.clear (); 1872 1873 m_head_version.clear (); 1871 1874 1872 1875 version_alias = ""; … … 2293 2296 m_use->alternate_versions.clear (); 2294 2297 m_use->alternate_paths.clear (); 2298 m_use->alternate_is_head_versions.clear (); 2295 2299 2296 2300 if (m_use->reach_package (path, this->native_version)) -
CMT/HEAD/source/cmt_use.h
r575 r581 17 17 class Package; 18 18 class UseProjectAction; 19 class Project; 19 20 20 21 class Use … … 240 241 241 242 friend class UseProjectAction; 243 friend class Project; 242 244 }; 243 245
Note: See TracChangeset
for help on using the changeset viewer.