Fixed some issues with calling conventions for Borland/Microsoft compilers

[SVN r10114]
2025-07-15 05:16:37 +02:00 · 2001-05-15 11:00:01 +00:00
parent a58bf0705d
commit f913683002
19 changed files with 33 additions and 114 deletions
--- a/include/boost/regex/detail/fileiter.hpp
+++ b/include/boost/regex/detail/fileiter.hpp
@ -79,11 +79,7 @@ namespace boost{
   namespace re_detail{

 #ifdef __BORLANDC__
-   #if __BORLANDC__ == 0x530
-    #pragma option push -a4 -b -Ve
-   #elif __BORLANDC__ > 0x530
-    #pragma option push -a8 -b -Ve
-   #endif
+    #pragma option push -a4 -b -Ve -pc
 #endif

 struct _fi_find_data
@ -422,9 +418,7 @@ inline bool operator < (const directory_iterator&, const directory_iterator&)
 }

 #ifdef __BORLANDC__
- #if __BORLANDC__ > 0x520
  #pragma option pop
- #endif
 #endif


--- a/include/boost/regex/detail/regex_compile.hpp
+++ b/include/boost/regex/detail/regex_compile.hpp
@ -25,15 +25,11 @@
 #define BOOST_REGEX_COMPILE_HPP

 namespace boost{
+#ifdef __BORLANDC__
+   #pragma option push -a4 -b -Ve -pc
+#endif
   namespace re_detail{

-#ifdef __BORLANDC__
-   #if __BORLANDC__ == 0x530
-    #pragma option push -a4 -b -Ve
-   #elif __BORLANDC__ > 0x530
-    #pragma option push -a8 -b -Ve
-   #endif
-#endif

 template <class traits>
 struct kmp_translator
@ -2035,9 +2031,7 @@ void BOOST_RE_CALL reg_expression<charT, traits, Allocator>::fail(unsigned int e
 #endif

 #ifdef __BORLANDC__
- #if __BORLANDC__ > 0x520
  #pragma option pop
- #endif
 #endif

 } // namespace boost
--- a/include/boost/regex/detail/regex_config.hpp
+++ b/include/boost/regex/detail/regex_config.hpp
@ -249,7 +249,7 @@ full list of macros and their usage.
   // for now we'll always define these
   // unless we know that the platform can cope
   // with wide character strings:
-   #if !defined(linux) 
+   #if !defined(linux) || (defined(__GLIBCPP__) && !defined(_GLIBCPP_USE_WCHAR_T))
   	#define BOOST_RE_NO_WCTYPE_H
   	#define BOOST_RE_NO_WCSTRING
   #endif
@ -580,11 +580,7 @@ namespace boost{
   namespace re_detail{

 #ifdef __BORLANDC__
-   #if __BORLANDC__ == 0x530
-    #pragma option push -a4 -b
-   #elif __BORLANDC__ > 0x530
-    #pragma option push -a8 -b
-   #endif
+   #pragma option push -a4 -b -Ve -pc
 #endif

 // add our destroy functions:
@ -735,11 +731,6 @@ inline bool BOOST_RE_CALL boolify(I val)
 #define BOOST_RE_MAKE_BOOL(x) x
 #endif

-#ifdef __BORLANDC__
- #if __BORLANDC__ > 0x520
-  #pragma option pop
- #endif
-#endif

 template <class T, class A>
 struct rebind_allocator
@ -760,6 +751,9 @@ std::ptrdiff_t distance(const T& x, const T& y)
 using std::distance;
 #endif

+#ifdef __BORLANDC__
+  #pragma option pop
+#endif
 } // namespace re_detail

 } // namespace boost
@ -1101,5 +1095,6 @@ namespace std{



+


--- a/include/boost/regex/detail/regex_cstring.hpp
+++ b/include/boost/regex/detail/regex_cstring.hpp
@ -35,11 +35,7 @@ namespace boost{
   namespace re_detail{

 #ifdef __BORLANDC__
-   #if __BORLANDC__ == 0x530
-    #pragma option push -a4 -b -Ve
-   #elif __BORLANDC__ > 0x530
-    #pragma option push -a8 -b -Ve
-   #endif
+   #pragma option push -a4 -b -Ve -pc
 #endif

 //
@ -124,9 +120,7 @@ inline void BOOST_RE_CALL re_strfree(charT* p)
 }

 #ifdef __BORLANDC__
- #if __BORLANDC__ > 0x520
  #pragma option pop
- #endif
 #endif

 } // namespace re_detail
--- a/include/boost/regex/detail/regex_format.hpp
+++ b/include/boost/regex/detail/regex_format.hpp
@ -39,11 +39,7 @@ enum format_flags_t{
 namespace re_detail{

 #ifdef __BORLANDC__
-   #if __BORLANDC__ == 0x530
-    #pragma option push -a4 -b -Ve
-   #elif __BORLANDC__ > 0x530
-    #pragma option push -a8 -b -Ve -w-8037
-   #endif
+   #pragma option push -a4 -b -Ve -pc
 #endif

 template <class O, class I>
@ -569,9 +565,7 @@ std::basic_string<charT> regex_merge(const std::basic_string<charT>& s,
 }

 #ifdef __BORLANDC__
- #if __BORLANDC__ > 0x520
  #pragma option pop
- #endif
 #endif

 } // namespace boost
--- a/include/boost/regex/detail/regex_kmp.hpp
+++ b/include/boost/regex/detail/regex_kmp.hpp
@ -34,11 +34,7 @@ namespace boost{
   namespace re_detail{

 #ifdef __BORLANDC__
-   #if __BORLANDC__ == 0x530
-    #pragma option push -a4 -b -Ve
-   #elif __BORLANDC__ > 0x530
-    #pragma option push -a8 -b -Ve
-   #endif
+   #pragma option push -a4 -b -Ve -pc
 #endif

 template <class charT>
@ -102,9 +98,7 @@ kmp_info<charT>* kmp_compile(iterator first, iterator last, charT, Trans transla
 }

 #ifdef __BORLANDC__
- #if __BORLANDC__ > 0x520
  #pragma option pop
- #endif
 #endif

   } // namepsace re_detail
--- a/include/boost/regex/detail/regex_match.hpp
+++ b/include/boost/regex/detail/regex_match.hpp
@ -31,11 +31,7 @@ namespace boost{
   namespace re_detail{

 #ifdef __BORLANDC__
-   #if __BORLANDC__ == 0x530
-    #pragma option push -a4 -b -Ve
-   #elif __BORLANDC__ > 0x530
-    #pragma option push -a8 -b -Ve
-   #endif
+   #pragma option push -a4 -b -Ve -pc
 #endif

 template <class iterator, class charT, class traits_type, class Allocator>
@ -1811,9 +1807,7 @@ inline unsigned int regex_grep(bool (*foo)(const match_results<std::basic_string


 #ifdef __BORLANDC__
- #if __BORLANDC__ > 0x520
  #pragma option pop
- #endif
 #endif

 } // namespace boost
--- a/include/boost/regex/detail/regex_raw_buffer.hpp
+++ b/include/boost/regex/detail/regex_raw_buffer.hpp
@ -33,11 +33,7 @@ namespace boost{
   namespace re_detail{

 #ifdef __BORLANDC__
-   #if __BORLANDC__ == 0x530
-    #pragma option push -a4 -b -Ve
-   #elif __BORLANDC__ > 0x530
-    #pragma option push -a8 -b -Ve
-   #endif
+   #pragma option push -a4 -b -Ve -pc
 #endif

 struct empty_padding{};
@ -236,9 +232,7 @@ void* BOOST_RE_CALL raw_storage<Allocator>::insert(size_type pos, size_type n)
 }

 #ifdef __BORLANDC__
- #if __BORLANDC__ > 0x520
  #pragma option pop
- #endif
 #endif

 } // namespace re_detail
--- a/include/boost/regex/detail/regex_split.hpp
+++ b/include/boost/regex/detail/regex_split.hpp
@ -28,11 +28,7 @@
 namespace boost{

 #ifdef __BORLANDC__
-   #if __BORLANDC__ == 0x530
-    #pragma option push -a4 -b -Ve
-   #elif __BORLANDC__ > 0x530
-    #pragma option push -a8 -b -Ve
-   #endif
+   #pragma option push -a4 -b -Ve -pc
 #endif

 namespace re_detail{
@ -145,9 +141,7 @@ inline std::size_t regex_split(OutputIterator out,
 }

 #ifdef __BORLANDC__
- #if __BORLANDC__ > 0x520
  #pragma option pop
- #endif
 #endif

 } // namespace boost
--- a/include/boost/regex/detail/regex_stack.hpp
+++ b/include/boost/regex/detail/regex_stack.hpp
@ -36,11 +36,7 @@ namespace boost{
   namespace re_detail{

 #ifdef __BORLANDC__
-   #if __BORLANDC__ == 0x530
-    #pragma option push -a4 -b -Ve
-   #elif __BORLANDC__ > 0x530
-    #pragma option push -a8 -b -Ve
-   #endif
+   #pragma option push -a4 -b -Ve -pc
 #endif

 //
@ -211,9 +207,7 @@ jstack<T, Allocator>::~jstack()
 }

 #ifdef __BORLANDC__
- #if __BORLANDC__ > 0x520
  #pragma option pop
- #endif
 #endif

 } // namespace re_detail
--- a/include/boost/regex/detail/regex_synch.hpp
+++ b/include/boost/regex/detail/regex_synch.hpp
@ -42,11 +42,7 @@ namespace boost{
   namespace re_detail{

 #ifdef __BORLANDC__
-   #if __BORLANDC__ == 0x530
-    #pragma option push -a4 -b -Ve
-   #elif __BORLANDC__ > 0x530
-    #pragma option push -a8 -b -Ve
-   #endif
+   #pragma option push -a4 -b -Ve -pc
 #endif

 void BOOST_RE_CALL re_init_threads();
@ -167,9 +163,7 @@ BOOST_RE_IX_DECL extern unsigned int re_lock_count;
 #endif // BOOST_RE_THREADS

 #ifdef __BORLANDC__
- #if __BORLANDC__ > 0x520
  #pragma option pop
- #endif
 #endif

 } // namespace re_detail
--- a/include/boost/regex/pattern_except.hpp
+++ b/include/boost/regex/pattern_except.hpp
@ -28,11 +28,7 @@
 namespace boost{

 #ifdef __BORLANDC__
-   #if __BORLANDC__ == 0x530
-    #pragma option push -a4 -b -Ve
-   #elif __BORLANDC__ > 0x530
-    #pragma option push -a8 -b -Ve
-   #endif
+   #pragma option push -a4 -b -Ve -pc
 #endif

 class BOOST_RE_IX_DECL bad_pattern : public std::runtime_error
@ -51,9 +47,7 @@ public:


 #ifdef __BORLANDC__
- #if __BORLANDC__ > 0x520
  #pragma option pop
- #endif
 #endif

 } // namespace boost
--- a/include/boost/regex/regex_traits.hpp
+++ b/include/boost/regex/regex_traits.hpp
@ -29,11 +29,7 @@
 namespace boost{

 #ifdef __BORLANDC__
-   #if __BORLANDC__ == 0x530
-    #pragma option push -a4 -b -Ve
-   #elif __BORLANDC__ > 0x530
-    #pragma option push -a8 -b -Ve
-   #endif
+   #pragma option push -a4 -b -Ve -pc
 #endif

 template <class charT>
@ -786,9 +782,7 @@ class regex_traits : public cpp_regex_traits<charT>
 #endif

 #ifdef __BORLANDC__
- #if __BORLANDC__ > 0x520
  #pragma option pop
- #endif
 #endif

 } // namespace boost