From f634bcece396cf6d51df450729bcd976785a0109 Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Sat, 22 Oct 2011 15:40:28 +0000 Subject: [PATCH] Pack struct better. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@142725 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Driver/OptTable.h | 2 +- lib/Driver/CC1AsOptions.cpp | 2 +- lib/Driver/CC1Options.cpp | 2 +- lib/Driver/DriverOptions.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/clang/Driver/OptTable.h b/include/clang/Driver/OptTable.h index abd224db44..3af6f8fa3e 100644 --- a/include/clang/Driver/OptTable.h +++ b/include/clang/Driver/OptTable.h @@ -49,8 +49,8 @@ namespace options { const char *HelpText; const char *MetaVar; unsigned char Kind; - unsigned short Flags; unsigned char Param; + unsigned short Flags; unsigned short GroupID; unsigned short AliasID; }; diff --git a/lib/Driver/CC1AsOptions.cpp b/lib/Driver/CC1AsOptions.cpp index 90c69ff0d6..ea80f5a20e 100644 --- a/lib/Driver/CC1AsOptions.cpp +++ b/lib/Driver/CC1AsOptions.cpp @@ -18,7 +18,7 @@ using namespace clang::driver::cc1asoptions; static const OptTable::Info CC1AsInfoTable[] = { #define OPTION(NAME, ID, KIND, GROUP, ALIAS, FLAGS, PARAM, \ HELPTEXT, METAVAR) \ - { NAME, HELPTEXT, METAVAR, Option::KIND##Class, FLAGS, PARAM, \ + { NAME, HELPTEXT, METAVAR, Option::KIND##Class, PARAM, FLAGS, \ OPT_##GROUP, OPT_##ALIAS }, #include "clang/Driver/CC1AsOptions.inc" }; diff --git a/lib/Driver/CC1Options.cpp b/lib/Driver/CC1Options.cpp index 14cf0904c4..884b363f63 100644 --- a/lib/Driver/CC1Options.cpp +++ b/lib/Driver/CC1Options.cpp @@ -18,7 +18,7 @@ using namespace clang::driver::cc1options; static const OptTable::Info CC1InfoTable[] = { #define OPTION(NAME, ID, KIND, GROUP, ALIAS, FLAGS, PARAM, \ HELPTEXT, METAVAR) \ - { NAME, HELPTEXT, METAVAR, Option::KIND##Class, FLAGS, PARAM, \ + { NAME, HELPTEXT, METAVAR, Option::KIND##Class, PARAM, FLAGS, \ OPT_##GROUP, OPT_##ALIAS }, #include "clang/Driver/CC1Options.inc" }; diff --git a/lib/Driver/DriverOptions.cpp b/lib/Driver/DriverOptions.cpp index f2d9af86d0..715819d04b 100644 --- a/lib/Driver/DriverOptions.cpp +++ b/lib/Driver/DriverOptions.cpp @@ -17,7 +17,7 @@ using namespace clang::driver::options; static const OptTable::Info InfoTable[] = { #define OPTION(NAME, ID, KIND, GROUP, ALIAS, FLAGS, PARAM, \ HELPTEXT, METAVAR) \ - { NAME, HELPTEXT, METAVAR, Option::KIND##Class, FLAGS, PARAM, \ + { NAME, HELPTEXT, METAVAR, Option::KIND##Class, PARAM, FLAGS, \ OPT_##GROUP, OPT_##ALIAS }, #include "clang/Driver/Options.inc" }; -- 2.50.1