Changeset 545 for CMT/HEAD/source

Timestamp:

Jul 2, 2010, 9:57:05 AM (14 years ago)

Author:

rybkin

Message:

See C.L. 430

Location:

CMT/HEAD/source

Files:

• cmt_symbol.cxx (modified) (4 diffs)
• cmt_system.cxx (modified) (3 diffs)

CMT/HEAD/source/cmt_symbol.cxx

@@ -2779 +2779 @@
         {
           if (!tag->is_selected ()) continue;
+          selected = value_number;
+          if (tag == Tag::get_default ())
+            continue;
         }
       else
@@ -2785 +2788 @@
           selected = value_number;
         }
+
+      //
+      // Only the value for the first alternative (i.e. non-default)
+      // matching tag expression is
+      // selected (which means the selection stops here)
+      //
+      break;
 
       //
@@ -2791 +2801 @@
       // of '>=')
       //
-
+      /*
       if (tag->get_priority () > priority)
         {
@@ -2797 +2807 @@
           selected = value_number;
         }
+      */
     }
 

CMT/HEAD/source/cmt_system.cxx

@@ -38 +38 @@
 #include <time.h>
 #include <dirent.h>
+#include <sys/utsname.h>
 #endif
 
@@ -1164 +1165 @@
 
   uname = "";
-
+  struct utsname buf;
+
+  if (::uname (&buf) >= 0)
+    {
+      uname = buf.sysname;
+    }
+  else
+    {
+      perror ("uname");
+    }
+
+  /*
   FILE* file;
 
@@ -1186 +1198 @@
       pclose (file);
     }
+  */
 #endif
 }