[2.2.1] Merge different codes between 2.2 and 3.0

[platform/framework/native/appfw.git] / inc / FBaseLongLong.h

diff --git a/inc/FBaseLongLong.h b/inc/FBaseLongLong.h
index 4c60e0d..27c73a8 100644 (file)
--- a/inc/FBaseLongLong.h
+++ b/inc/FBaseLongLong.h
@@ -1,5 +1,4 @@
 //
-// Open Service Platform
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the License);
@@ -28,7 +27,6 @@
 
 #include <FBaseNumber.h>
 
-
 namespace Tizen { namespace Base
 {
 /**
@@ -172,7 +170,7 @@ public:
        *
        *        @since         2.0
        *
-       *        @return        An integer value indicating the hash value of the specified @c long @c long value
+       *        @return                An integer value indicating the hash value of the specified @c long @c long value
        *        @param[in]   val   A @c long @c long value to get the hash value
        */
        static int GetHashCode(long long val);
@@ -254,7 +252,7 @@ public:
         *
         *      @since                  2.0
         *
-        *      @return                 The string containing a Unicode representation of the specified @c signed @c long @c long value
+        *      @return                         The string containing a Unicode representation of the specified @c signed @c long @c long value
         *      @param[in]      value   A @c signed @c long @c long value to convert
         */
        static String ToString(long long value);
@@ -284,7 +282,7 @@ public:
         *
         *      @return                 An error code
         *      @param[in]      s                               A string representing a numeric value
-        *      @param[in]      radix                   The radix of the string representing a unmeric value @n
+        *      @param[in]      radix                   The radix of the string representing a numeric value @n
         *                                                              It must be either 2, 8, 10 or 16.
         *      @param[out]     ret                             The result of the operation
         *      @exception      E_SUCCESS               The method is successful.
@@ -318,7 +316,7 @@ public:
 
 private:
        friend class _LongLongImpl;
-       class _LongLongImpl * __pLongLongImpl;
+       class _LongLongImpl* __pLongLongImpl;
 
 }; // LongLong