stats.rbytes += (newerSample->readbytes() - olderSample->readbytes());
stats.wbytes += (newerSample->writebytes() - olderSample->writebytes());
- // Note that all of these are explicitly `long long`s, not int64_t,
- // so we can't use PRId64 here.
-#define NUMBER "%-13lld"
- printf("%5lld - %-5lld " NUMBER NUMBER NUMBER NUMBER NUMBER NUMBER "%-9.2f\n",
+#define NUMBER "%-13" PRId64
+ printf("%5" PRId64 " - %-5" PRId64 " " NUMBER NUMBER NUMBER NUMBER NUMBER NUMBER "%-9.2f\n",
#undef NUMBER
olderSample->uptime(),
newerSample->uptime(),
isFirstSample = false;
}
printf("-----------------------------------------------------------------------------\n");
-#define NUMBER "%-13lld"
+#define NUMBER "%-13" PRId64
printf("%-15s" NUMBER NUMBER NUMBER NUMBER NUMBER NUMBER "\n",
#undef NUMBER
"Total",
using google::protobuf::DescriptorPool;
using google::protobuf::Message;
-using google::protobuf::scoped_ptr;
using google::protobuf::util::NewTypeResolverForDescriptorPool;
using google::protobuf::util::TypeResolver;
}
ErrorOr<std::string> MessageToJsonString(const Message& message) {
- scoped_ptr<TypeResolver> resolver(
+ std::unique_ptr<TypeResolver> resolver(
NewTypeResolverForDescriptorPool(kTypeUrlPrefix, DescriptorPool::generated_pool()));
google::protobuf::util::JsonOptions options;
namespace internal {
ErrorOr<std::monostate> JsonStringToMessage(const std::string& content, Message* message) {
- scoped_ptr<TypeResolver> resolver(
+ std::unique_ptr<TypeResolver> resolver(
NewTypeResolverForDescriptorPool(kTypeUrlPrefix, DescriptorPool::generated_pool()));
std::string binary;