[arrow] branch master updated: ARROW-2404: [C++] Fix "declaration of 'type_id' hides class member" w…

[uw...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 83bfb39  ARROW-2404: [C++] Fix "declaration of 'type_id' hides class member" w…
83bfb39 is described below

commit 83bfb396b9223f4f36d2747b4d57bbd56affe967
Author: rip.nsk <ri...@gmail.com>
AuthorDate: Fri Apr 6 15:17:25 2018 +0200

    ARROW-2404: [C++] Fix "declaration of 'type_id' hides class member" w…
    
    …arning in msvc build
    
    Author: rip.nsk <ri...@gmail.com>
    
    Closes #1843 from rip-nsk/ARROW-2404 and squashes the following commits:
    
    3218313 <rip.nsk> ARROW-2404:  Fix "declaration of 'type_id' hides class member" warning in msvc build
---
 cpp/src/arrow/type.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cpp/src/arrow/type.h b/cpp/src/arrow/type.h
index 95f010a..ce213b9 100644
--- a/cpp/src/arrow/type.h
+++ b/cpp/src/arrow/type.h
@@ -437,8 +437,8 @@ class ARROW_EXPORT FixedSizeBinaryType : public FixedWidthType, public Parametri
 
   explicit FixedSizeBinaryType(int32_t byte_width)
       : FixedWidthType(Type::FIXED_SIZE_BINARY), byte_width_(byte_width) {}
-  explicit FixedSizeBinaryType(int32_t byte_width, Type::type type_id)
-      : FixedWidthType(type_id), byte_width_(byte_width) {}
+  explicit FixedSizeBinaryType(int32_t byte_width, Type::type override_type_id)
+      : FixedWidthType(override_type_id), byte_width_(byte_width) {}
 
   Status Accept(TypeVisitor* visitor) const override;
   std::string ToString() const override;

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