commit 28abae7c6fcb1aa27d510b20e85a9c9f62ecf45a
author Patrick Venture <venture@google.com> Fri Dec 14 09:44:02 2018 -0800
committer Patrick Venture <venture@google.com> Fri Jan 04 16:20:14 2019 -0800
tree 09ad82d5046faa309946d87477cc3b17656b4efa
parent b5a9706673bf57d0c54d1965404dfb0e35fc7273

s/size_t/std::size_t/g - for compatibility with other builds

For compatibility with the Google3 build system, use std::size_t instead
of gnu size_t.

Change-Id: Ie361de9c507119aa7db93d24b6e199547bd123af
Signed-off-by: Patrick Venture <venture@google.com>

internal/sys.cpp

diff --git a/internal/sys.cpp b/internal/sys.cpp
index f6a686e..b99a2f2 100644
--- a/internal/sys.cpp
+++ b/internal/sys.cpp
@@ -34,13 +34,13 @@
     return ::close(fd);
 }
 
-void* SysImpl::mmap(void* addr, size_t length, int prot, int flags, int fd,
+void* SysImpl::mmap(void* addr, std::size_t length, int prot, int flags, int fd,
                     off_t offset) const
 {
     return ::mmap(addr, length, prot, flags, fd, offset);
 }
 
-int SysImpl::munmap(void* addr, size_t length) const
+int SysImpl::munmap(void* addr, std::size_t length) const
 {
     return ::munmap(addr, length);
 }

internal/sys.hpp

diff --git a/internal/sys.hpp b/internal/sys.hpp
index 98221c3..98b6e5c 100644
--- a/internal/sys.hpp
+++ b/internal/sys.hpp
@@ -27,9 +27,9 @@
 
     virtual int open(const char* pathname, int flags) const = 0;
     virtual int close(int fd) const = 0;
-    virtual void* mmap(void* addr, size_t length, int prot, int flags, int fd,
-                       off_t offset) const = 0;
-    virtual int munmap(void* addr, size_t length) const = 0;
+    virtual void* mmap(void* addr, std::size_t length, int prot, int flags,
+                       int fd, off_t offset) const = 0;
+    virtual int munmap(void* addr, std::size_t length) const = 0;
     virtual int getpagesize() const = 0;
     virtual int ioctl(int fd, unsigned long request, void* param) const = 0;
     virtual int poll(struct pollfd* fds, nfds_t nfds, int timeout) const = 0;
@@ -45,9 +45,9 @@
   public:
     int open(const char* pathname, int flags) const override;
     int close(int fd) const override;
-    void* mmap(void* addr, size_t length, int prot, int flags, int fd,
+    void* mmap(void* addr, std::size_t length, int prot, int flags, int fd,
                off_t offset) const override;
-    int munmap(void* addr, size_t length) const override;
+    int munmap(void* addr, std::size_t length) const override;
     int getpagesize() const override;
     int ioctl(int fd, unsigned long request, void* param) const override;
     int poll(struct pollfd* fds, nfds_t nfds, int timeout) const override;