Changeset c6a1e8a for src/AST/Bitfield.hpp

Timestamp:

Jun 5, 2019, 8:36:48 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

866545b

Parents:

67130fe (diff), 3cd5fdd (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:

fix conflicit

File:

• src/AST/Bitfield.hpp (modified) (2 diffs)

src/AST/Bitfield.hpp

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Thu May 9 10:00:00 2019
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Thu May 9 10:00:00 2019
-// Update Count     : 1
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Jun 5 10:00:00 2019
+// Update Count     : 2
 //
 
 #pragma once
 
-#include <strings.h>  // for ffs
+#include <strings.h>   // for ffs
+#include <type_traits> // for is_unsigned
 
 /// Make a type a bitfield.
@@ -24 +25 @@
 template<typename T>
 struct bitfield : public T {
-        static_assert(sizeof(T) == sizeof(unsigned int), "Type has incorrect size");
         using T::val;
         using val_t = decltype(val);
+        static_assert(sizeof(T) == sizeof(unsigned int), "Type has incorrect size");
+        static_assert(std::is_unsigned<val_t>::value, "Bitfield val field is not unsigned.");
 
         constexpr bitfield() : T( 0 ) {}