mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-26 21:33:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

bootstrap: std:stoul non-portable [PR 98412]

Browse Source 
Fix some more system-specific issues.  Not everyone's C++11 is the same :(

	PR bootstrap/98412
	libcody/
	* client.cc: Include cstdlib.
	* server.cc: Include cstdlib.
	gcc/cp/
	* mapper-client.cc: INCLUDE_STRING, INCLUDE_VECTOR.
	(module_client::open_module_client): Avoid std::stoul.
	* mapper-resolver.cc: INCLUDE_STRING, INCLUDE_VECTOR.
This commit is contained in:
Nathan Sidwell 2020-12-21 09:16:48 -08:00
parent cf22f78ff6
commit 1467a5c5ab
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gcc/cp/mapper-client.cc
View File

@ -24,6 +24,8 @@ along with GCC; see the file COPYING3. If not see
// will include it later under the above check
#include <sys/socket.h>
#endif
#define INCLUDE_STRING
#define INCLUDE_VECTOR
#include "system.h"
#include "line-map.h"
@ -171,14 +173,18 @@ module_client::open_module_client (location_t loc, const char *o,
}
else
{
char *ptr;
if (!from.empty ())
{
fd_from = std::stoul (from, &pos, 10);
if (pos != from.size ())
/* Sadly str::stoul is not portable. */
const char *cstr = from.c_str ();
fd_from = strtoul (cstr, &ptr, 10);
if (*ptr)
{
/* Not a number -- a named pipe. */
int dir = to.empty ()
? O_RDWR | O_CLOEXEC : O_RDONLY | O_CLOEXEC;
fd_from = open (from.c_str (), dir);
fd_from = open (cstr, dir);
}
if (to.empty ())
fd_to = fd_from;
@ -190,12 +196,14 @@ module_client::open_module_client (location_t loc, const char *o,
;
else
{
fd_to = std::stoul (to, &pos, 10);
if (pos != to.size ())
const char *cstr = to.c_str ();
fd_to = strtoul (cstr, &ptr, 10);
if (*ptr)
{
/* Not a number, a named pipe. */
int dir = from.empty ()
? O_RDWR | O_CLOEXEC : O_WRONLY | O_CLOEXEC;
fd_to = open (to.c_str (), dir);
fd_to = open (cstr, dir);
if (fd_to < 0)
close (fd_from);
}

2
gcc/cp/mapper-resolver.cc
View File

@ -21,6 +21,8 @@ along with GCC; see the file COPYING3. If not see
/* Forward to the resolver in c++tools. */
#include "config.h"
#define INCLUDE_STRING
#define INCLUDE_VECTOR
#define INCLUDE_ALGORITHM
#include "system.h"

1
libcody/client.cc
View File

@ -6,6 +6,7 @@
#include "internal.hh"
// C
#include <cerrno>
#include <cstdlib>
#include <cstring>
// Client code

1
libcody/server.cc
View File

@ -8,6 +8,7 @@
#include <tuple>
// C
#include <cerrno>
#include <cstdlib>
#include <cstring>
// Server code