commit f634bcece396cf6d51df450729bcd976785a0109
author Benjamin Kramer <benny.kra@googlemail.com> Sat Oct 22 15:40:28 2011 +0000
committer Benjamin Kramer <benny.kra@googlemail.com> Sat Oct 22 15:40:28 2011 +0000
tree 1f4d838dbbddb956b3a87f34499c6832399e4309
parent ba81d966fb9afc6e2a3144107fe605ed022e4cfe

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

diff --git a/include/clang/Driver/OptTable.h b/include/clang/Driver/OptTable.h
index abd224d..3af6f8f 100644
--- a/include/clang/Driver/OptTable.h
+++ b/include/clang/Driver/OptTable.h
@@ -49,8 +49,8 @@
       const char *HelpText;
       const char *MetaVar;
       unsigned char Kind;
-      unsigned short Flags;
       unsigned char Param;
+      unsigned short Flags;
       unsigned short GroupID;
       unsigned short AliasID;
     };

lib/Driver/CC1AsOptions.cpp

diff --git a/lib/Driver/CC1AsOptions.cpp b/lib/Driver/CC1AsOptions.cpp
index 90c69ff..ea80f5a 100644
--- a/lib/Driver/CC1AsOptions.cpp
+++ b/lib/Driver/CC1AsOptions.cpp
@@ -18,7 +18,7 @@
 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"
 };

lib/Driver/CC1Options.cpp

diff --git a/lib/Driver/CC1Options.cpp b/lib/Driver/CC1Options.cpp
index 14cf090..884b363 100644
--- a/lib/Driver/CC1Options.cpp
+++ b/lib/Driver/CC1Options.cpp
@@ -18,7 +18,7 @@
 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"
 };

lib/Driver/DriverOptions.cpp

diff --git a/lib/Driver/DriverOptions.cpp b/lib/Driver/DriverOptions.cpp
index f2d9af8..715819d 100644
--- a/lib/Driver/DriverOptions.cpp
+++ b/lib/Driver/DriverOptions.cpp
@@ -17,7 +17,7 @@
 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"
 };