aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/compiler/objectivec/objectivec_helpers.h
diff options
context:
space:
mode:
authorThomas Van Lenten <thomasvl@google.com>2015-05-18 15:01:15 -0400
committerThomas Van Lenten <thomasvl@google.com>2015-05-19 20:25:19 -0400
commitce55ff9441753164a34f31a48572ea2f1fb38aba (patch)
tree454090707d9d8a5e0289c9e10dbcbc4933bdb30c /src/google/protobuf/compiler/objectivec/objectivec_helpers.h
parent4324bf6bf2d217a478356ccc190acb21347b63b3 (diff)
downloadprotobuf-ce55ff9441753164a34f31a48572ea2f1fb38aba.tar.gz
protobuf-ce55ff9441753164a34f31a48572ea2f1fb38aba.tar.bz2
protobuf-ce55ff9441753164a34f31a48572ea2f1fb38aba.zip
Getting the ObjC generator building on Windows.
Remove the ClassList support (maybe bring it back in the future). Trim the includes to hopefully get a working Window build. Add some more returns after switches for compilers that warn even when all values of the enum are handled. Use ghtonl instead of htonl. Change the use of [u]int(8,32)_t within the ObjC generator code to [u]int(8,32) to match the rest of the compiler. Add objective-c generator files to Visual Studio project.
Diffstat (limited to 'src/google/protobuf/compiler/objectivec/objectivec_helpers.h')
-rw-r--r--src/google/protobuf/compiler/objectivec/objectivec_helpers.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/google/protobuf/compiler/objectivec/objectivec_helpers.h b/src/google/protobuf/compiler/objectivec/objectivec_helpers.h
index 2701a30c..ab030d15 100644
--- a/src/google/protobuf/compiler/objectivec/objectivec_helpers.h
+++ b/src/google/protobuf/compiler/objectivec/objectivec_helpers.h
@@ -142,9 +142,6 @@ string BuildFlagsString(const vector<string>& strings);
string BuildCommentsString(const SourceLocation& location);
-bool WriteClassList(string* error);
-void WriteClassNameToClassList(const string& name);
-
bool InitializeClassWhitelist(string* error);
bool FilterClass(const string& name);
@@ -154,7 +151,7 @@ class TextFormatDecodeData {
public:
TextFormatDecodeData() {}
- void AddString(int32_t key, const string& input_for_decode,
+ void AddString(int32 key, const string& input_for_decode,
const string& desired_output);
size_t num_entries() const { return entries_.size(); }
string Data() const;
@@ -165,7 +162,7 @@ class TextFormatDecodeData {
private:
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(TextFormatDecodeData);
- typedef std::pair<int32_t, string> DataEntry;
+ typedef std::pair<int32, string> DataEntry;
vector<DataEntry> entries_;
};