diff options
| author | m8pple <dt10@imperial.ac.uk> | 2014-10-23 14:01:11 +0100 |
|---|---|---|
| committer | m8pple <dt10@imperial.ac.uk> | 2014-10-23 14:01:11 +0100 |
| commit | f3718ed98fb6945534f830dd8fc8af9ba5b334a3 (patch) | |
| tree | cf81e4e46e7b13eea03ed4a4efb1e05296b8c21e | |
| parent | ace3ac9d8bb62b81f373ec5725b1895dab33e3f2 (diff) | |
| parent | 36dbefa163cca5994f31c7984ac01dcabf02cf36 (diff) | |
| download | MipsCPU-f3718ed98fb6945534f830dd8fc8af9ba5b334a3.tar.gz MipsCPU-f3718ed98fb6945534f830dd8fc8af9ba5b334a3.zip | |
Merge pull request #14 from OJFord/master
Fixed: #13 (C++11)
Fixed: #15 (test name warning)
| -rw-r--r-- | makefile | 3 | ||||
| -rw-r--r-- | src/shared/mips_test_framework.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -5,6 +5,9 @@ LOGIN ?= eie2ugs CPPFLAGS += -W -Wall -g CPPFLAGS += -I include +CFLAGS += -std=c99 +CXXFLAGS += -std=c++11 + # Force the inclusion of C++ standard libraries LDLIBS += -lstdc++ diff --git a/src/shared/mips_test_framework.cpp b/src/shared/mips_test_framework.cpp index b575fa1..2646bc6 100644 --- a/src/shared/mips_test_framework.cpp +++ b/src/shared/mips_test_framework.cpp @@ -33,7 +33,7 @@ struct instr_info_t static const instr_info_t sg_instructionsArray[]= { - {"<internal>", "Tests of things other than intructions."}, + {"<INTERNAL>", "Tests of things other than intructions."}, {"ADD","Add (with overflow)"}, {"ADDI","Add immediate (with overflow)"}, {"ADDIU","Add immediate unsigned (no overflow)"}, |