cli_ure/source/climaker/climaker_app.cxx | 8 -------- cli_ure/source/climaker/climaker_emit.cxx | 5 ----- include/o3tl/typed_flags_set.hxx | 12 +++--------- include/sal/log.hxx | 12 ------------ pyuno/source/module/pyuno_impl.hxx | 2 +- solenv/gcc-wrappers/wrapper.cxx | 2 -- 6 files changed, 4 insertions(+), 37 deletions(-)
New commits: commit a251fe4d48237a4d9c9530dafc7bbdce6028e9cf Author: Tor Lillqvist <[email protected]> Date: Thu Mar 19 10:57:17 2015 +0200 We require MSVC2013 (_MSC_VER == 1800) now Change-Id: Ice8504041f22e00f2e5010813d9dff1d2987c8d6 diff --git a/cli_ure/source/climaker/climaker_app.cxx b/cli_ure/source/climaker/climaker_app.cxx index b8e3f0f..42381ad 100644 --- a/cli_ure/source/climaker/climaker_app.cxx +++ b/cli_ure/source/climaker/climaker_app.cxx @@ -630,20 +630,12 @@ SAL_IMPLEMENT_MAIN() 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( "> saving assembly {0}{1}{2}...", output_dir, gcnew ::System::String( ::System::IO::Path::DirectorySeparatorChar, 1 ), output_file ); -#if _MSC_VER < 1700 -#pragma warning (pop) -#endif } assembly_builder->Save( output_file ); if (g_verbose) diff --git a/cli_ure/source/climaker/climaker_emit.cxx b/cli_ure/source/climaker/climaker_emit.cxx index 6f0de95..8706c3c 100644 --- a/cli_ure/source/climaker/climaker_emit.cxx +++ b/cli_ure/source/climaker/climaker_emit.cxx @@ -876,11 +876,6 @@ Assembly ^ TypeEmitter::type_resolve( MethodAttributes::Virtual | MethodAttributes::NewSlot | MethodAttributes::HideBySig); -//#if defined(_MSC_VER) && (_MSC_VER < 1400) -// MethodAttributes::Instance); -//#else -// Instance); -//#endif if (TypeClass_INTERFACE_METHOD == xMember->getTypeClass()) { diff --git a/include/o3tl/typed_flags_set.hxx b/include/o3tl/typed_flags_set.hxx index 4b6e4f5..3e96003 100644 --- a/include/o3tl/typed_flags_set.hxx +++ b/include/o3tl/typed_flags_set.hxx @@ -58,15 +58,9 @@ struct is_typed_flags { operator E() { return static_cast<E>(value_); } -#if !defined _MSC_VER || _MSC_VER > 1700 - explicit -#endif - operator typename underlying_type<E>::type() { return value_; } - -#if !defined _MSC_VER || _MSC_VER > 1700 - explicit -#endif - operator bool() { return value_ != 0; } + explicit operator typename underlying_type<E>::type() { return value_; } + + explicit operator bool() { return value_ != 0; } private: typename underlying_type<E>::type value_; diff --git a/include/sal/log.hxx b/include/sal/log.hxx index 563ed57..62cdb77 100644 --- a/include/sal/log.hxx +++ b/include/sal/log.hxx @@ -74,27 +74,18 @@ template< typename T > inline StreamIgnore operator <<( SAL_UNUSED_PARAMETER StreamStart const &, SAL_UNUSED_PARAMETER T const &) { std::abort(); -#if defined _MSC_VER && _MSC_VER < 1700 - return StreamIgnore(); -#endif } template< typename T > inline StreamIgnore operator <<( SAL_UNUSED_PARAMETER StreamString const &, SAL_UNUSED_PARAMETER T const &) { std::abort(); -#if defined _MSC_VER && _MSC_VER < 1700 - return StreamIgnore(); -#endif } template< typename T > inline StreamIgnore operator <<( SAL_UNUSED_PARAMETER StreamIgnore const &, SAL_UNUSED_PARAMETER T const &) { std::abort(); -#if defined _MSC_VER && _MSC_VER < 1700 - return StreamIgnore(); -#endif } template< typename T > typename T::Result getResult(T const &); @@ -103,9 +94,6 @@ inline char const * unwrapStream(StreamString const & s) { return s.string; } inline char const * unwrapStream(SAL_UNUSED_PARAMETER StreamIgnore const &) { std::abort(); -#if defined _MSC_VER && _MSC_VER < 1700 - return 0; -#endif } } } diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx index 83fbda5..e066b73 100644 --- a/pyuno/source/module/pyuno_impl.hxx +++ b/pyuno/source/module/pyuno_impl.hxx @@ -19,7 +19,7 @@ #ifndef 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 #include <math.h> #endif diff --git a/solenv/gcc-wrappers/wrapper.cxx b/solenv/gcc-wrappers/wrapper.cxx index 918a9b5..9dacb26 100644 --- a/solenv/gcc-wrappers/wrapper.cxx +++ b/solenv/gcc-wrappers/wrapper.cxx @@ -118,9 +118,7 @@ string processccargs(vector<string> rawargs) { } else if(*i == "-g") { args.append("-Zi"); -#if _MSC_VER >= 1800 args.append(" -FS"); -#endif } else if(!(*i).compare(0,2,"-D")) { // need to re-escape strings for preprocessor _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
