fix typo, add clang check in concurrentqueue

COMBINE-lab · Aug 22, 2016 · ab9bb2f · ab9bb2f
1 parent 61d7bdf
commit ab9bb2f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/include/concurrentqueue.h b/include/concurrentqueue.h
@@ -237,7 +237,7 @@ namespace details {
 			: static_cast<T>(-1);
 	};
 
-#if (defined(__GNUC__) && ((__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 9)))
+#if (!defined(__clang__) && defined(__GNUC__) && ((__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 9)))
 	typedef ::max_align_t max_align_t;      // GCC forgot to add it to std:: for a while
 #else
 	typedef std::max_align_t max_align_t;   // Others (e.g. MSVC) insist it can *only* be accessed via std::

diff --git a/src/SalmonQuantify.cpp b/src/SalmonQuantify.cpp
@@ -2384,7 +2384,7 @@ transcript abundance from RNA-seq reads
         return gzw.writeBootstrap(alphas);
       };
 
-      jointLog->info("Staring Bootstrapping");
+      jointLog->info("Starting Bootstrapping");
       bool bootstrapSuccess =
           optimizer.gatherBootstraps(experiment, sopt, bsWriter, 0.01, 10000);
       jointLog->info("Finished Bootstrapping");