Change __BORLANDC__ to BOOST_BORLANDC, which is defined in Boost config for the Embarcadero non-clang-based compilers.

This commit is contained in:
Edward Diener committed 2020-03-31 17:42:38 -04:00
1 parent d961318aa2
commit cc09733d03
34 files changed
+62 -62

No files matched your search

+2 -2
View File
@@ -17,7 +17,7 @@
* using a C++ Builder closure as a callback.
*/
#ifdef __BORLANDC__
#ifdef __BORLANDC__ && !defined(__clang__)
#include <boost/regex.hpp>
#include <string>
@@ -140,7 +140,7 @@ int main(int argc, const char** argv)
return 0;
}
#else // __BORLANDC__
#else // __BORLANDC__ && !defined(__clang__)
int main()
{
+1 -1
View File
@@ -49,7 +49,7 @@ int process_ftp(const char* response, std::string* msg)
return -1;
}
#if defined(BOOST_MSVC) || (defined(__BORLANDC__) && (__BORLANDC__ == 0x550))
#if defined(BOOST_MSVC) || (defined(BOOST_BORLANDC) && (BOOST_BORLANDC == 0x550))
//
// problem with std::getline under MSVC6sp3
istream& getline(istream& is, std::string& s)
+1 -1
View File
@@ -30,7 +30,7 @@ unsigned tokenise(std::list<std::string>& l, std::string& s)
using namespace std;
#if defined(BOOST_MSVC) || (defined(__BORLANDC__) && (__BORLANDC__ == 0x550))
#if defined(BOOST_MSVC) || (defined(BOOST_BORLANDC) && (BOOST_BORLANDC == 0x550))
//
// problem with std::getline under MSVC6sp3
istream& getline(istream& is, std::string& s)
@@ -23,7 +23,7 @@
using namespace std;
#if defined(BOOST_MSVC) || (defined(__BORLANDC__) && (__BORLANDC__ == 0x550))
#if defined(BOOST_MSVC) || (defined(BOOST_BORLANDC) && (BOOST_BORLANDC == 0x550))
//
// problem with std::getline under MSVC6sp3
istream& getline(istream& is, std::string& s)
+1 -1
View File
@@ -89,7 +89,7 @@ public:
};
namespace boost{
#if defined(BOOST_MSVC) || (defined(__BORLANDC__) && (__BORLANDC__ == 0x550)) || defined(__SGI_STL_PORT)
#if defined(BOOST_MSVC) || (defined(BOOST_BORLANDC) && (BOOST_BORLANDC == 0x550)) || defined(__SGI_STL_PORT)
//
// problem with std::getline under MSVC6sp3
// and C++ Builder 5.5, is this really that hard?