diff options
| author | Paul Yang <TeBoring@users.noreply.github.com> | 2015-06-09 17:17:45 -0700 |
|---|---|---|
| committer | Paul Yang <TeBoring@users.noreply.github.com> | 2015-06-09 17:17:45 -0700 |
| commit | fb466c13a7c0280fdc30acf86d3b29235a904ba5 (patch) | |
| tree | 938c7b2e06268887d766a4ac03d24fcb89f21ef8 /objectivec/GPBWireFormat.h | |
| parent | fd73235f6b2534aa63af41359d9f386ade43a5cc (diff) | |
| parent | d846b0b059b4d867536b98aa29475a387aa09114 (diff) | |
| download | protobuf-fb466c13a7c0280fdc30acf86d3b29235a904ba5.tar.gz protobuf-fb466c13a7c0280fdc30acf86d3b29235a904ba5.tar.bz2 protobuf-fb466c13a7c0280fdc30acf86d3b29235a904ba5.zip | |
Merge pull request #480 from thomasvl/objc_beta_drop
Beta quality drop of Objective C Support.
Diffstat (limited to 'objectivec/GPBWireFormat.h')
| -rw-r--r-- | objectivec/GPBWireFormat.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/objectivec/GPBWireFormat.h b/objectivec/GPBWireFormat.h index 55f2edfc..45089bd0 100644 --- a/objectivec/GPBWireFormat.h +++ b/objectivec/GPBWireFormat.h @@ -28,7 +28,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#import "GPBTypes.h" +#import "GPBRuntimeTypes.h" CF_EXTERN_C_BEGIN @@ -52,7 +52,7 @@ uint32_t GPBWireFormatMakeTag(uint32_t fieldNumber, GPBWireFormat wireType) GPBWireFormat GPBWireFormatGetTagWireType(uint32_t tag) __attribute__((const)); uint32_t GPBWireFormatGetTagFieldNumber(uint32_t tag) __attribute__((const)); -GPBWireFormat GPBWireFormatForType(GPBType type, BOOL isPacked) +GPBWireFormat GPBWireFormatForType(GPBDataType dataType, BOOL isPacked) __attribute__((const)); #define GPBWireFormatMessageSetItemTag \ |