Merge remote-tracking branch 'origin/master' into bektchiev/feat-expose-internal-classes

Author: mbektchiev

src/Binary/binarySerializer.cpp

@@ -272,7 +272,7 @@ void binary::BinarySerializer::serializeModule(clang::Module* module, binary::Mo
             llvm::ErrorOr<bool> isStatic = isStaticFramework(module);
             assert(isStatic.getError().value() == 0);
 
-            bool isDynamic = isStatic.getError().value() == 0 && !isStatic.get()
+            bool isDynamic = isStatic.getError().value() == 0 && !isStatic.get();
             if (isDynamic) {
                 flags |= 1;
             }

src/TypeScript/DocSetManager.cpp

@@ -10,17 +10,22 @@
 namespace {
 using namespace std;
 
+
+bool isntspace(char ch) {
+    return !std::isspace(ch);
+}
+
 // trim from start
 std::string& ltrim(std::string& s)
 {
-    s.erase(s.begin(), std::find_if(s.begin(), s.end(), std::not1(std::ptr_fun<int, int>(std::isspace))));
+    s.erase(s.begin(), std::find_if(s.begin(), s.end(), isntspace));
     return s;
 }
 
 // trim from end
 std::string& rtrim(std::string& s)
 {
-    s.erase(std::find_if(s.rbegin(), s.rend(), std::not1(std::ptr_fun<int, int>(std::isspace))).base(), s.end());
+    s.erase(std::find_if(s.rbegin(), s.rend(), isntspace).base(), s.end());
     return s;
 }
 
@@ -226,4 +231,4 @@ xmlDocPtr DocSetManager::getXmlDocFileFor(std::string name, Meta::MetaType type,
     }
     return nullptr;
 }
-}
+}