[ 
https://issues.apache.org/jira/browse/DRILL-6488?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16511963#comment-16511963
 ] 

ASF GitHub Bot commented on DRILL-6488:
---------------------------------------

ilooner closed pull request #1317: DRILL-6488 - change instances of "template 
inline" to just "template"
URL: https://github.com/apache/drill/pull/1317
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/contrib/native/client/src/include/drill/drillClient.hpp 
b/contrib/native/client/src/include/drill/drillClient.hpp
index a09e6661b0..7eabb50915 100644
--- a/contrib/native/client/src/include/drill/drillClient.hpp
+++ b/contrib/native/client/src/include/drill/drillClient.hpp
@@ -201,15 +201,15 @@ namespace meta {
     _DL_INTERVAL_MINUTE_TO_SECOND = 1 << 16L
   };
 
-  template inline _DateTimeLiteralSupport operator&(_DateTimeLiteralSupport 
__a, _DateTimeLiteralSupport __b);
-  template inline _DateTimeLiteralSupport operator|(_DateTimeLiteralSupport 
__a, _DateTimeLiteralSupport __b);
-  template inline _DateTimeLiteralSupport operator^(_DateTimeLiteralSupport 
__a, _DateTimeLiteralSupport __b);
+  template _DateTimeLiteralSupport operator&(_DateTimeLiteralSupport __a, 
_DateTimeLiteralSupport __b);
+  template _DateTimeLiteralSupport operator|(_DateTimeLiteralSupport __a, 
_DateTimeLiteralSupport __b);
+  template _DateTimeLiteralSupport operator^(_DateTimeLiteralSupport __a, 
_DateTimeLiteralSupport __b);
 
-  template inline _DateTimeLiteralSupport& operator&=(_DateTimeLiteralSupport& 
__a, _DateTimeLiteralSupport __b);
-  template inline _DateTimeLiteralSupport& operator|=(_DateTimeLiteralSupport& 
__a, _DateTimeLiteralSupport __b);
-  template inline _DateTimeLiteralSupport& operator^=(_DateTimeLiteralSupport& 
__a, _DateTimeLiteralSupport __b);
+  template _DateTimeLiteralSupport& operator&=(_DateTimeLiteralSupport& __a, 
_DateTimeLiteralSupport __b);
+  template _DateTimeLiteralSupport& operator|=(_DateTimeLiteralSupport& __a, 
_DateTimeLiteralSupport __b);
+  template _DateTimeLiteralSupport& operator^=(_DateTimeLiteralSupport& __a, 
_DateTimeLiteralSupport __b);
 
