diff options
| author |  Vladimir Moskva <vladmos@google.com> | 2016-09-12 11:27:28 +0200 |
|---|---|---|
| committer | Vladimir Moskva <vladmos@google.com> | 2016-09-12 11:27:28 +0200 |
| commit | 5caf516976f4c3a9cc7b5191404cf04c7998627f (patch) | |
| tree | 6b74f54f98feed9841ace1471d7545f5b13902b1 /src/google/protobuf/compiler/objectivec/objectivec_helpers.h | |
| parent | a86e6d8db22774855489892b65e3fd49a1277922 (diff) | |
| parent | 78aee1b15f49375d279071a5367b6281ce93f8aa (diff) | |
Resolved a conflict
Diffstat (limited to 'src/google/protobuf/compiler/objectivec/objectivec_helpers.h')
| -rw-r--r-- | src/google/protobuf/compiler/objectivec/objectivec_helpers.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/google/protobuf/compiler/objectivec/objectivec_helpers.h b/src/google/protobuf/compiler/objectivec/objectivec_helpers.h index 8f8f1d90..d17d44aa 100644 --- a/src/google/protobuf/compiler/objectivec/objectivec_helpers.h +++ b/src/google/protobuf/compiler/objectivec/objectivec_helpers.h @@ -67,6 +67,9 @@ bool IsRetainedName(const string& name); // handling under ARC. bool IsInitName(const string& name); +// Gets the objc_class_prefix. +string FileClassPrefix(const FileDescriptor* file); + // Gets the path of the file we're going to generate (sans the .pb.h // extension). The path will be dependent on the objectivec package // declared in the proto package. @@ -83,6 +86,7 @@ string FileClassName(const FileDescriptor* file); // These return the fully-qualified class name corresponding to the given // descriptor. string ClassName(const Descriptor* descriptor); +string ClassName(const Descriptor* descriptor, string* out_suffix_added); string EnumName(const EnumDescriptor* descriptor); // Returns the fully-qualified name of the enum value corresponding to the |