summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deymo <deymo@google.com>2018-02-13 19:10:50 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-02-13 19:10:50 +0000
commit669ac3c7da6c42add137cbfcdc5aac9edb5312f8 (patch)
treefbd6896513ee8d422f91ca6dbcbe5983932c975e
parent8593ed6bd83944f8ce1f3752262bce8f17224962 (diff)
parent9bb5b822382e1d1d5db3644a90513bb0762054d6 (diff)
downloadbsdiff-669ac3c7da6c42add137cbfcdc5aac9edb5312f8.tar.gz
Merge "Remove "using" from header files."
am: 9bb5b82238 Change-Id: I6ac01a72e839eeaf79b0a02d9a2a7742735f58ea
-rw-r--r--bsdiff_arguments.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/bsdiff_arguments.h b/bsdiff_arguments.h
index fdce065..b330834 100644
--- a/bsdiff_arguments.h
+++ b/bsdiff_arguments.h
@@ -12,8 +12,6 @@
#include "bsdiff/constants.h"
#include "bsdiff/patch_writer_interface.h"
-using std::string;
-
namespace bsdiff {
// Class to store the patch writer options about format, type and quality.
@@ -46,16 +44,16 @@ class BsdiffArguments {
bool ParseCommandLine(int argc, char** argv);
// Parse the compression type from string.
- static bool ParseCompressorType(const string& str, CompressorType* type);
+ static bool ParseCompressorType(const std::string& str, CompressorType* type);
// Parse the minimum length parameter from string.
- static bool ParseMinLength(const string& str, size_t* len);
+ static bool ParseMinLength(const std::string& str, size_t* len);
// Parse the bsdiff format from string.
- static bool ParseBsdiffFormat(const string& str, BsdiffFormat* format);
+ static bool ParseBsdiffFormat(const std::string& str, BsdiffFormat* format);
// Parse the compression quality (for brotli) from string.
- static bool ParseQuality(const string& str, int* quality);
+ static bool ParseQuality(const std::string& str, int* quality);
private:
// Current format supported are the legacy "BSDIFF40" or "BSDF2".