Changeset 5b51f5e for src/libcfa/bits/defs.h

Timestamp:

Jan 5, 2018, 3:21:42 PM (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, resolv-new, with_gc

Children:

65deb18, cae28da

Parents:

5c4f2c2 (diff), b834e98 (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

File:

• src/libcfa/bits/defs.h (modified) (2 diffs)

src/libcfa/bits/defs.h

@@ -1 @@
-//
+// 
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-//
-// bits/defs.h --
-//
+// 
+// defs.h -- 
+// 
 // Author           : Thierry Delisle
-// Created On       : Thu Nov 09 13:24:10 2017
-// Last Modified By :
-// Last Modified On :
-// Update Count     :
-//
+// Created On       : Thu Nov  9 13:24:10 2017
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jan  2 09:17:06 2018
+// Update Count     : 2
+// 
 
 #pragma once
@@ -20 +20 @@
 #include <stdint.h>
 
-#define unlikely(x)    __builtin_expect(!!(x), 0)
-#define likely  (x)    __builtin_expect(!!(x), 1)
+#define likely(x)   __builtin_expect(!!(x), 1)
+#define unlikely(x) __builtin_expect(!!(x), 0)
 #define thread_local _Thread_local