From: coderhyme <jhyo.kim@samsung.com>
Date: Tue, 16 Jun 2015 08:04:32 +0000 (+0900)
Subject: Define const values for RequestHandler default values
X-Git-Tag: 0.9.2-RC1^2~133
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=76e0cfb4fe5faac2d8ebe56d4f1ebe32873e8b27;p=contrib%2Fiotivity.git

Define const values for RequestHandler default values

Change-Id: I8c34cb6bd04592c7299af2ffaa063198599f78a6
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1312
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
---

diff --git a/service/basis/serverBuilder/include/internal/RequestHandler.h b/service/basis/serverBuilder/include/internal/RequestHandler.h
index 61f467a..dc91981 100644
--- a/service/basis/serverBuilder/include/internal/RequestHandler.h
+++ b/service/basis/serverBuilder/include/internal/RequestHandler.h
@@ -35,6 +35,9 @@ namespace OIC
         public:
             using Ptr = std::shared_ptr<RequestHandler>;
 
+            static constexpr int DEFAULT_ERROR_CODE = 200;
+            static constexpr OCEntityHandlerResult DEFAULT_RESULT = OC_EH_OK;
+
             virtual ~RequestHandler()
             {
             }
@@ -46,8 +49,8 @@ namespace OIC
         class SimpleRequestHandler: public RequestHandler
         {
         public:
-            SimpleRequestHandler(const OCEntityHandlerResult& result = OC_EH_OK,
-                    int errorCode = 200);
+            SimpleRequestHandler(const OCEntityHandlerResult& result = DEFAULT_RESULT,
+                    int errorCode = DEFAULT_ERROR_CODE);
 
             std::shared_ptr< OC::OCResourceResponse > buildResponse(
                     PrimitiveServerResource&, const ResourceAttributes&) override;
@@ -68,7 +71,8 @@ namespace OIC
         public:
             template <typename T>
             CustomAttrRequestHandler(T&& attrs,
-                    const OCEntityHandlerResult& result = OC_EH_OK, int errorCode = 200) :
+                    const OCEntityHandlerResult& result = DEFAULT_RESULT,
+                    int errorCode = DEFAULT_ERROR_CODE) :
                 SimpleRequestHandler{ result, errorCode }, m_attrs{ std::forward<T>(attrs) }
             {
             }
diff --git a/service/basis/serverBuilder/src/RequestHandler.cpp b/service/basis/serverBuilder/src/RequestHandler.cpp
index 6322fbf..5818ea9 100644
--- a/service/basis/serverBuilder/src/RequestHandler.cpp
+++ b/service/basis/serverBuilder/src/RequestHandler.cpp
@@ -27,6 +27,8 @@ namespace OIC
     namespace Service
     {
 
+        constexpr OCEntityHandlerResult RequestHandler::DEFAULT_RESULT;
+
         SimpleRequestHandler::SimpleRequestHandler(const OCEntityHandlerResult& result,
                 int errorCode) :
                 m_result{ result }, m_errorCode{ errorCode }