This method would have to be out-of-line to work after I made Flags<>…

… actually safe
dzhu · Oct 7, 2015 · 47cfe40 · 47cfe40
1 parent 06aa568
commit 47cfe40
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/src/IndexerJob.cpp b/src/IndexerJob.cpp
@@ -65,7 +65,7 @@ String IndexerJob::encode() const
         std::shared_ptr<Project> proj = Server::instance()->project(project);
         const Server::Options &options = Server::instance()->options();
         Source copy = source;
-        if ((options.flag(Server::Weverything) || options.flag(Server::Wall)) && source.arguments.contains("-Werror")) {
+        if (options.options & (Server::Weverything|Server::Wall) && source.arguments.contains("-Werror")) {
             for (const auto &arg : options.defaultArguments) {
                 if (arg != "-Wall" && arg != "-Weverything")
                     copy.arguments << arg;
@@ -74,14 +74,14 @@ String IndexerJob::encode() const
             copy.arguments << options.defaultArguments;
         }
 
-        if (!options.flag(Server::AllowPedantic)) {
+        if (!(options.options & Server::AllowPedantic)) {
             const int idx = copy.arguments.indexOf("-Wpedantic");
             if (idx != -1) {
                 copy.arguments.removeAt(idx);
             }
         }
 
-        if (options.flag(Server::EnableCompilerManager))
+        if (options.options & Server::EnableCompilerManager)
             CompilerManager::applyToSource(copy, false, true);
 
         for (const String &blocked : options.blockedArguments) {
@@ -108,7 +108,7 @@ String IndexerJob::encode() const
             copy.includePaths << inc;
         }
         copy.defines << options.defines;
-        if (!(options.flag(Server::EnableNDEBUG))) {
+        if (!(options.options & Server::EnableNDEBUG)) {
             copy.defines.remove(Source::Define("NDEBUG"));
         }
         assert(!sourceFile.isEmpty());

diff --git a/src/Server.cpp b/src/Server.cpp
@@ -122,16 +122,16 @@ bool Server::init(const Options &options)
     RTags::initMessages();
 
     mOptions = options;
-    mSuspended = (options.flag(StartSuspended));
-    if (!(options.flag(NoUnlimitedErrors)))
+    mSuspended = (options.options & StartSuspended);
+    if (!(options.options & NoUnlimitedErrors))
         mOptions.defaultArguments << "-ferror-limit=0";
-    if (options.flag(Wall))
+    if (options.options & Wall)
         mOptions.defaultArguments << "-Wall";
-    if (options.flag(Weverything))
+    if (options.options & Weverything)
         mOptions.defaultArguments << "-Weverything";
-    if (options.flag(SpellChecking))
+    if (options.options & SpellChecking)
         mOptions.defaultArguments << "-fspell-checking";
-    if (!(options.flag(NoNoUnknownWarningsOption)))
+    if (!(options.options & NoNoUnknownWarningsOption))
         mOptions.defaultArguments.append("-Wno-unknown-warning-option");
 
     if (mOptions.options & EnableCompilerManager) {

diff --git a/src/Server.h b/src/Server.h
@@ -99,8 +99,6 @@ class Server
         List<Path> tests;
         Set<Path> ignoredCompilers;
         List<std::regex> extraCompilers;
-
-        inline bool flag(enum Option o) const { return 0 != (options & o); }
     };
     bool init(const Options &options);
     bool runTests();