diff options
| author | Peter Simons <simons@cryp.to> | 2010-06-24 17:51:04 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2010-06-24 17:51:04 +0000 |
| commit | a17071fef15115dc0e7052ebe091ffe8457f77d0 (patch) | |
| tree | ec310a7a2b6c97a3d7df56cdea90977b268ee1dc /src/libstore | |
| parent | 560ab22f7db8238672ed3117ef8bf0de8baf9155 (diff) | |
Include <cstring> to ensure that strcpy(), strlen(), and memset() are declared.
An "using namespace std" was added locally in those functions that refer to
names from <cstring>. That is not pretty, but it's a very portable solution,
because strcpy() and friends will be found in both the 'std' and in the global
namespace.
Diffstat (limited to 'src/libstore')
| -rw-r--r-- | src/libstore/build.cc | 2 | ||||
| -rw-r--r-- | src/libstore/remote-store.cc | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc index a53c23bf4..ef2f7adf3 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -25,6 +25,7 @@ #include <unistd.h> #include <errno.h> #include <stdio.h> +#include <cstring> #include <pwd.h> #include <grp.h> @@ -2638,6 +2639,7 @@ void Worker::waitForInput() timeout.tv_sec = std::max((time_t) 0, lastWokenUp + wakeUpInterval - before); } else lastWokenUp = 0; + using namespace std; /* Use select() to wait for the input side of any logger pipe to become `available'. Note that `available' (i.e., non-blocking) includes EOF. */ diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc index 5143143f5..9db90c872 100644 --- a/src/libstore/remote-store.cc +++ b/src/libstore/remote-store.cc @@ -13,6 +13,7 @@ #include <iostream> #include <unistd.h> +#include <cstring> namespace nix { @@ -158,6 +159,7 @@ void RemoteStore::connectToDaemon() addr.sun_family = AF_UNIX; if (socketPathRel.size() >= sizeof(addr.sun_path)) throw Error(format("socket path `%1%' is too long") % socketPathRel); + using namespace std; strcpy(addr.sun_path, socketPathRel.c_str()); if (connect(fdSocket, (struct sockaddr *) &addr, sizeof(addr)) == -1) |