[kudu] branch master updated: schema.h: fix compilation with old gcc

[al...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new ec8102c  schema.h: fix compilation with old gcc
ec8102c is described below

commit ec8102cd3cccd3af2f5c042518c9283447c96eef
Author: Adar Dembo <ad...@cloudera.com>
AuthorDate: Sun Oct 27 21:58:55 2019 -0700

    schema.h: fix compilation with old gcc
    
    This file fails to compile with the system gcc found on CentOS 6.6
    (version 4.4.7) with the following error:
    
      kudu/client/schema.h:115: error: a class-key must be used when declaring a friend
      kudu/client/schema.h:115: error: friend declaration does not name a class or function
      kudu/client/schema.h:116: error: a class-key must be used when declaring a friend
      kudu/client/schema.h:116: error: friend declaration does not name a class or function
      kudu/client/schema.h:117: error: a class-key must be used when declaring a friend
      kudu/client/schema.h:117: error: friend declaration does not name a class or function
    
    It's a regression from commit 4343fb746. What's perplexing is that while
    it's reliably showing up in the dist-test dashboard as a
    client_examples-test.sh failure, it's not reliably reproducible. When I'm
    logged into a CentOS 6.6 machine I can repro the failed g++ attempt, but if
    I run the failed test itself, it passes.
    
    Change-Id: I5916501fc52910bcc0e843726a1d684be6d56417
    Reviewed-on: http://gerrit.cloudera.org:8080/14557
    Reviewed-by: Alexey Serbin <as...@cloudera.com>
    Tested-by: Kudu Jenkins
---
 src/kudu/client/schema.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/kudu/client/schema.h b/src/kudu/client/schema.h
index 85e39b6..815ea3b 100644
--- a/src/kudu/client/schema.h
+++ b/src/kudu/client/schema.h
@@ -112,9 +112,9 @@ class KUDU_EXPORT KuduColumnTypeAttributes {
   uint16_t length() const;
 
  private:
-  friend KuduColumnSchema;
-  friend KuduColumnSpec;
-  friend KuduSchema;
+  friend class KuduColumnSchema;
+  friend class KuduColumnSpec;
+  friend class KuduSchema;
 
   KuduColumnTypeAttributes(int8_t precision, int8_t scale, uint16_t length);