Compile fixes for GCC 6+

Author: pmenon

src/codegen/codegen.cpp

@@ -155,16 +155,23 @@ llvm::Value *CodeGen::Printf(const std::string &format,
                              const std::vector<llvm::Value *> &args) {
   auto *printf_fn = LookupBuiltin("printf");
   if (printf_fn == nullptr) {
+#if GCC_AT_LEAST_6
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wignored-attributes"
+#endif
     printf_fn = RegisterBuiltin(
         "printf", llvm::TypeBuilder<decltype(printf), false>::get(GetContext()),
         reinterpret_cast<void *>(printf));
+#if GCC_AT_LEAST_6
+#pragma GCC diagnostic pop
+#endif
   }
 
   // Collect all the arguments into a vector
   std::vector<llvm::Value *> printf_args = {ConstString(format, "format")};
   printf_args.insert(printf_args.end(), args.begin(), args.end());
 
-  // Call the function
+  // Call printf()
   return CallFunc(printf_fn, printf_args);
 }
 
@@ -173,11 +180,20 @@ llvm::Value *CodeGen::Memcmp(llvm::Value *ptr1, llvm::Value *ptr2,
   static constexpr char kMemcmpFnName[] = "memcmp";
   auto *memcmp_fn = LookupBuiltin(kMemcmpFnName);
   if (memcmp_fn == nullptr) {
+#if GCC_AT_LEAST_6
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wignored-attributes"
+#endif
     memcmp_fn = RegisterBuiltin(
         kMemcmpFnName,
         llvm::TypeBuilder<decltype(memcmp), false>::get(GetContext()),
         reinterpret_cast<void *>(printf));
+#if GCC_AT_LEAST_6
+#pragma GCC diagnostic pop
+#endif
   }
+
+  // Call memcmp()
   return CallFunc(memcmp_fn, {ptr1, ptr2, len});
 }
 

src/function/date_functions.cpp

@@ -82,8 +82,8 @@ int32_t DateFunctions::DateToJulian(int32_t year, int32_t month, int32_t day) {
   return julian;
 }
 
-void DateFunctions::JulianToDate(int32_t julian_date, int32_t &year, int32_t &month,
-                                 int32_t &day) {
+void DateFunctions::JulianToDate(int32_t julian_date, int32_t &year,
+                                 int32_t &month, int32_t &day) {
   // From Postgres j2date()
 
   uint32_t julian = static_cast<uint32_t>(julian_date);

src/include/common/macros.h

@@ -97,20 +97,13 @@ namespace peloton {
 #endif /* CHECK_INVARIANTS */
 
 //===--------------------------------------------------------------------===//
-// override
+// Compiler version checks
 //===--------------------------------------------------------------------===//
 
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)
-#define GCC_AT_LEAST_47 1
+#if __GNUC__ > 6 || (__GNUC__ == 6 && __GNUC_MINOR__ >= 0)
+#define GCC_AT_LEAST_6 1
 #else
-#define GCC_AT_LEAST_47 0
-#endif
-
-// g++-4.6 does not support override
-#if GCC_AT_LEAST_47
-#define OVERRIDE override
-#else
-#define OVERRIDE
+#define GCC_AT_LEAST_6 0
 #endif
 
 //===--------------------------------------------------------------------===//