Changeset 2fdbb3b

Timestamp:

Feb 12, 2018, 2:38:44 PM (7 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, resolv-new, with_gc

Children:

ff2d1139

Parents:

fd062a66

Message:

Fixed some warnings

Location:

src

Files:

• SymTab/Mangler.cc (modified) (1 diff)
• libcfa/concurrency/monitor.c (modified) (2 diffs)

src/SymTab/Mangler.cc

@@ -99 +99 @@
                         Mangler::Mangler( bool mangleOverridable, bool typeMode, bool mangleGenericParams )
                                 : nextVarNum( 0 ), isTopLevel( true ), mangleOverridable( mangleOverridable ), typeMode( typeMode ), mangleGenericParams( mangleGenericParams ) {}
-
-                        Mangler::Mangler( const Mangler &rhs ) : mangleName() {
-                                varNums = rhs.varNums;
-                                nextVarNum = rhs.nextVarNum;
-                                isTopLevel = rhs.isTopLevel;
-                                mangleOverridable = rhs.mangleOverridable;
-                                typeMode = rhs.typeMode;
-                        }
 
                         void Mangler::mangleDecl( DeclarationWithType * declaration ) {

src/libcfa/concurrency/monitor.c

@@ -151 +151 @@
                         // We already have the monitor... but where about to destroy it so the nesting will fail
                         // Abort!
-                        abort( "Attempt to destroy monitor %p by thread \"%.256s\" (%p) in nested mutex." );
+                        abort( "Attempt to destroy monitor %p by thread \"%.256s\" (%p) in nested mutex.", this, thrd->self_cor.name, thrd );
                 }
 
@@ -427 +427 @@
                 thread_desc * this_thrd = this_thread;
                 if ( this.monitor_count != this_thrd->monitors.size ) {
-                        abort( "Signal on condition %p made with different number of monitor(s), expected %i got %i", &this, this.monitor_count, this_thrd->monitors.size );
+                        abort( "Signal on condition %p made with different number of monitor(s), expected %li got %li", &this, this.monitor_count, this_thrd->monitors.size );
                 }
 
                 for(int i = 0; i < this.monitor_count; i++) {
                         if ( this.monitors[i] != this_thrd->monitors[i] ) {
-                                abort( "Signal on condition %p made with different monitor, expected %p got %i", &this, this.monitors[i], this_thrd->monitors[i] );
+                                abort( "Signal on condition %p made with different monitor, expected %p got %p", &this, this.monitors[i], this_thrd->monitors[i] );
                         }
                 }