From 55cc5d40ec16ea0639046ff1487636ba618d0e09 Mon Sep 17 00:00:00 2001 From: Andrew Waterman Date: Tue, 12 Feb 2013 22:59:56 -0800 Subject: [PATCH] migrate to c++11 --- configure | 2 +- configure.ac | 2 +- riscv/common.h | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/configure b/configure index ceffbf7..da2d49c 100755 --- a/configure +++ b/configure @@ -4008,7 +4008,7 @@ fi CFLAGS="-Wall -O2 -Wno-unused" -CXXFLAGS="-Wall -O2 -Wno-pmf-conversions" +CXXFLAGS="-Wall -O2 -std=c++0x -Wno-pmf-conversions" #------------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index 4a12469..94d9980 100644 --- a/configure.ac +++ b/configure.ac @@ -72,7 +72,7 @@ AC_HEADER_STDC #------------------------------------------------------------------------- AC_SUBST([CFLAGS], ["-Wall -O2 -Wno-unused"]) -AC_SUBST([CXXFLAGS],["-Wall -O2 -Wno-pmf-conversions"]) +AC_SUBST([CXXFLAGS],["-Wall -O2 -std=c++0x -Wno-pmf-conversions"]) #------------------------------------------------------------------------- # MCPPBS subproject list diff --git a/riscv/common.h b/riscv/common.h index 801baf8..03f8c8e 100644 --- a/riscv/common.h +++ b/riscv/common.h @@ -1,8 +1,6 @@ #ifndef _RISCV_COMMON_H #define _RISCV_COMMON_H -#define static_assert(x) switch (x) case 0: case (x): - #define likely(x) __builtin_expect(x, 1) #define unlikely(x) __builtin_expect(x, 0) -- 2.30.2