Merge dropbox/djinni commit '502b77ff3cc6158aee5d8223f18c84783985574f…

…' into master

src/source/CppGenerator.scala

@@ -293,6 +293,7 @@ class CppGenerator(spec: Spec) extends Generator(spec) {
 
     val self = marshal.typename(ident, i)
     val superNametype = marshal.superTypename(i)
+    val methodNamesInScope = i.methods.map(m => idCpp.method(m.ident))
 
     writeHppFile(ident, origin, refs.hpp, refs.hppFwds, w => {
 
@@ -355,7 +356,7 @@ class CppGenerator(spec: Spec) extends Generator(spec) {
       }
     })
 
-    // Only generate the cpp file if constants need to be defined.
+    // Cpp only generated in need of Constants
     if (i.consts.nonEmpty) {
       writeCppFile(ident, origin, refs.cpp, w => {
         generateCppConstants(w, i.consts, self)

src/source/CppMarshal.scala

@@ -31,6 +31,8 @@ class CppMarshal(spec: Spec) extends Marshal(spec) {
     case _ => None
   }
 
+  def paramType(tm: MExpr, scopeSymbols: Seq[String]): String = toCppParamType(tm, None, scopeSymbols)
+  def paramType(ty: TypeRef, scopeSymbols: Seq[String]): String = paramType(ty.resolved, scopeSymbols)
   override def paramType(tm: MExpr): String = toCppParamType(tm)
   override def fqParamType(tm: MExpr): String = toCppParamType(tm, Some(spec.cppNamespace))
 

src/source/ObjcGenerator.scala

@@ -71,6 +71,9 @@ class ObjcGenerator(spec: Spec) extends BaseObjcGenerator(spec) {
     writeAlignedObjcCall(w, decl, List(), ";", p => ("",""))
   }
 
+  /**
+    * Generate Interface
+    */
   override def generateInterface(idl: Seq[TypeDecl], origin: String, ident: Ident, doc: Doc, typeParams: Seq[TypeParam], i: Interface) {
     val refs = new ObjcRefs()
     i.methods.map(m => {

src/source/resolver.scala

@@ -264,7 +264,7 @@ private def resolveRecord(scope: Scope, r: Record) {
 }
 
 private def resolveInterface(idl: Seq[TypeDecl], scope: Scope, i: Interface) {
-  // Check for static methods in Java or Objective-C; not allowed
+  // Const and static methods are only allowed on +c (only) interfaces
   if (i.ext.java || i.ext.objc) {
     for (m <- i.methods) {
       if (m.static)
@@ -286,6 +286,8 @@ private def resolveInterface(idl: Seq[TypeDecl], scope: Scope, i: Interface) {
     }
   }
 
+
+  // Static+const isn't valid
   if (i.ext.cpp) {
     for (m <- i.methods) {
       if (m.static && m.const)