Commit 1ef25936 authored by j4cbo's avatar j4cbo

Merge pull request #55 from mrdomino/fix-objc-cpp-prefix

Include cpp prefix in Objective-C C++ includes
parents 3e95fe26 8fc61ee2
...@@ -68,7 +68,7 @@ class ObjcGenerator(spec: Spec) extends Generator(spec) { ...@@ -68,7 +68,7 @@ class ObjcGenerator(spec: Spec) extends Generator(spec) {
refs.privHeader.add("#import <Foundation/Foundation.h>") refs.privHeader.add("#import <Foundation/Foundation.h>")
refs.privHeader.add("!#import " + q(headerName(ident))) refs.privHeader.add("!#import " + q(headerName(ident)))
refs.privHeader.add("!#include " + q(spec.cppFileIdentStyle(ident) + "." + spec.cppHeaderExt)) refs.privHeader.add("!#include " + q(spec.objcIncludeCppPrefix + spec.cppFileIdentStyle(ident) + "." + spec.cppHeaderExt))
refs.body.add("#import <Foundation/Foundation.h>") refs.body.add("#import <Foundation/Foundation.h>")
refs.body.add("!#import " + q(enumTranslatorHeaderName(ident))) refs.body.add("!#import " + q(enumTranslatorHeaderName(ident)))
...@@ -189,7 +189,7 @@ class ObjcGenerator(spec: Spec) extends Generator(spec) { ...@@ -189,7 +189,7 @@ class ObjcGenerator(spec: Spec) extends Generator(spec) {
refs.privHeader.add("#import <Foundation/Foundation.h>") refs.privHeader.add("#import <Foundation/Foundation.h>")
refs.privHeader.add("#include <memory>") refs.privHeader.add("#include <memory>")
refs.privHeader.add("!#import " + q(headerName(ident))) refs.privHeader.add("!#import " + q(headerName(ident)))
refs.privHeader.add("!#include " + q(spec.cppFileIdentStyle(ident) + "." + spec.cppHeaderExt)) refs.privHeader.add("!#include " + q(spec.objcIncludeCppPrefix + spec.cppFileIdentStyle(ident) + "." + spec.cppHeaderExt))
def writeObjcFuncDecl(method: Interface.Method, w: IndentWriter) { def writeObjcFuncDecl(method: Interface.Method, w: IndentWriter) {
val label = if (method.static) "+" else "-" val label = if (method.static) "+" else "-"
...@@ -398,7 +398,7 @@ class ObjcGenerator(spec: Spec) extends Generator(spec) { ...@@ -398,7 +398,7 @@ class ObjcGenerator(spec: Spec) extends Generator(spec) {
refs.privHeader.add("#import <Foundation/Foundation.h>") refs.privHeader.add("#import <Foundation/Foundation.h>")
refs.privHeader.add("!#import " + q(headerName(objcName))) refs.privHeader.add("!#import " + q(headerName(objcName)))
refs.privHeader.add("!#include " + q(spec.cppFileIdentStyle(ident) + "." + spec.cppHeaderExt)) refs.privHeader.add("!#include " + q(spec.objcIncludeCppPrefix + spec.cppFileIdentStyle(ident) + "." + spec.cppHeaderExt))
refs.body.add("#import <Foundation/Foundation.h>") refs.body.add("#import <Foundation/Foundation.h>")
refs.body.add("#include <utility>") refs.body.add("#include <utility>")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment