Merge "Remove "using" from header files." am: 9bb5b82238

am: 669ac3c7da

Change-Id: I8608023d9b983455e102d55fb278d6a9f51e65ef
This commit is contained in:
Alex Deymo authored and android-build-merger committed 2018-02-13 19:15:22 +00:00
commit 84e6345e6a
1 file changed
+4 -6
+4 -6
View File
@@ -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".