CDT.hpp   CDT.hpp 
skipping to change at line 1594 skipping to change at line 1594
UINT_64 GetUInt() const; UINT_64 GetUInt() const;
/** /**
@brief Get value as STLW::string @brief Get value as STLW::string
@param szFormat - output format @param szFormat - output format
@return String object representation @return String object representation
*/ */
STLW::string GetString(CCHAR_P szFormat = "") const; STLW::string GetString(CCHAR_P szFormat = "") const;
/** /**
@brief Cast value to W_FLOAT
*/
W_FLOAT ToFloat();
/**
@brief Cast value to INT_64
*/
INT_64 ToInt();
/**
@brief Cast value to STLW::string
@param szFormat - output format
@return String object representation
*/
STLW::string ToString(CCHAR_P szFormat = "");
/**
@brief Get generic pointer @brief Get generic pointer
@return generic pointer @return generic pointer
*/ */
const void * GetPointer() const; const void * GetPointer() const;
/** /**
@brief Get object @brief Get object
@return pointer to specified type @return pointer to specified type
*/ */
template<typename T> const T * GetObject() const { return (T*)GetPoi nter(); } template<typename T> const T * GetObject() const { return (T*)GetPoi nter(); }
skipping to change at line 1861 skipping to change at line 1878
ConstIterator End() const; ConstIterator End() const;
/** /**
@brief Find element in hash @brief Find element in hash
@param sKey - element name @param sKey - element name
@return Iterator pointed to element or to end of hash if nothing f ound @return Iterator pointed to element or to end of hash if nothing f ound
*/ */
ConstIterator Find(const STLW::string & sKey) const; ConstIterator Find(const STLW::string & sKey) const;
/** /**
@brief Try to cast value to integer or to IEEE floating point valu
e
@return Cast result type
*/
eValType CastToNumber(INT_64 & iData,
W_FLOAT & dData) const;
/**
@brief A destructor @brief A destructor
*/ */
~CDT() throw(); ~CDT() throw();
private: private:
// Friends // Friends
friend CDT operator-(const UINT_64 & oValue, const CDT & oCDT); friend CDT operator-(const UINT_64 & oValue, const CDT & oCDT);
friend CDT operator-(const INT_64 & oValue, const CDT & oCDT); friend CDT operator-(const INT_64 & oValue, const CDT & oCDT);
friend CDT operator-(const W_FLOAT & oValue, const CDT & oCDT); friend CDT operator-(const W_FLOAT & oValue, const CDT & oCDT);
skipping to change at line 1910 skipping to change at line 1934
@brief Unshare shareable container @brief Unshare shareable container
*/ */
void Unshare(); void Unshare();
/** /**
@brief Dump CDT into string @brief Dump CDT into string
@param iLevel - level of recursion @param iLevel - level of recursion
@param oData - data to dump @param oData - data to dump
@param sResult - string to put result in @param sResult - string to put result in
*/ */
static void DumpData(UINT_32 iLevel, const CDT & oData, STLW::string & sResult); static void DumpData(UINT_32 iLevel, UINT_32 iOffset, const CDT & oD ata, STLW::string & sResult);
/** /**
@brief Check complex data type and change value type, if need @brief Check complex data type and change value type, if need
@return Cast result
*/ */
void CheckComplexDataType() const; void CheckComplexDataType() const;
/**
@brief Try to cast value to integer or to IEEE floating point valu
e
@return Cast result type
*/
eValType CastToNumber(INT_64 & iData,
W_FLOAT & dData) const;
}; };
// //////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////// ///////////////////// // //////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////// /////////////////////
// //
// Realization // Realization
// //
// //////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////// ///////////////////// // //////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////// /////////////////////
/** /**
 End of changes. 5 change blocks. 
9 lines changed or deleted 26 lines changed or added


 CTPP2SysHeaders.h   CTPP2SysHeaders.h 
skipping to change at line 81 skipping to change at line 81
#define CTPP_ESCAPE_BUFFER_LEN 1024 #define CTPP_ESCAPE_BUFFER_LEN 1024
#define CTPP_MAX_TEMPLATE_RECURSION_DEPTH 1024 #define CTPP_MAX_TEMPLATE_RECURSION_DEPTH 1024
#define ICONV_SUPPORT 1 #define ICONV_SUPPORT 1
#define ICONV_DISCARD_ILSEQ 1 #define ICONV_DISCARD_ILSEQ 1
#define ICONV_TRANSLITERATE 1 #define ICONV_TRANSLITERATE 1
#define CTPP_VERSION "2.6.6" #define CTPP_VERSION "2.6.7"
#define CTPP_IDENT "Dzoraget" #define CTPP_IDENT "Dzoraget"
#define CTPP_MASTER_SITE_URL "http://ctpp.havoc.ru/" #define CTPP_MASTER_SITE_URL "http://ctpp.havoc.ru/"
/* #undef THROW_EXCEPTION_IN_COMPARATORS */ /* #undef THROW_EXCEPTION_IN_COMPARATORS */
#endif /* _CTPP2_SYS_HEADERS_H__ */ #endif /* _CTPP2_SYS_HEADERS_H__ */
/* End. */ /* End. */
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 CTPP2Util.hpp   CTPP2Util.hpp 
skipping to change at line 126 skipping to change at line 126
*/ */
void CDT2JSON(const CDT & oCDT, STLW::string & sData); void CDT2JSON(const CDT & oCDT, STLW::string & sData);
/** /**
@brief Escape string, if need @brief Escape string, if need
@param sSource - input data @param sSource - input data
@param bECMAConventions - use ECMA-262 conventions for escape sequences @param bECMAConventions - use ECMA-262 conventions for escape sequences
@return Escaped string @return Escaped string
*/ */
STLW::string EscapeJSONString(const STLW::string & sSource, STLW::string EscapeJSONString(const STLW::string & sSource,
const bool & bECMAConventions = true); const bool & bECMAConventions = true
,
const bool & bHTMLSafe = true);
/** /**
@fn STLW::string Base64Encode(const STLW::string & sData); @fn STLW::string Base64Encode(const STLW::string & sData);
@brief Encode value in BASE64 encoding @brief Encode value in BASE64 encoding
@param sData - value to encode @param sData - value to encode
@return Encoded value @return Encoded value
*/ */
STLW::string Base64Encode(const STLW::string & sData); STLW::string Base64Encode(const STLW::string & sData);
/** /**
 End of changes. 1 change blocks. 
1 lines changed or deleted 3 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/