← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to m4/pandora_warnings.m4

Merge Jay (build only related)

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/pandora_warnings.m4
204
204
      AS_IF([test "$ac_cv_safe_to_use_Wredundant_decls_" = "yes"],
205
205
            [CXX_WARNINGS="${CXX_WARNINGS} -Wredundant-decls"],
206
206
            [CXX_WARNINGS="${CXX_WARNINGS} -Wno-redundant-decls"])
 
207
 
 
208
      AC_CACHE_CHECK([whether it is safe to use -Wattributes from C++],
 
209
        [ac_cv_safe_to_use_Wattributes_],
 
210
        [AC_LANG_PUSH(C++)
 
211
         save_CXXFLAGS="${CXXFLAGS}"
 
212
         CXXFLAGS="${W_FAIL} -pedantic -Wattributes -fvisibility=hidden ${AM_CXXFLAGS}"
 
213
         AC_COMPILE_IFELSE(
 
214
           [AC_LANG_PROGRAM([
 
215
#include <google/protobuf/message.h>
 
216
#include <google/protobuf/descriptor.h>
 
217
 
 
218
 
 
219
const ::google::protobuf::EnumDescriptor* Table_TableOptions_RowType_descriptor();
 
220
enum Table_TableOptions_RowType {
 
221
  Table_TableOptions_RowType_ROW_TYPE_DEFAULT = 0,
 
222
  Table_TableOptions_RowType_ROW_TYPE_FIXED = 1,
 
223
  Table_TableOptions_RowType_ROW_TYPE_DYNAMIC = 2,
 
224
  Table_TableOptions_RowType_ROW_TYPE_COMPRESSED = 3,
 
225
  Table_TableOptions_RowType_ROW_TYPE_REDUNDANT = 4,
 
226
  Table_TableOptions_RowType_ROW_TYPE_COMPACT = 5,
 
227
  Table_TableOptions_RowType_ROW_TYPE_PAGE = 6
 
228
};
 
229
 
 
230
namespace google {
 
231
namespace protobuf {
 
232
template <>
 
233
inline const EnumDescriptor* GetEnumDescriptor<Table_TableOptions_RowType>() {
 
234
  return Table_TableOptions_RowType_descriptor();
 
235
}
 
236
}
 
237
}
 
238
            ])],
 
239
            [ac_cv_safe_to_use_Wattributes_=yes],
 
240
            [ac_cv_safe_to_use_Wattributes_=no])
 
241
          CXXFLAGS="${save_CXXFLAGS}"
 
242
          AC_LANG_POP()])
 
243
      AS_IF([test "$ac_cv_safe_to_use_Wattributes_" = "yes"],
 
244
            [],
 
245
            [CXX_WARNINGS="${CXX_WARNINGS} -Wno-attributes"])
207
246
  
208
247
      NO_REDUNDANT_DECLS="-Wno-redundant-decls"
209
248
      dnl TODO: Figure out a better way to deal with this:
210
 
      PROTOSKIP_WARNINGS="-Wno-effc++ -Wno-shadow -Wno-missing-braces"
 
249
      PROTOSKIP_WARNINGS="-Wno-effc++ -Wno-shadow -Wno-missing-braces -Wno-attributes"
211
250
      NO_WERROR="-Wno-error"
212
251
      INNOBASE_SKIP_WARNINGS="-Wno-shadow -Wno-cast-align"
213
252