Changeset 5fec3f6 for src

Timestamp:

May 8, 2018, 11:55:44 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

4990812

Parents:

14a61b5 (diff), 387c9a1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src

Files:

• libcfa/interpose.h (deleted)
• main.cc (modified) (4 diffs)

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May  6 22:25:59 2018
-// Update Count     : 491
+// Last Modified On : Mon May  7 14:35:57 2018
+// Update Count     : 492
 //
 
@@ -407 +407 @@
         opterr = 0;                                                                                     // (global) prevent getopt from printing error messages
 
-        bool Werror = false;
+        bool Wsuppress = false, Werror = false;
         int c;
         while ( (c = getopt_long( argc, argv, "abBcCdefgGlLmnNpqrstTvwW:yzZD:F:", long_opts, &long_index )) != -1 ) {
@@ -495 +495 @@
                         break;
                   case 'w':
-                        SemanticWarning_SuppressAll();
+                        Wsuppress = true;
                         break;
                   case 'W':
@@ -545 +545 @@
                 SemanticWarning_WarningAsError();
         } // if
+        if ( Wsuppress ) {
+                SemanticWarning_SuppressAll();
+        } // if
         // for ( const auto w : WarningFormats ) {
         //      cout << w.name << ' ' << (int)w.severity << endl;