Fixed gcc build warnings

+ vim 'fixed' line endings in json_value.cpp

Contributed-by:  Johannes Doerfert <doerfert@cs.uni-saarland.de>
llvm-svn: 206044

polly/lib/Analysis/ScopInfo.cpp

@@ -813,7 +813,8 @@ __isl_give isl_id *Scop::getIdForParam(const SCEV *Parameter) const {
   if (ParameterName == "" || ParameterName.substr(0, 2) == "p_")
     ParameterName = "p_" + utostr_32(IdIter->second);
 
-  return isl_id_alloc(getIslCtx(), ParameterName.c_str(), (void *)Parameter);
+  return isl_id_alloc(getIslCtx(), ParameterName.c_str(),
+                      const_cast<void *>((const void *)Parameter));
 }
 
 void Scop::buildContext() {

polly/lib/JSON/json_value.cpp

@@ -15,7 +15,12 @@
 
 // Disable warnings.  We do not fix these warnings, as this is a file imported
 // into Polly and we do not want to diverge from the original source.
+#ifdef __clang__
 #pragma clang diagnostic ignored "-Wcovered-switch-default"
+#endif
+#ifdef __GNUC__
+#pragma GCC diagnostic ignored "-Woverflow"
+#endif
 
 #define JSON_ASSERT_UNREACHABLE assert( false )
 #define JSON_ASSERT( condition ) assert( condition );  // @todo <= change this into an exception throw

polly/lib/Transform/ScheduleOptimizer.cpp

@@ -183,7 +183,9 @@ private:
 
   static isl_union_map *getScheduleMap(isl_schedule *Schedule);
 
-  bool doFinalization() {
+  using llvm::Pass::doFinalization;
+
+  virtual bool doFinalization() {
     isl_schedule_free(LastSchedule);
     LastSchedule = NULL;
     return true;