Changeset 453 for CMT

Timestamp:

Apr 16, 2008, 11:20:39 AM (16 years ago)

Author:

rybkin

Message:

See C.L. 354

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_generators.cxx (modified) (1 diff)
• source/cmt_parser.cxx (modified) (1 diff)

CMT/HEAD/ChangeLog

@@ +1 @@
+2008-04-15    <rybkin@lal.in2p3.fr> 354
+        
+        * source/cmt_parser.cxx: Take into account current value of type CmtDirStyle
+        when checking for file version.cmt
+        * source/cmt_generators.cxx: make a copy of a vector of type Use::UsePtrVector
+        rather than get a reference
+        
 2008-04-14    <rybkin@lal.in2p3.fr> 353
         

CMT/HEAD/source/cmt_generators.cxx

@@ -3041 +3041 @@
 void DependencyGenerator::prepare_header_file_filters ()
 {
-  Use::UsePtrVector& uses = Use::get_ordered_uses ();
+//   Use::UsePtrVector& uses = Use::get_ordered_uses ();
+  Use::UsePtrVector uses (Use::get_ordered_uses ());
   uses.push_back (&Use::current ());
   for (int i = uses.size () - 1; i >= 0; i--)

CMT/HEAD/source/cmt_parser.cxx

@@ -837 +837 @@
       cmt_string version_file = "..";
       version_file += CmtSystem::file_separator ();
-      version_file += "cmt";
+      switch (Me.m_current_style)
+        {
+        case cmt_style:
+          version_file += "cmt";
+          break;
+        case mgr_style:
+          version_file += "mgr";
+          break;
+        default:
+          break;
+        }
       version_file += CmtSystem::file_separator ();
       version_file += "version.cmt";