Kaydet (Commit) a251fe4d authored tarafından Tor Lillqvist's avatar Tor Lillqvist

We require MSVC2013 (_MSC_VER == 1800) now

Change-Id: Ice8504041f22e00f2e5010813d9dff1d2987c8d6
üst cfeeceab
...@@ -630,20 +630,12 @@ SAL_IMPLEMENT_MAIN() ...@@ -630,20 +630,12 @@ SAL_IMPLEMENT_MAIN()
if (g_verbose) if (g_verbose)
{ {
#if _MSC_VER < 1700
// Bogus: warning C4564: method 'CheckInvalidPathChars' of class 'System::IO::Path' defines unsupported default parameter 'checkAdditional'
#pragma warning (push)
#pragma warning (disable: 4564)
#endif
::System::Console::Write( ::System::Console::Write(
"> saving assembly {0}{1}{2}...", "> saving assembly {0}{1}{2}...",
output_dir, output_dir,
gcnew ::System::String( gcnew ::System::String(
::System::IO::Path::DirectorySeparatorChar, 1 ), ::System::IO::Path::DirectorySeparatorChar, 1 ),
output_file ); output_file );
#if _MSC_VER < 1700
#pragma warning (pop)
#endif
} }
assembly_builder->Save( output_file ); assembly_builder->Save( output_file );
if (g_verbose) if (g_verbose)
......
...@@ -876,11 +876,6 @@ Assembly ^ TypeEmitter::type_resolve( ...@@ -876,11 +876,6 @@ Assembly ^ TypeEmitter::type_resolve(
MethodAttributes::Virtual | MethodAttributes::Virtual |
MethodAttributes::NewSlot | MethodAttributes::NewSlot |
MethodAttributes::HideBySig); MethodAttributes::HideBySig);
//#if defined(_MSC_VER) && (_MSC_VER < 1400)
// MethodAttributes::Instance);
//#else
// Instance);
//#endif
if (TypeClass_INTERFACE_METHOD == xMember->getTypeClass()) if (TypeClass_INTERFACE_METHOD == xMember->getTypeClass())
{ {
......
...@@ -58,15 +58,9 @@ struct is_typed_flags { ...@@ -58,15 +58,9 @@ struct is_typed_flags {
operator E() { return static_cast<E>(value_); } operator E() { return static_cast<E>(value_); }
#if !defined _MSC_VER || _MSC_VER > 1700 explicit operator typename underlying_type<E>::type() { return value_; }
explicit
#endif explicit operator bool() { return value_ != 0; }
operator typename underlying_type<E>::type() { return value_; }
#if !defined _MSC_VER || _MSC_VER > 1700
explicit
#endif
operator bool() { return value_ != 0; }
private: private:
typename underlying_type<E>::type value_; typename underlying_type<E>::type value_;
......
...@@ -74,27 +74,18 @@ template< typename T > inline StreamIgnore operator <<( ...@@ -74,27 +74,18 @@ template< typename T > inline StreamIgnore operator <<(
SAL_UNUSED_PARAMETER StreamStart const &, SAL_UNUSED_PARAMETER T const &) SAL_UNUSED_PARAMETER StreamStart const &, SAL_UNUSED_PARAMETER T const &)
{ {
std::abort(); std::abort();
#if defined _MSC_VER && _MSC_VER < 1700
return StreamIgnore();
#endif
} }
template< typename T > inline StreamIgnore operator <<( template< typename T > inline StreamIgnore operator <<(
SAL_UNUSED_PARAMETER StreamString const &, SAL_UNUSED_PARAMETER T const &) SAL_UNUSED_PARAMETER StreamString const &, SAL_UNUSED_PARAMETER T const &)
{ {
std::abort(); std::abort();
#if defined _MSC_VER && _MSC_VER < 1700
return StreamIgnore();
#endif
} }
template< typename T > inline StreamIgnore operator <<( template< typename T > inline StreamIgnore operator <<(
SAL_UNUSED_PARAMETER StreamIgnore const &, SAL_UNUSED_PARAMETER T const &) SAL_UNUSED_PARAMETER StreamIgnore const &, SAL_UNUSED_PARAMETER T const &)
{ {
std::abort(); std::abort();
#if defined _MSC_VER && _MSC_VER < 1700
return StreamIgnore();
#endif
} }
template< typename T > typename T::Result getResult(T const &); template< typename T > typename T::Result getResult(T const &);
...@@ -103,9 +94,6 @@ inline char const * unwrapStream(StreamString const & s) { return s.string; } ...@@ -103,9 +94,6 @@ inline char const * unwrapStream(StreamString const & s) { return s.string; }
inline char const * unwrapStream(SAL_UNUSED_PARAMETER StreamIgnore const &) { inline char const * unwrapStream(SAL_UNUSED_PARAMETER StreamIgnore const &) {
std::abort(); std::abort();
#if defined _MSC_VER && _MSC_VER < 1700
return 0;
#endif
} }
} } } }
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#ifndef INCLUDED_PYUNO_SOURCE_MODULE_PYUNO_IMPL_HXX #ifndef INCLUDED_PYUNO_SOURCE_MODULE_PYUNO_IMPL_HXX
#define INCLUDED_PYUNO_SOURCE_MODULE_PYUNO_IMPL_HXX #define INCLUDED_PYUNO_SOURCE_MODULE_PYUNO_IMPL_HXX
#if defined(_MSC_VER) && (_MSC_VER >= 1600) #if defined(_MSC_VER)
// Workaround for some horrible hypot() mess // Workaround for some horrible hypot() mess
#include <math.h> #include <math.h>
#endif #endif
......
...@@ -118,9 +118,7 @@ string processccargs(vector<string> rawargs) { ...@@ -118,9 +118,7 @@ string processccargs(vector<string> rawargs) {
} }
else if(*i == "-g") { else if(*i == "-g") {
args.append("-Zi"); args.append("-Zi");
#if _MSC_VER >= 1800
args.append(" -FS"); args.append(" -FS");
#endif
} }
else if(!(*i).compare(0,2,"-D")) { else if(!(*i).compare(0,2,"-D")) {
// need to re-escape strings for preprocessor // need to re-escape strings for preprocessor
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment