[trafficserver] branch master updated: CacheTool: Fix clang build problem on CentOS.

[am...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

amc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new d70946b  CacheTool: Fix clang build problem on CentOS.
d70946b is described below

commit d70946b9d840ef46a1abb1037f47499b7bd8ea12
Author: Alan M. Carroll <am...@apache.org>
AuthorDate: Thu Mar 22 18:32:56 2018 -0500

    CacheTool: Fix clang build problem on CentOS.
---
 cmd/traffic_cache_tool/CacheTool.cc | 2 +-
 lib/ts/Scalar.h                     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmd/traffic_cache_tool/CacheTool.cc b/cmd/traffic_cache_tool/CacheTool.cc
index 8dc03c7..3e64f96 100644
--- a/cmd/traffic_cache_tool/CacheTool.cc
+++ b/cmd/traffic_cache_tool/CacheTool.cc
@@ -1443,7 +1443,7 @@ VolumeAllocator::allocateFor(Span &span)
   }
   assert(total_shares != 0);
   // Now allocate blocks.
-  CacheStripeBlocks span_blocks{round_down(span._free_space)};
+  CacheStripeBlocks span_blocks(round_down(span._free_space));
   CacheStripeBlocks span_used{0};
 
   // sort by deficit so least relatively full volumes go first.
diff --git a/lib/ts/Scalar.h b/lib/ts/Scalar.h
index 2142ed3..783f8c2 100644
--- a/lib/ts/Scalar.h
+++ b/lib/ts/Scalar.h
@@ -101,13 +101,13 @@ namespace detail
 
      Conversions between scales and types for the scalar helpers is done inside the helper classes
      and a user type conversion operator exists so the helper can be converted by the compiler to
-     the correct type. For the untis bases conversion this is done in @c Scalar because the
+     the correct type. For the units bases conversion this is done in @c Scalar because the
      generality of the needed conversion is too broad to be easily used. It can be done but there is
      some ugliness due to the fact that in some cases two user conversions which is difficult to
      deal with. I have tried it both ways and overall this seems a cleaner implementation.
 
-     Much of this is driven by the fact that the assignment operator, in some case, can not be
-     templated and therefore to have a nice interace for assignment this split is needed.
+     Much of this is driven by the fact that the assignment operator, in some cases, can not be
+     templated and therefore to have a nice interface for assignment this split is needed.
    */
 
   // Unit value, to be rounded up.

-- 
To stop receiving notification emails like this one, please contact
amc@apache.org.