Skip to content

Commit 0414abe

Browse files
authored
Unbreak Embarcadero C++ clang-based compilers
* Change __BORLANDC__ to BOOST_BORLANDC, which is defined in Boost config for the Embarcadero non-clang-based compilers. * Restored a Borland check. * Specify std:: for all standard identifiers and remove 'using namespace std:'. * Removed std:: from C header abort call. * Moved 'using namespace std;' after header file inclusions
1 parent a237942 commit 0414abe

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

test/parsers_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ void test_environment()
308308
("bar", new untyped_value, "")
309309
;
310310

311-
#if (defined(_WIN32) && ! defined(__BORLANDC__)) || (defined(__CYGWIN__))
311+
#if (defined(_WIN32) && ! defined(BOOST_BORLANDC) && ! defined(BOOST_EMBTC)) || (defined(__CYGWIN__))
312312
_putenv("PO_TEST_FOO=1");
313313
#else
314314
putenv(const_cast<char*>("PO_TEST_FOO=1"));

test/winmain.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@
99
#include <cctype>
1010
#include <iostream>
1111
#include <stdlib.h>
12+
#include <boost/program_options/parsers.hpp>
1213

1314
using namespace std;
14-
15-
#include <boost/program_options/parsers.hpp>
1615
using namespace boost::program_options;
1716

1817
void check_equal(const std::vector<string>& actual, char **expected, int n)

0 commit comments

Comments
 (0)