Remove _FPOSOFF and non-Standard std::fpos::seekpos() (#4606)

microsoft · Apr 26, 2024 · 7517ee0 · 7517ee0
1 parent a8d4928
commit 7517ee0
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 47 deletions.
diff --git a/stl/inc/cstdio b/stl/inc/cstdio
@@ -26,9 +26,6 @@ _STL_DISABLE_CLANG_WARNINGS
 #undef putc
 #undef putchar
 
-// TRANSITION: Boost nonconformingly uses this macro
-#define _FPOSOFF(fp) (static_cast<long long>(fp))
-
 _STD_BEGIN
 #pragma warning(push)
 #pragma warning(disable : 4995) // name was marked as #pragma deprecated

diff --git a/stl/inc/iosfwd b/stl/inc/iosfwd
@@ -67,12 +67,6 @@ public:
         return _Myoff + _Fpos;
     }
 
-#ifndef _REMOVE_FPOS_SEEKPOS
-    _DEPRECATE_FPOS_SEEKPOS fpos_t seekpos() const noexcept {
-        return {};
-    }
-#endif // !defined(_REMOVE_FPOS_SEEKPOS)
-
     _NODISCARD streamoff operator-(const fpos& _Right) const noexcept /* strengthened */ {
         return static_cast<streamoff>(*this) - static_cast<streamoff>(_Right);
     }

diff --git a/stl/inc/yvals_core.h b/stl/inc/yvals_core.h
@@ -1221,20 +1221,7 @@ _EMIT_STL_ERROR(STL1004, "C++98 unexpected() is incompatible with C++23 unexpect
 
 // STL4018 was "The non-Standard std::tr2::sys namespace is deprecated and will be REMOVED."
 
-#ifdef _SILENCE_FPOS_SEEKPOS_DEPRECATION_WARNING
-#define _DEPRECATE_FPOS_SEEKPOS
-#else // ^^^ warning disabled / warning enabled vvv
-#define _DEPRECATE_FPOS_SEEKPOS                                                                                        \
-    [[deprecated("warning STL4019: "                                                                                   \
-                 "The member std::fpos::seekpos() is non-Standard, and is preserved only for compatibility with "      \
-                 "workarounds for old versions of Visual C++. It will be removed in a future release, and in this "    \
-                 "release always returns 0. Please use standards-conforming mechanisms to manipulate fpos, such as "   \
-                 "conversions to and from streamoff, or an integral type, instead. If you are receiving this message " \
-                 "while compiling Boost.IOStreams, a fix has been submitted upstream to make Boost use "               \
-                 "standards-conforming mechanisms, as it does for other compilers. You can define "                    \
-                 "_SILENCE_FPOS_SEEKPOS_DEPRECATION_WARNING to suppress this warning, "                                \
-                 "or define _REMOVE_FPOS_SEEKPOS to remove std::fpos::seekpos entirely.")]]
-#endif // ^^^ warning enabled ^^^
+// STL4019 was "The member std::fpos::seekpos() is non-Standard, and [...] will be removed"
 
 // P0482R6 Library Support For char8_t
 // Other C++20 deprecation warnings

diff --git a/tests/std/test.lst b/tests/std/test.lst
@@ -688,7 +688,6 @@ tests\VSO_0000000_list_unique_self_reference
 tests\VSO_0000000_matching_npos_address
 tests\VSO_0000000_more_pair_tuple_sfinae
 tests\VSO_0000000_nullptr_stream_out
-tests\VSO_0000000_oss_workarounds
 tests\VSO_0000000_path_stream_parameter
 tests\VSO_0000000_regex_interface
 tests\VSO_0000000_regex_use

diff --git a/tests/std/tests/VSO_0000000_oss_workarounds/env.lst b/tests/std/tests/VSO_0000000_oss_workarounds/env.lst
diff --git a/tests/std/tests/VSO_0000000_oss_workarounds/test.cpp b/tests/std/tests/VSO_0000000_oss_workarounds/test.cpp