commit cee87766427f1ec0ed33b2a6ac429c5dbf3aded8
author tholenst <tholenst@google.com> Mon Sep 23 06:37:08 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Sep 23 06:37:45 2019 -0700
tree 0872f0f77af267f1c9dd1e2e7807ae8e02b15c2c
parent bfa818d36834384b264ee8bc0279eaa66630bbc7

Fix build under gcc 7.0.

PiperOrigin-RevId: 270664047

cc/subtle/BUILD.bazel

diff --git a/cc/subtle/BUILD.bazel b/cc/subtle/BUILD.bazel
index d60ae9b..68b9def 100644
--- a/cc/subtle/BUILD.bazel
+++ b/cc/subtle/BUILD.bazel
@@ -538,7 +538,6 @@
     hdrs = ["common_enums.h"],
     include_prefix = "tink",
     strip_include_prefix = "/cc",
-    deps = ["@com_google_absl//absl/strings"],
 )
 
 cc_library(

cc/subtle/CMakeLists.txt

diff --git a/cc/subtle/CMakeLists.txt b/cc/subtle/CMakeLists.txt
index 7198e5e..4e57efb 100644
--- a/cc/subtle/CMakeLists.txt
+++ b/cc/subtle/CMakeLists.txt
@@ -478,8 +478,6 @@
   SRCS
     common_enums.cc
     common_enums.h
-  DEPS
-    absl::strings
 )
 
 tink_cc_library(

cc/subtle/common_enums.cc

diff --git a/cc/subtle/common_enums.cc b/cc/subtle/common_enums.cc
index f2ff20e..d3b2dd6 100644
--- a/cc/subtle/common_enums.cc
+++ b/cc/subtle/common_enums.cc
@@ -18,8 +18,6 @@
 
 #include <string>
 
-#include "absl/strings/str_cat.h"
-
 namespace crypto {
 namespace tink {
 namespace subtle {
@@ -37,7 +35,7 @@
   case EllipticCurveType::UNKNOWN_CURVE:
     return "UNKNOWN_CURVE";
   default:
-    return absl::StrCat("UNKNOWN_CURVE: ", type);
+    return "UNKNOWN_CURVE: " + std::to_string(type);
   }
 }
 
@@ -52,7 +50,7 @@
   case EcPointFormat::UNKNOWN_FORMAT:
     return "UNKNOWN_FORMAT";
   default:
-    return absl::StrCat("UNKNOWN_FORMAT: ", format);
+    return "UNKNOWN_FORMAT: " + std::to_string(format);
   }
 }
 
@@ -69,7 +67,7 @@
   case HashType::UNKNOWN_HASH:
     return "UNKNOWN_HASH";
   default:
-    return absl::StrCat("UNKNOWN_HASH: ", type);
+    return "UNKNOWN_HASH: " + std::to_string(type);
   }
 }
 

cc/util/BUILD.bazel

diff --git a/cc/util/BUILD.bazel b/cc/util/BUILD.bazel
index ec0e1ab..ce472c2 100644
--- a/cc/util/BUILD.bazel
+++ b/cc/util/BUILD.bazel
@@ -2,6 +2,7 @@
 
 licenses(["notice"])
 
+
 cc_library(
     name = "buffer",
     srcs = ["buffer.cc"],
@@ -61,8 +62,7 @@
     visibility = ["//visibility:public"],
     deps = [
         "@com_google_absl//absl/base:core_headers",
-        "@com_google_absl//absl/strings",
-    ],
+    ]
 )
 
 cc_library(

cc/util/CMakeLists.txt

diff --git a/cc/util/CMakeLists.txt b/cc/util/CMakeLists.txt
index de66de6..abd44e4 100644
--- a/cc/util/CMakeLists.txt
+++ b/cc/util/CMakeLists.txt
@@ -49,7 +49,6 @@
     status.h
   DEPS
     absl::base
-    absl::strings
   PUBLIC
 )
 

cc/util/status.cc

diff --git a/cc/util/status.cc b/cc/util/status.cc
index a962449..fd5d31e 100644
--- a/cc/util/status.cc
+++ b/cc/util/status.cc
@@ -17,8 +17,6 @@
 #include <sstream>
 
 #include "tink/util/status.h"
-
-#include "absl/strings/str_cat.h"
 // placeholder_google3_status_header, please ignore
 
 using ::std::ostream;
@@ -119,7 +117,7 @@
   }
   // Avoid using a "default" in the switch, so that the compiler can
   // give us a warning, but still provide a fallback here.
-  return absl::StrCat(error);
+  return std::to_string(error);
 }
 
 extern ostream& operator<<(ostream& os, crypto::tink::util::error::Code code) {