-  template inline _DateTimeLiteralSupport operator~(_DateTimeLiteralSupport 
__a);
+  template _DateTimeLiteralSupport operator~(_DateTimeLiteralSupport __a);
 
   /**
    * Date time literal support flags
@@ -259,15 +259,15 @@ namespace meta {
       _C_GROUPBY    = 1 << 1L
   };
 
-  template inline _CollateSupport operator&(_CollateSupport __a, 
_CollateSupport __b);
-  template inline _CollateSupport operator|(_CollateSupport __a, 
_CollateSupport __b);
-  template inline _CollateSupport operator^(_CollateSupport __a, 
_CollateSupport __b);
+  template _CollateSupport operator&(_CollateSupport __a, _CollateSupport __b);
+  template _CollateSupport operator|(_CollateSupport __a, _CollateSupport __b);
+  template _CollateSupport operator^(_CollateSupport __a, _CollateSupport __b);
 
-  template inline _CollateSupport& operator&=(_CollateSupport& __a, 
_CollateSupport __b);
-  template inline _CollateSupport& operator|=(_CollateSupport& __a, 
_CollateSupport __b);
-  template inline _CollateSupport& operator^=(_CollateSupport& __a, 
_CollateSupport __b);
+  template _CollateSupport& operator&=(_CollateSupport& __a, _CollateSupport 
__b);
+  template _CollateSupport& operator|=(_CollateSupport& __a, _CollateSupport 
__b);
+  template _CollateSupport& operator^=(_CollateSupport& __a, _CollateSupport 
__b);
 
-  template inline _CollateSupport operator~(_CollateSupport __a);
+  template _CollateSupport operator~(_CollateSupport __a);
 
 
   /**
@@ -339,15 +339,15 @@ namespace meta {
       _OJ_ALL_COMPARISON_OPS    = 1 << 7L //!< _OJ_ALL_COMPARISON_OPS
   };
 
-  template inline _OuterJoinSupport operator&(_OuterJoinSupport __a, 
_OuterJoinSupport __b);
-  template inline _OuterJoinSupport operator|(_OuterJoinSupport __a, 
_OuterJoinSupport __b);
-  template inline _OuterJoinSupport operator^(_OuterJoinSupport __a, 
_OuterJoinSupport __b);
+  template _OuterJoinSupport operator&(_OuterJoinSupport __a, 
_OuterJoinSupport __b);
+  template _OuterJoinSupport operator|(_OuterJoinSupport __a, 
_OuterJoinSupport __b);
+  template _OuterJoinSupport operator^(_OuterJoinSupport __a, 
_OuterJoinSupport __b);
 
-  template inline _OuterJoinSupport& operator&=(_OuterJoinSupport& __a, 
_OuterJoinSupport __b);
-  template inline _OuterJoinSupport& operator|=(_OuterJoinSupport& __a, 
_OuterJoinSupport __b);
-  template inline _OuterJoinSupport& operator^=(_OuterJoinSupport& __a, 
_OuterJoinSupport __b);
+  template _OuterJoinSupport& operator&=(_OuterJoinSupport& __a, 
_OuterJoinSupport __b);
+  template _OuterJoinSupport& operator|=(_OuterJoinSupport& __a, 
_OuterJoinSupport __b);
+  template _OuterJoinSupport& operator^=(_OuterJoinSupport& __a, 
_OuterJoinSupport __b);
 
-  template inline _OuterJoinSupport operator~(_OuterJoinSupport __a);
+  template _OuterJoinSupport operator~(_OuterJoinSupport __a);
 
   /**
    * Outer join support flags
@@ -404,15 +404,15 @@ namespace meta {
       _SQ_IN_QUANTIFIED = 1 << 5L
   };
 
-  template inline _SubQuerySupport operator&(_SubQuerySupport __a, 
_SubQuerySupport __b);
-  template inline _SubQuerySupport operator|(_SubQuerySupport __a, 
_SubQuerySupport __b);
-  template inline _SubQuerySupport operator^(_SubQuerySupport __a, 
_SubQuerySupport __b);
+  template _SubQuerySupport operator&(_SubQuerySupport __a, _SubQuerySupport 
__b);
+  template _SubQuerySupport operator|(_SubQuerySupport __a, _SubQuerySupport 
__b);
+  template _SubQuerySupport operator^(_SubQuerySupport __a, _SubQuerySupport 
__b);
 
-  template inline _SubQuerySupport& operator&=(_SubQuerySupport& __a, 
_SubQuerySupport __b);
-  template inline _SubQuerySupport& operator|=(_SubQuerySupport& __a, 
_SubQuerySupport __b);
-  template inline _SubQuerySupport& operator^=(_SubQuerySupport& __a, 
_SubQuerySupport __b);
+  template _SubQuerySupport& operator&=(_SubQuerySupport& __a, 
_SubQuerySupport __b);
+  template _SubQuerySupport& operator|=(_SubQuerySupport& __a, 
_SubQuerySupport __b);
+  template _SubQuerySupport& operator^=(_SubQuerySupport& __a, 
_SubQuerySupport __b);
 
-  template inline _SubQuerySupport operator~(_SubQuerySupport __a);
+  template _SubQuerySupport operator~(_SubQuerySupport __a);
 
   /**
    * SubQuery support flags
@@ -442,15 +442,15 @@ namespace meta {
       _U_UNION_ALL  = 1 << 2L //!< _U_UNION_ALL
   };
 
-  template inline _UnionSupport operator&(_UnionSupport __a, _UnionSupport 
__b);
-  template inline _UnionSupport operator|(_UnionSupport __a, _UnionSupport 
__b);
-  template inline _UnionSupport operator^(_UnionSupport __a, _UnionSupport 
__b);
+  template _UnionSupport operator&(_UnionSupport __a, _UnionSupport __b);
+  template _UnionSupport operator|(_UnionSupport __a, _UnionSupport __b);
+  template _UnionSupport operator^(_UnionSupport __a, _UnionSupport __b);
 
-  template inline _UnionSupport& operator&=(_UnionSupport& __a, _UnionSupport 
__b);
-  template inline _UnionSupport& operator|=(_UnionSupport& __a, _UnionSupport 
__b);
-  template inline _UnionSupport& operator^=(_UnionSupport& __a, _UnionSupport 
__b);
+  template _UnionSupport& operator&=(_UnionSupport& __a, _UnionSupport __b);
+  template _UnionSupport& operator|=(_UnionSupport& __a, _UnionSupport __b);
+  template _UnionSupport& operator^=(_UnionSupport& __a, _UnionSupport __b);
 
-  template inline _UnionSupport operator~(_UnionSupport __a);
+  template _UnionSupport operator~(_UnionSupport __a);
 
   /**
    * Union support flags


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


> Drill native client - compile error due to usage of "template inline"
> ---------------------------------------------------------------------
>
>                 Key: DRILL-6488
>                 URL: https://issues.apache.org/jira/browse/DRILL-6488
>             Project: Apache Drill
>          Issue Type: Bug
>            Reporter: Patrick Wong
>            Assignee: Patrick Wong
>            Priority: Major
>              Labels: ready-to-commit
>             Fix For: 1.14.0
>
>




--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

Reply via email to