Date: Sun, 26 Apr 2015 09:34:37 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384768 - branches/2015Q2/devel/glog/files Message-ID: <201504260934.t3Q9Yb4Z013972@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Sun Apr 26 09:34:36 2015 New Revision: 384768 URL: https://svnweb.freebsd.org/changeset/ports/384768 Log: MFH: r384740 - Fix build on i386 - Regenerate patch files with makepatch: Approved by: ports-secteam (delphij) Modified: branches/2015Q2/devel/glog/files/patch-src-glog-stl_logging.h.in branches/2015Q2/devel/glog/files/patch-src-googletest.h branches/2015Q2/devel/glog/files/patch-src-logging_unittest.cc branches/2015Q2/devel/glog/files/patch-src-stl_logging_unittest.cc Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/devel/glog/files/patch-src-glog-stl_logging.h.in ============================================================================== --- branches/2015Q2/devel/glog/files/patch-src-glog-stl_logging.h.in Sun Apr 26 09:31:23 2015 (r384767) +++ branches/2015Q2/devel/glog/files/patch-src-glog-stl_logging.h.in Sun Apr 26 09:34:36 2015 (r384768) @@ -1,5 +1,5 @@ ---- src/glog/stl_logging.h.in.orig 2015-03-11 12:02:27.000000000 +0800 -+++ src/glog/stl_logging.h.in 2015-03-22 01:13:41.132580961 +0800 +--- src/glog/stl_logging.h.in.orig 2015-03-11 04:02:27 UTC ++++ src/glog/stl_logging.h.in @@ -76,6 +76,9 @@ #ifdef GLOG_STL_LOGGING_FOR_EXT_SLIST # include <ext/slist> @@ -10,7 +10,7 @@ // Forward declare these two, and define them after all the container streams // operators so that we can recurse from pair -> container -> container -> pair -@@ -101,9 +104,13 @@ +@@ -101,9 +104,13 @@ inline std::ostream& operator<<(std::ost OUTPUT_TWO_ARG_CONTAINER(std::vector) OUTPUT_TWO_ARG_CONTAINER(std::deque) OUTPUT_TWO_ARG_CONTAINER(std::list) Modified: branches/2015Q2/devel/glog/files/patch-src-googletest.h ============================================================================== --- branches/2015Q2/devel/glog/files/patch-src-googletest.h Sun Apr 26 09:31:23 2015 (r384767) +++ branches/2015Q2/devel/glog/files/patch-src-googletest.h Sun Apr 26 09:34:36 2015 (r384768) @@ -1,5 +1,5 @@ ---- src/googletest.h.orig 2015-03-11 12:02:27.000000000 +0800 -+++ src/googletest.h 2015-03-22 00:56:38.711647313 +0800 +--- src/googletest.h.orig 2015-03-11 04:02:27 UTC ++++ src/googletest.h @@ -58,6 +58,7 @@ #include "base/commandlineflags.h" Modified: branches/2015Q2/devel/glog/files/patch-src-logging_unittest.cc ============================================================================== --- branches/2015Q2/devel/glog/files/patch-src-logging_unittest.cc Sun Apr 26 09:31:23 2015 (r384767) +++ branches/2015Q2/devel/glog/files/patch-src-logging_unittest.cc Sun Apr 26 09:34:36 2015 (r384768) @@ -1,6 +1,6 @@ ---- src/logging_unittest.cc.orig 2015-03-11 12:02:27.000000000 +0800 -+++ src/logging_unittest.cc 2015-03-22 00:54:39.798664493 +0800 -@@ -78,6 +78,7 @@ +--- src/logging_unittest.cc.orig 2015-03-11 04:02:27 UTC ++++ src/logging_unittest.cc +@@ -78,6 +78,7 @@ using GOOGLE_NAMESPACE::glog_testing::Sc #endif using namespace std; @@ -8,3 +8,94 @@ using namespace GOOGLE_NAMESPACE; // Some non-advertised functions that we want to test or use. +@@ -239,9 +240,9 @@ int main(int argc, char **argv) { + } + + void TestLogging(bool check_counts) { +- int64 base_num_infos = LogMessage::num_messages(GLOG_INFO); +- int64 base_num_warning = LogMessage::num_messages(GLOG_WARNING); +- int64 base_num_errors = LogMessage::num_messages(GLOG_ERROR); ++ gflags::int64 base_num_infos = LogMessage::num_messages(GLOG_INFO); ++ gflags::int64 base_num_warning = LogMessage::num_messages(GLOG_WARNING); ++ gflags::int64 base_num_errors = LogMessage::num_messages(GLOG_ERROR); + + LOG(INFO) << string("foo ") << "bar " << 10 << ' ' << 3.4; + for ( int i = 0; i < 10; ++i ) { +@@ -564,8 +565,8 @@ void TestDCHECK() { + DCHECK_GT(2, 1); + DCHECK_LT(1, 2); + +- auto_ptr<int64> sptr(new int64); +- int64* ptr = DCHECK_NOTNULL(sptr.get()); ++ auto_ptr<gflags::int64> sptr(new gflags::int64); ++ gflags::int64* ptr = DCHECK_NOTNULL(sptr.get()); + CHECK_EQ(ptr, sptr.get()); + } + +@@ -594,14 +595,14 @@ TEST(DeathSTREQ, logging) { + } + + TEST(CheckNOTNULL, Simple) { +- int64 t; ++ gflags::int64 t; + void *ptr = static_cast<void *>(&t); + void *ref = CHECK_NOTNULL(ptr); + EXPECT_EQ(ptr, ref); + CHECK_NOTNULL(reinterpret_cast<char *>(ptr)); + CHECK_NOTNULL(reinterpret_cast<unsigned char *>(ptr)); + CHECK_NOTNULL(reinterpret_cast<int *>(ptr)); +- CHECK_NOTNULL(reinterpret_cast<int64 *>(ptr)); ++ CHECK_NOTNULL(reinterpret_cast<gflags::int64 *>(ptr)); + } + + TEST(DeathCheckNN, Simple) { +@@ -736,7 +737,7 @@ struct MyLogger : public base::Logger { + + virtual void Flush() { } + +- virtual uint32 LogSize() { return data.length(); } ++ virtual gflags::uint32 LogSize() { return data.length(); } + }; + + static void TestWrapper() { +@@ -760,23 +761,23 @@ static void TestErrno() { + CHECK_EQ(errno, ENOENT); + } + +-static void TestOneTruncate(const char *path, int64 limit, int64 keep, +- int64 dsize, int64 ksize, int64 expect) { ++static void TestOneTruncate(const char *path, gflags::int64 limit, gflags::int64 keep, ++ gflags::int64 dsize, gflags::int64 ksize, gflags::int64 expect) { + int fd; + CHECK_ERR(fd = open(path, O_RDWR | O_CREAT | O_TRUNC, 0600)); + + const char *discardstr = "DISCARDME!", *keepstr = "KEEPME!"; + + // Fill the file with the requested data; first discard data, then kept data +- int64 written = 0; ++ gflags::int64 written = 0; + while (written < dsize) { +- int bytes = min<int64>(dsize - written, strlen(discardstr)); ++ int bytes = min<gflags::int64>(dsize - written, strlen(discardstr)); + CHECK_ERR(write(fd, discardstr, bytes)); + written += bytes; + } + written = 0; + while (written < ksize) { +- int bytes = min<int64>(ksize - written, strlen(keepstr)); ++ int bytes = min<gflags::int64>(ksize - written, strlen(keepstr)); + CHECK_ERR(write(fd, keepstr, bytes)); + written += bytes; + } +@@ -796,9 +797,9 @@ static void TestOneTruncate(const char * + CHECK_ERR(read(fd, buf, buf_size)); + + const char *p = buf; +- int64 checked = 0; ++ gflags::int64 checked = 0; + while (checked < expect) { +- int bytes = min<int64>(expect - checked, strlen(keepstr)); ++ int bytes = min<gflags::int64>(expect - checked, strlen(keepstr)); + CHECK(!memcmp(p, keepstr, bytes)); + checked += bytes; + } Modified: branches/2015Q2/devel/glog/files/patch-src-stl_logging_unittest.cc ============================================================================== --- branches/2015Q2/devel/glog/files/patch-src-stl_logging_unittest.cc Sun Apr 26 09:31:23 2015 (r384767) +++ branches/2015Q2/devel/glog/files/patch-src-stl_logging_unittest.cc Sun Apr 26 09:34:36 2015 (r384768) @@ -1,5 +1,5 @@ ---- src/stl_logging_unittest.cc.orig 2015-03-11 12:02:27.000000000 +0800 -+++ src/stl_logging_unittest.cc 2015-03-22 01:03:23.871621079 +0800 +--- src/stl_logging_unittest.cc.orig 2015-03-11 04:02:27 UTC ++++ src/stl_logging_unittest.cc @@ -41,6 +41,7 @@ // C++0x isn't enabled by default in GCC and libc++ does not have // non-standard ext/* and tr1/unordered_*.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504260934.t3Q9Yb4Z013972>