Addressing both ICC issues in #120

2014-09-02 11:14:18 -07:00
parent 2b8bbab316
commit e6cb01e89a
3 changed files with 3 additions and 3 deletions
@@ -338,7 +338,7 @@ namespace cereal
    template <class Archive, class T>
    struct polymorphic_serialization_support
    {
-      #ifdef _MSC_VER
+      #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
      //! Creates the appropriate bindings depending on whether the archive supports
      //! saving or loading
      virtual void instantiate();
@@ -410,7 +410,7 @@ private:
  }

  template <>
-  bool characterOk<char>( Ch )
+  bool characterOk<char>( char )
  {
    return true;
  }
@@ -185,7 +185,7 @@ protected:
  }

  template <>
-  bool characterOk<char>( Ch )
+  bool characterOk<char>( char )
  {
    return true;
  }