You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2014/02/27 19:28:59 UTC

[3/3] git commit: Fixed compile errors in mesos with Clang 3.5 on Ubuntu 13.10.

Fixed compile errors in mesos with Clang 3.5 on Ubuntu 13.10.

Review: https://reviews.apache.org/r/18426


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/162a7f5d
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/162a7f5d
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/162a7f5d

Branch: refs/heads/master
Commit: 162a7f5d84b3cc04e5f3a612e62bf76f1c1c25a4
Parents: 66155da
Author: Bernd Mathiske <be...@mesosphere.io>
Authored: Thu Feb 27 10:18:16 2014 -0800
Committer: Vinod Kone <vi...@twitter.com>
Committed: Thu Feb 27 10:18:16 2014 -0800

----------------------------------------------------------------------
 src/jvm/jvm.cpp        |  6 +++---
 src/jvm/jvm.hpp        | 14 +++++++-------
 src/messages/state.hpp |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/162a7f5d/src/jvm/jvm.cpp
----------------------------------------------------------------------
diff --git a/src/jvm/jvm.cpp b/src/jvm/jvm.cpp
index 6eb3a34..d3dfa75 100644
--- a/src/jvm/jvm.cpp
+++ b/src/jvm/jvm.cpp
@@ -308,7 +308,7 @@ Jvm::Field Jvm::findStaticField(
 }
 
 
-jobject Jvm::invoke(const Constructor& ctor, ...)
+jobject Jvm::invoke(const Constructor ctor, ...)
 {
   Env env;
   va_list args;
@@ -817,7 +817,7 @@ void Jvm::check(JNIEnv* env)
 // they use (i.e., Jvm::invokeV<void>, Jvm::invokeStaticV<void>).
 
 template <>
-void Jvm::invoke<void>(const jobject receiver, const Method& method, ...)
+void Jvm::invoke<void>(const jobject receiver, const Method method, ...)
 {
   va_list args;
   va_start(args, method);
@@ -827,7 +827,7 @@ void Jvm::invoke<void>(const jobject receiver, const Method& method, ...)
 
 
 template <>
-void Jvm::invokeStatic<void>(const Method& method, ...)
+void Jvm::invokeStatic<void>(const Method method, ...)
 {
   va_list args;
   va_start(args, method);

http://git-wip-us.apache.org/repos/asf/mesos/blob/162a7f5d/src/jvm/jvm.hpp
----------------------------------------------------------------------
diff --git a/src/jvm/jvm.hpp b/src/jvm/jvm.hpp
index b4dff78..2d3a7eb 100644
--- a/src/jvm/jvm.hpp
+++ b/src/jvm/jvm.hpp
@@ -412,13 +412,13 @@ public:
   // calls. Possibly a way to do this with typelists, type
   // concatenation and unwinding builder inheritance.
 
-  jobject invoke(const Constructor& ctor, ...);
+  jobject invoke(const Constructor ctor, ...);
 
   template <typename T>
-  T invoke(const jobject receiver, const Method& method, ...);
+  T invoke(const jobject receiver, const Method method, ...);
 
   template <typename T>
-  T invokeStatic(const Method& method, ...);
+  T invokeStatic(const Method method, ...);
 
   template <typename T>
   void setField(jobject receiver, const Field& field, T t);
@@ -463,11 +463,11 @@ private:
 
 
 template <>
-void Jvm::invoke<void>(const jobject receiver, const Method& method, ...);
+void Jvm::invoke<void>(const jobject receiver, const Method method, ...);
 
 
 template <typename T>
-T Jvm::invoke(const jobject receiver, const Method& method, ...)
+T Jvm::invoke(const jobject receiver, const Method method, ...)
 {
   va_list args;
   va_start(args, method);
@@ -478,11 +478,11 @@ T Jvm::invoke(const jobject receiver, const Method& method, ...)
 
 
 template <>
-void Jvm::invokeStatic<void>(const Method& method, ...);
+void Jvm::invokeStatic<void>(const Method method, ...);
 
 
 template <typename T>
-T Jvm::invokeStatic(const Method& method, ...)
+T Jvm::invokeStatic(const Method method, ...)
 {
   va_list args;
   va_start(args, method);

http://git-wip-us.apache.org/repos/asf/mesos/blob/162a7f5d/src/messages/state.hpp
----------------------------------------------------------------------
diff --git a/src/messages/state.hpp b/src/messages/state.hpp
index 6245499..d10c0de 100644
--- a/src/messages/state.hpp
+++ b/src/messages/state.hpp
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-#ifndef __MESSAGE_STATE_HPP__
+#ifndef __MESSAGES_STATE_HPP__
 #define __MESSAGES_STATE_HPP__
 
 #include "messages/state.pb.h"