Merge pull request #4636 from diffblue/move-gcc-version

move gcc_version.h/.cpp to ansi-c

Author: tautschnig

src/ansi-c/Makefile

@@ -28,6 +28,7 @@ SRC = anonymous_member.cpp \
       designator.cpp \
       expr2c.cpp \
       gcc_types.cpp \
+      gcc_version.cpp \
       literals/convert_character_literal.cpp \
       literals/convert_float_literal.cpp \
       literals/convert_integer_literal.cpp \

src/goto-cc/gcc_version.cpp src/ansi-c/gcc_version.cppsrc/goto-cc/gcc_version.cpp renamed to src/ansi-c/gcc_version.cpp

@@ -40,13 +40,12 @@ class gcc_versiont
   configt::cppt::cpp_standardt default_cxx_standard;
 
   gcc_versiont()
-    :
-    v_major(0),
-    v_minor(0),
-    v_patchlevel(0),
-    flavor(flavort::UNKNOWN),
-    default_c_standard(configt::ansi_ct::c_standardt::C89),
-    default_cxx_standard(configt::cppt::cpp_standardt::CPP98)
+    : v_major(0),
+      v_minor(0),
+      v_patchlevel(0),
+      flavor(flavort::UNKNOWN),
+      default_c_standard(configt::ansi_ct::c_standardt::C89),
+      default_cxx_standard(configt::cppt::cpp_standardt::CPP98)
   {
   }
 };

src/goto-cc/gcc_version.h src/ansi-c/gcc_version.hsrc/goto-cc/gcc_version.h renamed to src/ansi-c/gcc_version.h

@@ -10,7 +10,6 @@ SRC = armcc_cmdline.cpp \
       gcc_cmdline.cpp \
       gcc_message_handler.cpp \
       gcc_mode.cpp \
-      gcc_version.cpp \
       goto_cc_cmdline.cpp \
       goto_cc_languages.cpp \
       goto_cc_main.cpp \

src/goto-cc/Makefile

@@ -16,9 +16,10 @@ Date: June 2006
 
 #include "compile.h"
 #include "gcc_message_handler.h"
-#include "gcc_version.h"
 #include "goto_cc_mode.h"
 
+#include <ansi-c/gcc_version.h>
+
 #include <set>
 
 class gcc_modet:public goto_cc_modet