From 3f7c0903daea1bba8d6f817ac077fe4ef8a238fb Mon Sep 17 00:00:00 2001
From: Sunwook Bae <sunwook45.bae@samsung.com>
Date: Wed, 2 Oct 2013 10:51:11 +0900
Subject: [PATCH] Fix a build error

Change-Id: Ie8db13e36cda77dbbadfb9b0b28a81acec144e94
Signed-off-by: Sunwook Bae <sunwook45.bae@samsung.com>
---
 ipc/ipc_message_utils.h      | 15 +++++++++++++--
 ipc/ipc_message_utils_impl.h | 16 ----------------
 packaging/chromium.spec      |  4 ++--
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/ipc/ipc_message_utils.h b/ipc/ipc_message_utils.h
index a7b7895..3b5ff6f1 100755
--- a/ipc/ipc_message_utils.h
+++ b/ipc/ipc_message_utils.h
@@ -962,7 +962,14 @@ class __attribute__((visibility("default"))) MessageWithTuple : public Message {
   // those translation units.
   MessageWithTuple(int32 routing_id, uint32 type, const RefParam& p);
 
-  static bool Read(const Message* msg, Param* p) IPC_MSG_NOINLINE;
+  static bool Read(const Message* msg, Param* p)
+  { // Put definition into class so that Dispatch method could use it.
+    void* iter = NULL;
+    if (ReadParam(msg, &iter, p))
+      return true;
+    NOTREACHED() << "Error deserializing message " << msg->type();
+    return false;
+  } IPC_MSG_NOINLINE;
 
   // Generic dispatcher.  Should cover most cases.
   template<class T, class S, class Method>
@@ -1154,7 +1161,11 @@ class __attribute__((visibility("default"))) MessageWithReply : public SyncMessa
 
   MessageWithReply(int32 routing_id, uint32 type,
                    const RefSendParam& send, const ReplyParam& reply);
-  static bool ReadSendParam(const Message* msg, SendParam* p) IPC_MSG_NOINLINE;
+  static bool ReadSendParam(const Message* msg, SendParam* p)
+  { // Put definition into class so that Dispatch method could use it.
+    void* iter = SyncMessage::GetDataIterator(msg);
+    return ReadParam(msg, &iter, p);
+  } IPC_MSG_NOINLINE;
   static bool ReadReplyParam(
       const Message* msg,
       typename TupleTypes<ReplyParam>::ValueTuple* p) IPC_MSG_NOINLINE;
diff --git a/ipc/ipc_message_utils_impl.h b/ipc/ipc_message_utils_impl.h
index 7e512a6..2e571ed 100644
--- a/ipc/ipc_message_utils_impl.h
+++ b/ipc/ipc_message_utils_impl.h
@@ -18,15 +18,6 @@ MessageWithTuple<ParamType>::MessageWithTuple(
   WriteParam(this, p);
 }
 
-template <class ParamType>
-bool MessageWithTuple<ParamType>::Read(const Message* msg, Param* p) {
-  void* iter = NULL;
-  if (ReadParam(msg, &iter, p))
-    return true;
-  NOTREACHED() << "Error deserializing message " << msg->type();
-  return false;
-}
-
 // We can't migrate the template for Log() to MessageWithTuple, because each
 // subclass needs to have Log() to call Read(), which instantiates the above
 // template.
@@ -43,13 +34,6 @@ MessageWithReply<SendParamType, ReplyParamType>::MessageWithReply(
 }
 
 template <class SendParamType, class ReplyParamType>
-bool MessageWithReply<SendParamType, ReplyParamType>::ReadSendParam(
-    const Message* msg, SendParam* p) {
-  void* iter = SyncMessage::GetDataIterator(msg);
-  return ReadParam(msg, &iter, p);
-}
-
-template <class SendParamType, class ReplyParamType>
 bool MessageWithReply<SendParamType, ReplyParamType>::ReadReplyParam(
     const Message* msg, typename TupleTypes<ReplyParam>::ValueTuple* p) {
   void* iter = SyncMessage::GetDataIterator(msg);
diff --git a/packaging/chromium.spec b/packaging/chromium.spec
index a9d51d9..2c8bb34 100755
--- a/packaging/chromium.spec
+++ b/packaging/chromium.spec
@@ -2,7 +2,7 @@ Name:       chromium
 Summary:    Chromium Library
 Version:    1.0
 Release:    1
-Group:      Web Framework/Libraries
+Group:      App Framework/Libraries
 License:    BSD-3-Clause
 Source0:    %{name}-%{version}.tar.gz
 Source1001: 	chromium.manifest
@@ -13,7 +13,7 @@ Chromium library
 
 %package devel
 Summary:    Chromium library - Development Files
-Group:      Development/Web Framework
+Group:      Development/App Framework
 Requires:   %{name} = %{version}-%{release}
 
 %description devel
-- 
2.7.4