Changeset 666 for CMT/v1r25-branch/source/cmt_symbol.cxx
- Timestamp:
- Jan 26, 2014, 8:58:41 AM (11 years ago)
- Location:
- CMT/v1r25-branch
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
CMT/v1r25-branch
-
CMT/v1r25-branch/source/cmt_symbol.cxx
r664 r666 2369 2369 resolve_value (new_value, symbol.name, temp); 2370 2370 temp = new_value; 2371 2372 // We clear the error since the set is defined in requirements 2373 // and the environment variable ought not to have been used 2374 if (CmtError::get_last_error_code () == CmtError::warning && 2375 CmtError::get_last_error () == 2376 CmtError::get_error_name (CmtError::warning) + ": " "getenv (" + symbol.name + ") denied") 2377 CmtError::clear (); 2371 2378 } 2372 2379 else if (temp == "") … … 2391 2398 CmtError::set (CmtError::warning, 2392 2399 "getenv (" + symbol.name + ") denied"); 2393 return ""; 2400 // return ""; 2401 // We will clear the error if the set is defined in requirements 2394 2402 } 2395 2403 } … … 2680 2688 CmtError::set (CmtError::warning, 2681 2689 "getenv (" + symbol.name + ") denied"); 2682 return ""; 2690 // return ""; 2691 // We will clear the error if the path is defined in requirements 2683 2692 } 2684 2693 … … 2722 2731 //temp = new_value; 2723 2732 filter_path_value (symbol, temp_vector); 2733 2734 // We clear the error since the path is defined in requirements 2735 // and the environment variable ought not to have been used 2736 if (CmtError::get_last_error_code () == CmtError::warning && 2737 CmtError::get_last_error () == 2738 CmtError::get_error_name (CmtError::warning) + ": " "getenv (" + symbol.name + ") denied") 2739 CmtError::clear (); 2724 2740 } 2725 2741 … … 3819 3835 { 3820 3836 // print error occurred before value expansion 3821 CmtMessage::error (msg); 3837 if (code != CmtError::warning) 3838 CmtMessage::error (msg); 3839 else 3840 CmtMessage::warning (msg); 3822 3841 } 3823 3842 // We keep CmtError::warning to indicate that
Note: See TracChangeset
for help on using the changeset viewer.