# # # patch "ChangeLog" # from [cbc39bff0c2dacea3855da2f37ef34b420edc5dc] # to [8c22bfe3c1119935ee85c1d07faf948c7d0ae031] # # patch "cert.cc" # from [e5908abaae7761d8c32b5e2f2efeff3e82a19a81] # to [9e78113b59e34754b12a301b93108c04bbaaa453] # # patch "charset.cc" # from [d9c10360a36374882fa336c9f72893f789611769] # to [81d5e2619337eb076e1511b9980a2dc3fa3b1e68] # # patch "commands.cc" # from [2f696a530afdc8cc8d74f23bd2c3c570b5b00d21] # to [6dd8601f071755ec0a1c1cabbb7e407c00bcd676] # # patch "keys.cc" # from [a20282f233e7479e989b430b1191d1560ae226e5] # to [65b2642d112994b1095fc066c65726ee67a16b9e] # # patch "lua.cc" # from [0cb3d68ac9265f7ba8874e022e931693792b67a3] # to [68f25f00b9c93b3d3a443c3eccc799ce8bf18712] # # patch "netsync.cc" # from [6c823b284919e1088a7325cc5cc4312dea0edbf9] # to [6082dd1b7af02392e9fd5a0e8cdcccc17e5f431d] # # patch "netxx_pipe.cc" # from [f0323062bacd164cdb4c3fb985e3cedec03f0f92] # to [8b395427a639ef059cba75dc723b8399adf02055] # # patch "rcs_import.cc" # from [adbfb4cb67e8251a0875d7cf7cfbb8b668d5cc8c] # to [661696993d2c2e824323ce3f060d7da35b6951e5] # # patch "schema_migration.cc" # from [933f080e167af5ffca4a1e7404bbd348bfbdcb69] # to [2ea8c73eb3650aa2e470fd1e71bfce2c16350026] # # patch "simplestring_xform.cc" # from [62bbf892c97f3e92d008d0ba7418a1fbceaab069] # to [124885841fcd8e23ca00d28a3a646209986082b1] # # patch "txt2c.cc" # from [3c2729549aa54c8fdbc2113207ec7a413dec854c] # to [d951820558e77aa3f2ea48ebf7cbfa18728436aa] # # patch "xdelta.cc" # from [86c250fb61b29971da246b8824733e517549db3d] # to [6c6b2e9ba58529ea6eb0e3b8fbad9c02fa79c483] # ============================================================ --- ChangeLog cbc39bff0c2dacea3855da2f37ef34b420edc5dc +++ ChangeLog 8c22bfe3c1119935ee85c1d07faf948c7d0ae031 @@ -1,3 +1,18 @@ +2006-06-07 Patrick Mauritz + + * cert.cc: + * charset.cc: + * commands.cc: + * keys.cc: + * lua.cc: + * netsync.cc: + * netxx_pipe.cc: + * rcs_import.cc: + * schema_migration.cc: + * simplestring_xform.cc: + * txt2c.cc: + * xdelta.cc: add some more using std::* directives. + 2006-06-07 Matthew Gregan * Makefile.am: Add new SQLite sources. ============================================================ --- cert.cc e5908abaae7761d8c32b5e2f2efeff3e82a19a81 +++ cert.cc 9e78113b59e34754b12a301b93108c04bbaaa453 @@ -39,6 +39,7 @@ using std::set; using std::string; using std::vector; +using std::remove_if; using boost::shared_ptr; using boost::get; ============================================================ --- charset.cc d9c10360a36374882fa336c9f72893f789611769 +++ charset.cc 81d5e2619337eb076e1511b9980a2dc3fa3b1e68 @@ -21,6 +21,7 @@ using std::string; using std::vector; +using std::free; using boost::char_separator; ============================================================ --- commands.cc 2f696a530afdc8cc8d74f23bd2c3c570b5b00d21 +++ commands.cc 6dd8601f071755ec0a1c1cabbb7e407c00bcd676 @@ -22,6 +22,7 @@ using std::pair; using std::set; using std::string; +using std::strlen; using std::vector; // ============================================================ --- keys.cc a20282f233e7479e989b430b1191d1560ae226e5 +++ keys.cc 65b2642d112994b1095fc066c65726ee67a16b9e @@ -43,6 +43,7 @@ using boost::shared_dynamic_cast; using Botan::byte; +using Botan::get_cipher; using Botan::PKCS8_PrivateKey; using Botan::PK_Decryptor; using Botan::PK_Encryptor; ============================================================ --- lua.cc 0cb3d68ac9265f7ba8874e022e931693792b67a3 +++ lua.cc 68f25f00b9c93b3d3a443c3eccc799ce8bf18712 @@ -39,6 +39,9 @@ using std::sort; using std::string; using std::vector; +using std::strerror; +using std::malloc; +using std::free; // adapted from "programming in lua", section 24.2.3 // http://www.lua.org/pil/24.2.3.html ============================================================ --- netsync.cc 6c823b284919e1088a7325cc5cc4312dea0edbf9 +++ netsync.cc 6082dd1b7af02392e9fd5a0e8cdcccc17e5f431d @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -2680,7 +2681,7 @@ instant(0,1); if (!app.bind_port().empty()) - default_port = ::atoi(app.bind_port().c_str()); + default_port = std::atoi(app.bind_port().c_str()); #ifdef USE_IPV6 bool use_ipv6=true; #else ============================================================ --- netxx_pipe.cc f0323062bacd164cdb4c3fb985e3cedec03f0f92 +++ netxx_pipe.cc 8b395427a639ef059cba75dc723b8399adf02055 @@ -23,6 +23,13 @@ #include #endif +using std::vector; +using std::string; +using std::make_pair; +using std::exit; +using std::perror; +using std::strerror; + Netxx::PipeStream::PipeStream(int _readfd, int _writefd) : #ifdef WIN32 @@ -118,20 +125,20 @@ #endif #ifdef WIN32 -static std::string +static string err_msg() { char buf[1024]; I(FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR) &buf, sizeof(buf) / sizeof(TCHAR), NULL) != 0); - return std::string(buf); + return string(buf); } #endif -Netxx::PipeStream::PipeStream (const std::string & cmd, - const std::vector & args) +Netxx::PipeStream::PipeStream (const string & cmd, + const vector & args) : #ifdef WIN32 child(INVALID_HANDLE_VALUE), @@ -152,7 +159,7 @@ unsigned newargc = 0; newargv[newargc++]=cmd.c_str(); - for (std::vector::const_iterator i = args.begin(); + for (vector::const_iterator i = args.begin(); i != args.end(); ++i) newargv[newargc++] = i->c_str(); newargv[newargc] = 0; @@ -163,7 +170,7 @@ // pipes and overlapped i/o. There is no other way, alas. static unsigned long serial = 0; - std::string pipename = (F("\\\\.\\pipe\\netxx_pipe_%ld_%d") + string pipename = (F("\\\\.\\pipe\\netxx_pipe_%ld_%d") % GetCurrentProcessId() % (++serial)).str(); @@ -213,7 +220,7 @@ siStartInfo.hStdInput = hpipe; siStartInfo.dwFlags |= STARTF_USESTDHANDLES; - std::string cmdline = munge_argv_into_cmdline(newargv); + string cmdline = munge_argv_into_cmdline(newargv); L(FL("Subprocess command line: '%s'") % cmdline); BOOL started = CreateProcess(NULL, // Application name @@ -345,7 +352,7 @@ #ifdef WIN32 -static std::string +static string status_name(DWORD wstatus) { switch (wstatus) { @@ -370,7 +377,7 @@ if (rt & ready_write) { - return std::make_pair(pipe->get_socketfd(), ready_write); + return make_pair(pipe->get_socketfd(), ready_write); } if (rt & ready_read) @@ -419,7 +426,7 @@ F("WaitForMultipleObjects call failed: %s") % err_msg()); if (wstatus == WAIT_OBJECT_0 + 1) - return std::make_pair(pipe->get_socketfd(), ready_oobd); + return make_pair(pipe->get_socketfd(), ready_oobd); } else { @@ -430,7 +437,7 @@ } if (wstatus == WAIT_TIMEOUT) - return std::make_pair(-1, ready_none); + return make_pair(-1, ready_none); BOOL ok = GetOverlappedResult(pipe->named_pipe, &pipe->overlap, @@ -453,11 +460,11 @@ if (pipe->bytes_available != 0) { - return std::make_pair(pipe->get_socketfd(), ready_read); + return make_pair(pipe->get_socketfd(), ready_read); } } - return std::make_pair(pipe->get_socketfd(), ready_none); + return make_pair(pipe->get_socketfd(), ready_none); } void @@ -529,9 +536,9 @@ simple_pipe_test() { try { - Netxx::PipeStream pipe("cat",std::vector()); + Netxx::PipeStream pipe("cat",vector()); - std::string result; + string result; Netxx::PipeCompatibleProbe probe; Netxx::Timeout timeout(2L), short_time(0,1000); @@ -560,7 +567,7 @@ buf[1] = 255 - c; pipe.write(buf, 2); - std::string result; + string result; while (result.size() < 2) { // wait for data to arrive probe.clear(); @@ -573,7 +580,7 @@ I(res.first == pipe.get_readfd()); #endif int bytes = pipe.read(buf, sizeof(buf)); - result += std::string(buf, bytes); + result += string(buf, bytes); } I(result.size() == 2); I(static_cast(result[0]) == c); ============================================================ --- rcs_import.cc adbfb4cb67e8251a0875d7cf7cfbb8b668d5cc8c +++ rcs_import.cc 661696993d2c2e824323ce3f060d7da35b6951e5 @@ -50,7 +50,10 @@ using std::multimap; using std::out_of_range; using std::pair; +using std::search; using std::set; +using std::sscanf; +using std::stable_sort; using std::stack; using std::string; using std::vector; ============================================================ --- schema_migration.cc 933f080e167af5ffca4a1e7404bbd348bfbdcb69 +++ schema_migration.cc 2ea8c73eb3650aa2e470fd1e71bfce2c16350026 @@ -30,6 +30,7 @@ using std::locale; using std::map; using std::pair; +using std::remove_if; using std::string; using std::use_facet; using std::vector; ============================================================ --- simplestring_xform.cc 62bbf892c97f3e92d008d0ba7418a1fbceaab069 +++ simplestring_xform.cc 124885841fcd8e23ca00d28a3a646209986082b1 @@ -8,6 +8,7 @@ using std::vector; using std::ostringstream; using std::ostream_iterator; +using std::transform; struct lowerize ============================================================ --- txt2c.cc 3c2729549aa54c8fdbc2113207ec7a413dec854c +++ txt2c.cc d951820558e77aa3f2ea48ebf7cbfa18728436aa @@ -7,6 +7,7 @@ using std::endl; using std::ifstream; using std::string; +using std::exit; int main(int argc, char **argv) { ============================================================ --- xdelta.cc 86c250fb61b29971da246b8824733e517549db3d +++ xdelta.cc 6c6b2e9ba58529ea6eb0e3b8fbad9c02fa79c483 @@ -47,6 +47,8 @@ using std::set; using std::string; using std::vector; +using std::memcmp; +using std::lower_bound; using boost::shared_ptr;