Merge "Resolve result cancel issue of DataControl provider." into tizen_2.1

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

diff --git a/inc/FBaseLongLong.h b/inc/FBaseLongLong.h
index 8fe692b..2734687 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);
@@ -265,13 +264,14 @@ public:
         *
         *      @since                  2.0
         *
-        *  @return                     An error code
-        *  @param[in]  s                               A string representing a numeric value
-        *  @param[out] ret                             The result of the operation
-        *  @exception  E_SUCCESS               The method is successful.
-        *  @exception  E_NUM_FORMAT    The specified string does not contain a number that can be parsed.
-        *  @remarks    This method assumes that the string representing the numeric value
-        *                              uses a radix 10.
+        *      @return                 An error code
+        *      @param[in]      s                               A string representing a numeric value
+        *      @param[out]     ret                             The result of the operation
+        *      @exception      E_SUCCESS               The method is successful.
+        *      @exception      E_NUM_FORMAT    The specified string does not contain a number that can be parsed.
+        *      @remarks
+        *                              - This method assumes that the string representing the numeric value uses a radix 10.
+        *                              - This method guarantees that the original value of out-parameter is not changed when the method returns error.
         */
        static result Parse(const String& s, long long& ret);
 
@@ -279,16 +279,17 @@ public:
         *      Parses the specified string representing a numeric value using the specified radix and
         *      returns the value as a @c signed @c long @c long (as out parameter).
         *
-        *      @since                  2.0
+        *      @since                  2.1
         *
-        *  @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
+        *      @return                 An error code
+        *      @param[in]      s                               A string representing a numeric value
+        *      @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.
-        *  @exception  E_NUM_FORMAT    The specified string does not contain a number that can be parsed.
-        *  @excpetion  E_OUT_OF_RANGE  The specified @c radix is invalid.
+        *      @param[out]     ret                             The result of the operation
+        *      @exception      E_SUCCESS               The method is successful.
+        *      @exception      E_NUM_FORMAT    The specified string does not contain a number that can be parsed.
+        *      @exception      E_OUT_OF_RANGE  The specified @c radix is invalid.
+        *      @remarks        This method guarantees that the original value of out-parameter is not changed when the method returns error.
         */
        static result Parse(const String& s, int radix, long long& ret);