diff
stringlengths 41
2.03M
| msg
stringlengths 1
1.5k
⌀ | repo
stringlengths 5
40
| sha
stringlengths 40
40
| time
stringlengths 20
20
|
|---|---|---|---|---|
mmm a / . travis . yml <nl> ppp b / . travis . yml <nl> script : <nl> # - opt_enable MAKRPANEL <nl> # - build_marlin <nl> # <nl> - # REPRAP_DISCOUNT_SMART_CONTROLLER , SDSUPPORT , and BABYSTEPPING <nl> + # REPRAP_DISCOUNT_SMART_CONTROLLER , SDSUPPORT , BABYSTEPPING , RIGIDBOARD_V2 , and DAC_MOTOR_CURRENT_DEFAULT <nl> # <nl> - restore_configs <nl> - - opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT BABYSTEPPING <nl> + - opt_set MOTHERBOARD BOARD_RIGIDBOARD_V2 <nl> + - opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT BABYSTEPPING DAC_MOTOR_CURRENT_DEFAULT <nl> - build_marlin <nl> # <nl> # G3D_PANEL with SDCARD_SORT_ALPHA and STATUS_MESSAGE_SCROLLING <nl> mmm a / Marlin / stepper_dac . cpp <nl> ppp b / Marlin / stepper_dac . cpp <nl> <nl> static float dac_perc ( int8_t n ) { return 100 . 0 * mcp4728_getValue ( dac_order [ n ] ) * ( 1 . 0 / ( DAC_STEPPER_MAX ) ) ; } <nl> static float dac_amps ( int8_t n ) { return mcp4728_getDrvPct ( dac_order [ n ] ) * ( DAC_STEPPER_MAX ) * 0 . 125 * ( 1 . 0 / ( DAC_STEPPER_SENSE ) ) ; } <nl> <nl> - int16_t dac_current_get_percent ( AxisEnum axis ) { return mcp4728_getDrvPct ( dac_order [ axis ] ) ; } <nl> - void dac_current_set_percents ( const int8_t pct [ XYZE ] ) { <nl> + uint8_t dac_current_get_percent ( AxisEnum axis ) { return mcp4728_getDrvPct ( dac_order [ axis ] ) ; } <nl> + void dac_current_set_percents ( const uint8_t pct [ XYZE ] ) { <nl> LOOP_XYZE ( i ) dac_channel_pct [ i ] = pct [ dac_order [ i ] ] ; <nl> mcp4728_setDrvPct ( dac_channel_pct ) ; <nl> } <nl> mmm a / Marlin / stepper_dac . h <nl> ppp b / Marlin / stepper_dac . h <nl> void dac_current_percent ( uint8_t channel , float val ) ; <nl> void dac_current_raw ( uint8_t channel , uint16_t val ) ; <nl> void dac_print_values ( ) ; <nl> void dac_commit_eeprom ( ) ; <nl> - int16_t dac_current_get_percent ( AxisEnum axis ) ; <nl> - void dac_current_set_percents ( int16_t pct [ XYZE ] ) ; <nl> + uint8_t dac_current_get_percent ( AxisEnum axis ) ; <nl> + void dac_current_set_percents ( const uint8_t pct [ XYZE ] ) ; <nl> <nl> # endif / / STEPPER_DAC_H <nl> mmm a / Marlin / ultralcd . cpp <nl> ppp b / Marlin / ultralcd . cpp <nl> uint16_t max_display_update_time = 0 ; <nl> <nl> # if ENABLED ( DAC_STEPPER_CURRENT ) <nl> # include " stepper_dac . h " / / was dac_mcp4728 . h MarlinMain uses stepper dac for the m - codes <nl> - int16_t driverPercent [ XYZE ] ; <nl> + uint8_t driverPercent [ XYZE ] ; <nl> # endif <nl> <nl> # if ENABLED ( ULTIPANEL ) <nl> uint16_t max_display_update_time = 0 ; <nl> typedef void _name # # _void <nl> <nl> DECLARE_MENU_EDIT_TYPE ( int , int3 ) ; <nl> + DECLARE_MENU_EDIT_TYPE ( uint8_t , int8 ) ; <nl> DECLARE_MENU_EDIT_TYPE ( float , float3 ) ; <nl> DECLARE_MENU_EDIT_TYPE ( float , float32 ) ; <nl> DECLARE_MENU_EDIT_TYPE ( float , float43 ) ; <nl> void kill_screen ( const char * lcd_msg ) { <nl> dac_driver_getValues ( ) ; <nl> START_MENU ( ) ; <nl> MENU_BACK ( MSG_CONTROL ) ; <nl> - MENU_ITEM_EDIT_CALLBACK ( int3 , MSG_X " " MSG_DAC_PERCENT , & driverPercent [ X_AXIS ] , 0 , 100 , dac_driver_commit ) ; <nl> - MENU_ITEM_EDIT_CALLBACK ( int3 , MSG_Y " " MSG_DAC_PERCENT , & driverPercent [ Y_AXIS ] , 0 , 100 , dac_driver_commit ) ; <nl> - MENU_ITEM_EDIT_CALLBACK ( int3 , MSG_Z " " MSG_DAC_PERCENT , & driverPercent [ Z_AXIS ] , 0 , 100 , dac_driver_commit ) ; <nl> - MENU_ITEM_EDIT_CALLBACK ( int3 , MSG_E " " MSG_DAC_PERCENT , & driverPercent [ E_AXIS ] , 0 , 100 , dac_driver_commit ) ; <nl> + MENU_ITEM_EDIT_CALLBACK ( int8 , MSG_X " " MSG_DAC_PERCENT , & driverPercent [ X_AXIS ] , 0 , 100 , dac_driver_commit ) ; <nl> + MENU_ITEM_EDIT_CALLBACK ( int8 , MSG_Y " " MSG_DAC_PERCENT , & driverPercent [ Y_AXIS ] , 0 , 100 , dac_driver_commit ) ; <nl> + MENU_ITEM_EDIT_CALLBACK ( int8 , MSG_Z " " MSG_DAC_PERCENT , & driverPercent [ Z_AXIS ] , 0 , 100 , dac_driver_commit ) ; <nl> + MENU_ITEM_EDIT_CALLBACK ( int8 , MSG_E " " MSG_DAC_PERCENT , & driverPercent [ E_AXIS ] , 0 , 100 , dac_driver_commit ) ; <nl> MENU_ITEM ( function , MSG_DAC_EEPROM_WRITE , dac_driver_eeprom_write ) ; <nl> END_MENU ( ) ; <nl> } <nl> void kill_screen ( const char * lcd_msg ) { <nl> typedef void _name <nl> <nl> DEFINE_MENU_EDIT_TYPE ( int , int3 , itostr3 , 1 ) ; <nl> + DEFINE_MENU_EDIT_TYPE ( uint8_t , int8 , i8tostr3 , 1 ) ; <nl> DEFINE_MENU_EDIT_TYPE ( float , float3 , ftostr3 , 1 . 0 ) ; <nl> DEFINE_MENU_EDIT_TYPE ( float , float32 , ftostr32 , 100 . 0 ) ; <nl> DEFINE_MENU_EDIT_TYPE ( float , float43 , ftostr43sign , 1000 . 0 ) ; <nl> mmm a / Marlin / ultralcd_impl_DOGM . h <nl> ppp b / Marlin / ultralcd_impl_DOGM . h <nl> static void lcd_implementation_status_screen ( ) { <nl> typedef void _name # # _void <nl> <nl> DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE ( int , int3 , itostr3 ) ; <nl> + DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE ( uint8_t , int8 , i8tostr3 ) ; <nl> DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE ( float , float3 , ftostr3 ) ; <nl> DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE ( float , float32 , ftostr32 ) ; <nl> DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE ( float , float43 , ftostr43sign ) ; <nl> mmm a / Marlin / ultralcd_impl_HD44780 . h <nl> ppp b / Marlin / ultralcd_impl_HD44780 . h <nl> static void lcd_implementation_status_screen ( ) { <nl> typedef void _name # # _void <nl> <nl> DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE ( int , int3 , itostr3 ) ; <nl> + DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE ( uint8_t , int8 , i8tostr3 ) ; <nl> DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE ( float , float3 , ftostr3 ) ; <nl> DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE ( float , float32 , ftostr32 ) ; <nl> DEFINE_LCD_IMPLEMENTATION_DRAWMENU_SETTING_EDIT_TYPE ( float , float43 , ftostr43sign ) ; <nl> mmm a / Marlin / utility . cpp <nl> ppp b / Marlin / utility . cpp <nl> void safe_delay ( millis_t ms ) { <nl> # define RJDIGIT ( n , f ) ( ( n ) > = ( f ) ? DIGIMOD ( n , f ) : ' ' ) <nl> # define MINUSOR ( n , alt ) ( n > = 0 ? ( alt ) : ( n = - n , ' - ' ) ) <nl> <nl> - / / Convert unsigned int to string with 12 format <nl> - char * itostr2 ( const uint8_t & xx ) { <nl> - conv [ 5 ] = DIGIMOD ( xx , 10 ) ; <nl> + / / Convert unsigned int to string 123 format <nl> + char * i8tostr3 ( const uint8_t xx ) { <nl> + conv [ 4 ] = RJDIGIT ( xx , 100 ) ; <nl> + conv [ 5 ] = RJDIGIT ( xx , 10 ) ; <nl> conv [ 6 ] = DIGIMOD ( xx , 1 ) ; <nl> - return & conv [ 5 ] ; <nl> + return & conv [ 4 ] ; <nl> } <nl> <nl> / / Convert signed int to rj string with 123 or - 12 format <nl> - char * itostr3 ( const int & x ) { <nl> + char * itostr3 ( const int x ) { <nl> int xx = x ; <nl> conv [ 4 ] = MINUSOR ( xx , RJDIGIT ( xx , 100 ) ) ; <nl> conv [ 5 ] = RJDIGIT ( xx , 10 ) ; <nl> void safe_delay ( millis_t ms ) { <nl> } <nl> <nl> / / Convert unsigned int to lj string with 123 format <nl> - char * itostr3left ( const int & xx ) { <nl> + char * itostr3left ( const int xx ) { <nl> char * str = & conv [ 6 ] ; <nl> * str = DIGIMOD ( xx , 1 ) ; <nl> if ( xx > = 10 ) { <nl> void safe_delay ( millis_t ms ) { <nl> } <nl> <nl> / / Convert signed int to rj string with 1234 , _123 , - 123 , _ - 12 , or __ - 1 format <nl> - char * itostr4sign ( const int & x ) { <nl> + char * itostr4sign ( const int x ) { <nl> const bool neg = x < 0 ; <nl> const int xx = neg ? - x : x ; <nl> if ( x > = 1000 ) { <nl> mmm a / Marlin / utility . h <nl> ppp b / Marlin / utility . h <nl> void safe_delay ( millis_t ms ) ; <nl> <nl> # if ENABLED ( ULTRA_LCD ) <nl> <nl> - / / Convert unsigned int to string with 12 format <nl> - char * itostr2 ( const uint8_t & x ) ; <nl> + / / Convert uint8_t to string with 123 format <nl> + char * i8tostr3 ( const uint8_t x ) ; <nl> <nl> / / Convert signed int to rj string with 123 or - 12 format <nl> - char * itostr3 ( const int & x ) ; <nl> + char * itostr3 ( const int x ) ; <nl> <nl> / / Convert unsigned int to lj string with 123 format <nl> - char * itostr3left ( const int & xx ) ; <nl> + char * itostr3left ( const int xx ) ; <nl> <nl> / / Convert signed int to rj string with _123 , - 123 , _ - 12 , or __ - 1 format <nl> - char * itostr4sign ( const int & x ) ; <nl> + char * itostr4sign ( const int x ) ; <nl> <nl> / / Convert unsigned float to string with 1 . 23 format <nl> char * ftostr12ns ( const float & x ) ; <nl> | convert DAC percent to uint8_t | MarlinFirmware/Marlin | a1c65fd3d538e930a1c0bee82e33c35cf6e5a924 | 2017-06-19T22:46:41Z |
mmm a / CMake / CMakeLibs . cmake <nl> ppp b / CMake / CMakeLibs . cmake <nl> macro ( LOG_PLATFORM NAME ) <nl> set ( LINK " http : / / osquery . readthedocs . io / en / stable / development / building / " ) <nl> LOG ( " Welcome to osquery ' s build - - thank you for your patience ! : ) " ) <nl> LOG ( " For a brief tutorial see : $ { ESC } [ 1m $ { LINK } $ { ESC } [ m " ) <nl> - LOG ( " If at first you dont succeed , perhaps : make distclean ; make depsclean " ) <nl> + if ( NOT WINDOWS ) <nl> + LOG ( " If at first you dont succeed , perhaps : make distclean ; make depsclean " ) <nl> + endif ( ) <nl> LOG ( " Building for platform $ { ESC } [ 36 ; 1m $ { NAME } ( $ { OSQUERY_BUILD_PLATFORM } , $ { OSQUERY_BUILD_DISTRO } ) $ { ESC } [ m " ) <nl> LOG ( " Building osquery version $ { ESC } [ 36 ; 1m $ { OSQUERY_BUILD_VERSION } sdk $ { OSQUERY_BUILD_SDK_VERSION } $ { ESC } [ m " ) <nl> endmacro ( LOG_PLATFORM ) <nl> | Removing " make distclean \ ; make depsclean " message on Windows ( ) | osquery/osquery | e701d5a3f48668ca243813a018bb1007ffc679fc | 2017-02-07T20:43:00Z |
mmm a / src / debug / debug - scope - iterator . cc <nl> ppp b / src / debug / debug - scope - iterator . cc <nl> bool DebugWasmScopeIterator : : Done ( ) { <nl> <nl> void DebugWasmScopeIterator : : Advance ( ) { <nl> DCHECK ( ! Done ( ) ) ; <nl> - if ( type_ = = debug : : ScopeIterator : : ScopeTypeGlobal ) { <nl> + / / Local scope information is only available for interpreted frames currently . <nl> + if ( type_ = = debug : : ScopeIterator : : ScopeTypeGlobal & & <nl> + frame_ - > is_wasm_interpreter_entry ( ) ) { <nl> type_ = debug : : ScopeIterator : : ScopeTypeLocal ; <nl> } else { <nl> / / We use ScopeTypeWith type as marker for done . <nl> v8 : : debug : : ScopeIterator : : ScopeType DebugWasmScopeIterator : : GetType ( ) { <nl> <nl> v8 : : Local < v8 : : Object > DebugWasmScopeIterator : : GetObject ( ) { <nl> DCHECK ( ! Done ( ) ) ; <nl> - Handle < WasmDebugInfo > debug_info ( <nl> - WasmInterpreterEntryFrame : : cast ( frame_ ) - > debug_info ( ) , isolate_ ) ; <nl> switch ( type_ ) { <nl> case debug : : ScopeIterator : : ScopeTypeGlobal : { <nl> - Handle < WasmInstanceObject > instance ( debug_info - > wasm_instance ( ) , <nl> - isolate_ ) ; <nl> + Handle < WasmInstanceObject > instance = <nl> + FrameSummary : : GetTop ( frame_ ) . AsWasm ( ) . wasm_instance ( ) ; <nl> return Utils : : ToLocal ( wasm : : GetGlobalScopeObject ( instance ) ) ; <nl> } <nl> - case debug : : ScopeIterator : : ScopeTypeLocal : <nl> + case debug : : ScopeIterator : : ScopeTypeLocal : { <nl> + Handle < WasmDebugInfo > debug_info ( <nl> + WasmInterpreterEntryFrame : : cast ( frame_ ) - > debug_info ( ) , isolate_ ) ; <nl> return Utils : : ToLocal ( WasmDebugInfo : : GetLocalScopeObject ( <nl> debug_info , frame_ - > fp ( ) , inlined_frame_index_ ) ) ; <nl> + } <nl> default : <nl> return v8 : : Local < v8 : : Object > ( ) ; <nl> } <nl> mmm a / src / debug / debug - stack - trace - iterator . cc <nl> ppp b / src / debug / debug - stack - trace - iterator . cc <nl> std : : unique_ptr < v8 : : debug : : ScopeIterator > <nl> DebugStackTraceIterator : : GetScopeIterator ( ) const { <nl> DCHECK ( ! Done ( ) ) ; <nl> StandardFrame * frame = iterator_ . frame ( ) ; <nl> - if ( frame - > is_wasm_interpreter_entry ( ) ) { <nl> - return std : : unique_ptr < v8 : : debug : : ScopeIterator > ( new DebugWasmScopeIterator ( <nl> - isolate_ , iterator_ . frame ( ) , inlined_frame_index_ ) ) ; <nl> + if ( frame - > is_wasm ( ) ) { <nl> + return std : : make_unique < DebugWasmScopeIterator > ( isolate_ , iterator_ . frame ( ) , <nl> + inlined_frame_index_ ) ; <nl> } <nl> - return std : : unique_ptr < v8 : : debug : : ScopeIterator > ( <nl> - new DebugScopeIterator ( isolate_ , frame_inspector_ . get ( ) ) ) ; <nl> + return std : : make_unique < DebugScopeIterator > ( isolate_ , frame_inspector_ . get ( ) ) ; <nl> } <nl> <nl> bool DebugStackTraceIterator : : Restart ( ) { <nl> mmm a / src / execution / frames . cc <nl> ppp b / src / execution / frames . cc <nl> int WasmCompiledFrame : : position ( ) const { <nl> return FrameSummary : : GetSingle ( this ) . SourcePosition ( ) ; <nl> } <nl> <nl> + Object WasmCompiledFrame : : context ( ) const { <nl> + return wasm_instance ( ) . native_context ( ) ; <nl> + } <nl> + <nl> void WasmCompiledFrame : : Summarize ( std : : vector < FrameSummary > * functions ) const { <nl> DCHECK ( functions - > empty ( ) ) ; <nl> / / The { WasmCode * } escapes this scope via the { FrameSummary } , which is fine , <nl> mmm a / src / execution / frames . h <nl> ppp b / src / execution / frames . h <nl> class WasmCompiledFrame : public StandardFrame { <nl> uint32_t function_index ( ) const ; <nl> Script script ( ) const override ; <nl> int position ( ) const override ; <nl> + Object context ( ) const override ; <nl> bool at_to_number_conversion ( ) const ; <nl> <nl> void Summarize ( std : : vector < FrameSummary > * frames ) const override ; <nl> mmm a / test / inspector / debugger / wasm - scope - info - expected . txt <nl> ppp b / test / inspector / debugger / wasm - scope - info - expected . txt <nl> at func ( 2 : 2 ) : <nl> locals : " i32Arg " : 4 ( number ) , " local # 1 " : 0 ( number ) , " i64_local " : 0 ( number ) , " unicode ☼ f64 " : 0 ( number ) <nl> stack : <nl> at call_func ( 5 : 2 ) : <nl> + - scope ( global ) : <nl> + globals : " global # 0 " : 0 ( number ) <nl> at ( anonymous ) ( 0 : 17 ) : <nl> - scope ( global ) : <nl> - - skipped globals <nl> at func ( 3 : 2 ) : <nl> locals : " i32Arg " : 4 ( number ) , " local # 1 " : 0 ( number ) , " i64_local " : 0 ( number ) , " unicode ☼ f64 " : 0 ( number ) <nl> stack : " 0 " : 11 ( number ) <nl> at call_func ( 5 : 2 ) : <nl> + - scope ( global ) : <nl> + globals : " global # 0 " : 0 ( number ) <nl> at ( anonymous ) ( 0 : 17 ) : <nl> - scope ( global ) : <nl> - - skipped globals <nl> at func ( 4 : 2 ) : <nl> locals : " i32Arg " : 11 ( number ) , " local # 1 " : 0 ( number ) , " i64_local " : 0 ( number ) , " unicode ☼ f64 " : 0 ( number ) <nl> stack : <nl> at call_func ( 5 : 2 ) : <nl> + - scope ( global ) : <nl> + globals : " global # 0 " : 0 ( number ) <nl> at ( anonymous ) ( 0 : 17 ) : <nl> - scope ( global ) : <nl> - - skipped globals <nl> at func ( 5 : 2 ) : <nl> locals : " i32Arg " : 11 ( number ) , " local # 1 " : 0 ( number ) , " i64_local " : 0 ( number ) , " unicode ☼ f64 " : 0 ( number ) <nl> stack : " 0 " : 47 ( number ) <nl> at call_func ( 5 : 2 ) : <nl> + - scope ( global ) : <nl> + globals : " global # 0 " : 0 ( number ) <nl> at ( anonymous ) ( 0 : 17 ) : <nl> - scope ( global ) : <nl> - - skipped globals <nl> at func ( 6 : 2 ) : <nl> locals : " i32Arg " : 11 ( number ) , " local # 1 " : 47 ( number ) , " i64_local " : 0 ( number ) , " unicode ☼ f64 " : 0 ( number ) <nl> stack : <nl> at call_func ( 5 : 2 ) : <nl> + - scope ( global ) : <nl> + globals : " global # 0 " : 0 ( number ) <nl> at ( anonymous ) ( 0 : 17 ) : <nl> - scope ( global ) : <nl> - - skipped globals <nl> at func ( 7 : 2 ) : <nl> locals : " i32Arg " : 11 ( number ) , " local # 1 " : 47 ( number ) , " i64_local " : 0 ( number ) , " unicode ☼ f64 " : 0 ( number ) <nl> stack : " 0 " : 9223372036854775807 ( string ) <nl> at call_func ( 5 : 2 ) : <nl> + - scope ( global ) : <nl> + globals : " global # 0 " : 0 ( number ) <nl> at ( anonymous ) ( 0 : 17 ) : <nl> - scope ( global ) : <nl> - - skipped globals <nl> at func ( 8 : 2 ) : <nl> locals : " i32Arg " : 11 ( number ) , " local # 1 " : 47 ( number ) , " i64_local " : 9223372036854775807 ( string ) , " unicode ☼ f64 " : 0 ( number ) <nl> stack : <nl> at call_func ( 5 : 2 ) : <nl> + - scope ( global ) : <nl> + globals : " global # 0 " : 0 ( number ) <nl> at ( anonymous ) ( 0 : 17 ) : <nl> - scope ( global ) : <nl> - - skipped globals <nl> at func ( 9 : 2 ) : <nl> locals : " i32Arg " : 11 ( number ) , " local # 1 " : 47 ( number ) , " i64_local " : 9223372036854775807 ( string ) , " unicode ☼ f64 " : 0 ( number ) <nl> stack : " 0 " : - 9223372036854775808 ( string ) <nl> at call_func ( 5 : 2 ) : <nl> + - scope ( global ) : <nl> + globals : " global # 0 " : 0 ( number ) <nl> at ( anonymous ) ( 0 : 17 ) : <nl> - scope ( global ) : <nl> - - skipped globals <nl> at func ( 10 : 2 ) : <nl> locals : " i32Arg " : 11 ( number ) , " local # 1 " : 47 ( number ) , " i64_local " : - 9223372036854775808 ( string ) , " unicode ☼ f64 " : 0 ( number ) <nl> stack : <nl> at call_func ( 5 : 2 ) : <nl> + - scope ( global ) : <nl> + globals : " global # 0 " : 0 ( number ) <nl> at ( anonymous ) ( 0 : 17 ) : <nl> - scope ( global ) : <nl> - - skipped globals <nl> at func ( 11 : 2 ) : <nl> locals : " i32Arg " : 11 ( number ) , " local # 1 " : 47 ( number ) , " i64_local " : - 9223372036854775808 ( string ) , " unicode ☼ f64 " : 0 ( number ) <nl> stack : " 0 " : 1 ( number ) <nl> at call_func ( 5 : 2 ) : <nl> + - scope ( global ) : <nl> + globals : " global # 0 " : 0 ( number ) <nl> at ( anonymous ) ( 0 : 17 ) : <nl> - scope ( global ) : <nl> - - skipped globals <nl> at func ( 12 : 2 ) : <nl> locals : " i32Arg " : 11 ( number ) , " local # 1 " : 47 ( number ) , " i64_local " : - 9223372036854775808 ( string ) , " unicode ☼ f64 " : 0 ( number ) <nl> stack : " 0 " : 1 ( number ) <nl> at call_func ( 5 : 2 ) : <nl> + - scope ( global ) : <nl> + globals : " global # 0 " : 0 ( number ) <nl> at ( anonymous ) ( 0 : 17 ) : <nl> - scope ( global ) : <nl> - - skipped globals <nl> at func ( 13 : 2 ) : <nl> locals : " i32Arg " : 11 ( number ) , " local # 1 " : 47 ( number ) , " i64_local " : - 9223372036854775808 ( string ) , " unicode ☼ f64 " : 0 ( number ) <nl> stack : " 0 " : 1 ( number ) , " 1 " : 7 ( number ) <nl> at call_func ( 5 : 2 ) : <nl> + - scope ( global ) : <nl> + globals : " global # 0 " : 0 ( number ) <nl> at ( anonymous ) ( 0 : 17 ) : <nl> - scope ( global ) : <nl> - - skipped globals <nl> at func ( 14 : 2 ) : <nl> locals : " i32Arg " : 11 ( number ) , " local # 1 " : 47 ( number ) , " i64_local " : - 9223372036854775808 ( string ) , " unicode ☼ f64 " : 0 ( number ) <nl> stack : " 0 " : 1 ( number ) , " 1 " : 7 ( number ) <nl> at call_func ( 5 : 2 ) : <nl> + - scope ( global ) : <nl> + globals : " global # 0 " : 0 ( number ) <nl> at ( anonymous ) ( 0 : 17 ) : <nl> - scope ( global ) : <nl> - - skipped globals <nl> at func ( 15 : 2 ) : <nl> locals : " i32Arg " : 11 ( number ) , " local # 1 " : 47 ( number ) , " i64_local " : - 9223372036854775808 ( string ) , " unicode ☼ f64 " : 0 ( number ) <nl> stack : " 0 " : 0 . 14285714285714285 ( number ) <nl> at call_func ( 5 : 2 ) : <nl> + - scope ( global ) : <nl> + globals : " global # 0 " : 0 ( number ) <nl> at ( anonymous ) ( 0 : 17 ) : <nl> - scope ( global ) : <nl> - - skipped globals <nl> at func ( 16 : 2 ) : <nl> locals : " i32Arg " : 11 ( number ) , " local # 1 " : 47 ( number ) , " i64_local " : - 9223372036854775808 ( string ) , " unicode ☼ f64 " : 0 . 14285714285714285 ( number ) <nl> stack : <nl> at call_func ( 5 : 2 ) : <nl> + - scope ( global ) : <nl> + globals : " global # 0 " : 0 ( number ) <nl> at ( anonymous ) ( 0 : 17 ) : <nl> - scope ( global ) : <nl> - - skipped globals <nl> at func ( 17 : 2 ) : <nl> locals : " i32Arg " : 11 ( number ) , " local # 1 " : 47 ( number ) , " i64_local " : - 9223372036854775808 ( string ) , " unicode ☼ f64 " : 0 . 14285714285714285 ( number ) <nl> stack : " 0 " : 15 ( number ) <nl> at call_func ( 5 : 2 ) : <nl> + - scope ( global ) : <nl> + globals : " global # 0 " : 0 ( number ) <nl> at ( anonymous ) ( 0 : 17 ) : <nl> - scope ( global ) : <nl> - - skipped globals <nl> at func ( 18 : 0 ) : <nl> locals : " i32Arg " : 11 ( number ) , " local # 1 " : 47 ( number ) , " i64_local " : - 9223372036854775808 ( string ) , " unicode ☼ f64 " : 0 . 14285714285714285 ( number ) <nl> stack : <nl> at call_func ( 5 : 2 ) : <nl> + - scope ( global ) : <nl> + globals : " global # 0 " : 15 ( number ) <nl> at ( anonymous ) ( 0 : 17 ) : <nl> - scope ( global ) : <nl> - - skipped globals <nl> | Reland " [ wasm ] [ debug ] Report global scope also for compiled frames " | v8/v8 | c573bdebb545aa1df8538da9cd412c8ae4f6d7f3 | 2019-10-25T08:56:57Z |
mmm a / NOTES . md <nl> ppp b / NOTES . md <nl> <nl> - # Release 1 . 13 . 0 ( My name is nobody ) <nl> + # Release 1 . 13 . 0 ( My Name is Nobody ) <nl> <nl> Released on 2014 - 06 - 13 <nl> <nl> - The highlights for this release are changes , support for JSON and the <nl> - World Wide Web . <nl> + The highlights of this release are the ` r . http ` command for external <nl> + data access , change feed support via the new ` changes ` command , and <nl> + full support for Node . js promises in the JavaScript driver . <nl> <nl> http : / / rethinkdb . com / blog / 1 . 13 - release / <nl> <nl> http : / / rethinkdb . com / docs / migration / <nl> <nl> There are also some backwards incompatible changes in the JavaScript driver . <nl> <nl> - * The ` hasNext ` method for cursors has been removed . <nl> + * The ` hasNext ` command for cursors has been removed . <nl> <nl> # # New features # # <nl> <nl> There are also some backwards incompatible changes in the JavaScript driver . <nl> * ` nth ` can now return a selection , just like ` get ` ( # 348 ) <nl> * Improved the ` master not available ` error message ( # 1811 ) <nl> * Switched to the JSON protocol in the Ruby , JavaScript and Python drivers ( # 2224 , # 2390 ) <nl> - * Added the ` changes ` method for creating live change feeds ( # 997 ) <nl> - * Added ` r . args ` to allow specifying a dynamic number of arguments to methods such as ` getAll ` ( # 1854 ) <nl> + * Added the ` changes ` command for creating live change feeds ( # 997 ) <nl> + * Added ` r . args ` to allow specifying a dynamic number of arguments to commands such as ` getAll ` ( # 1854 ) <nl> * Added ` r . http ` for retrieving data from the web ( # 1383 ) <nl> * Server <nl> * Added a JSON protocol as an alternative to the protobuf protocol ( # 1868 ) <nl> There are also some backwards incompatible changes in the JavaScript driver . <nl> * Improved the error message when running out of disk space ( # 1945 ) <nl> * JavaScript driver <nl> * Added support for promises ( using bluebird ) ( # 1395 ) <nl> - * Removed the ` hasNext ` method ( # 2497 ) <nl> + * Removed the ` hasNext ` command ( # 2497 ) <nl> * Added the ` on ` , ` once ` , ` removeListener ` and ` removeAllListeners ` methods to feeds ( # 2223 ) <nl> * ` r . connect ` now supports being called with a single argument ( # 2273 ) <nl> * Tests <nl> There are also some backwards incompatible changes in the JavaScript driver . <nl> <nl> * Server <nl> * Allocate smaller pages in the cache ( # 2130 ) <nl> - * Fast local delivery of mailbox messages / Send up - to - date reads to the local replica / Prefer sending queries to the primary / ? ? ? ( # 2083 ) <nl> + * Reduce overhead by handling requests locally on the primary if possible ( # 2083 ) <nl> * Adjusted the value of ` chunk_processing_semaphore ` ( # 2392 ) <nl> * Improved backfilling on rotational drives ( # 2393 ) <nl> * No longer copy the metadata when evaluating ` r . db ` ( # 1907 ) <nl> * No longer update the stat block when updating secondary indexes ( # 2431 ) <nl> * Better combine block writes in the cache ( # 2127 ) <nl> - * More effective garbage collection and tweaked ` GC_HIGH_RATIO ` ( # 2457 ) <nl> + * Concurrent garbage collection to improve disk space efficiency ( # 2457 ) <nl> * Testing <nl> * Added automated performance regression tests ( # 1963 ) <nl> <nl> There are also some backwards incompatible changes in the JavaScript driver . <nl> * Now returns an error message with all HTTP 500 errors ( # 511 ) <nl> * Got rid of vestigial memcache support ( # 803 ) <nl> * Made ` order_by ` and other sortings be stable ( # 2155 ) <nl> - * Rip out and repair horrendous aspects of the blob_t code ( # 2227 ) <nl> + * Cleaned up blob_t code to make it more reliable ( # 2227 ) <nl> * Fixed a bug that caused crashes when dropping secondary indexes under load ( # 2251 ) <nl> * Fixed a bug in the JSON parsing code that caused a crash ( # 2489 ) <nl> * Fixed a bug that could cause segfaults ( # 2491 ) <nl> | Second draft for the release notes | rethinkdb/rethinkdb | 6325c157e92f8c537fb0748cfce740d84f828705 | 2014-06-14T01:11:22Z |
mmm a / hphp / hack / src / parser / full_fidelity_declaration_parser . ml <nl> ppp b / hphp / hack / src / parser / full_fidelity_declaration_parser . ml <nl> module WithExpressionAndStatementAndTypeParser <nl> TODO : reasonably have an attribute . * ) <nl> let ( parser , modifiers ) = parse_modifiers parser in <nl> if is_missing attribute_spec then <nl> - match peek_token_kind parser with <nl> - | Async <nl> - | Coroutine <nl> - | Function - > parse_methodish parser attribute_spec modifiers <nl> - | _ - > parse_property_declaration parser modifiers <nl> + ( * ERROR RECOVERY : match against two tokens , because if one token is <nl> + * in error but the next isn ' t , then it ' s likely that the user is <nl> + * simply still typing . Throw an error on what ' s being typed , then eat <nl> + * it and keep going . * ) <nl> + let current_token_kind = peek_token_kind parser in <nl> + let next_token = peek_token ~ lookahead : 1 parser in <nl> + let next_token_kind = Token . kind next_token in <nl> + match current_token_kind , next_token_kind with <nl> + ( * Detected the usual start to a method , so continue parsing as method . * ) <nl> + | ( Async | Coroutine | Function ) , _ - > <nl> + parse_methodish parser attribute_spec modifiers <nl> + | LeftParen , _ - > <nl> + parse_property_declaration parser modifiers <nl> + ( * We encountered one unexpected token , but the next still indicates that <nl> + * we should be parsing a methodish . Throw an error , eat the token , <nl> + * and keep parsing a methodish . * ) <nl> + | _ , ( Async | Coroutine | Function ) <nl> + when not ( Token . has_leading_end_of_line next_token ) - > <nl> + let parser = with_error parser SyntaxError . error1056 in <nl> + let parser = skip_token parser in <nl> + parse_methodish parser attribute_spec modifiers <nl> + ( * Otherwise , continue parsing as a property ( which might be a lambda ) . * ) <nl> + | ( _ , _ ) - > parse_property_declaration parser modifiers <nl> else <nl> parse_methodish parser attribute_spec modifiers <nl> <nl> mmm a / hphp / hack / src / parser / full_fidelity_minimal_token . ml <nl> ppp b / hphp / hack / src / parser / full_fidelity_minimal_token . ml <nl> <nl> <nl> module TokenKind = Full_fidelity_token_kind <nl> module MinimalTrivia = Full_fidelity_minimal_trivia <nl> + module TriviaKind = Full_fidelity_trivia_kind <nl> <nl> type t = { <nl> kind : TokenKind . t ; <nl> let leading token = <nl> let trailing token = <nl> token . trailing <nl> <nl> + let has_leading_end_of_line token = <nl> + Core . List . exists token . leading <nl> + ~ f : ( fun trivia - > MinimalTrivia . kind trivia = TriviaKind . EndOfLine ) <nl> + <nl> let to_json token = <nl> let open Hh_json in <nl> JSON_Object [ <nl> mmm a / hphp / hack / src / parser / full_fidelity_syntax_error . ml <nl> ppp b / hphp / hack / src / parser / full_fidelity_syntax_error . ml <nl> let error1053 = " An XHP name or category name is expected here . " <nl> let error1054 = " A comma is expected here . " <nl> let error1055 = " A fallthrough directive can only appear at the end of " ^ <nl> " a switch section . " <nl> + ( * TODO ( 20052790 ) : use the specific token ' s text in the message body . * ) <nl> + let error1056 = " This token is not valid as part of a function declaration . " <nl> <nl> let error2001 = " A type annotation is required in strict mode . " <nl> let error2002 = " An XHP attribute name may not contain ' - ' or ' : ' . " <nl> new file mode 100644 <nl> index 00000000000 . . e3689a79170 <nl> mmm / dev / null <nl> ppp b / hphp / hack / test / full_fidelity / cases / context / test_method_decl_extra_token . exp <nl> <nl> + ( 6 , 10 ) - ( 6 , 10 ) This token is not valid as part of a function declaration . <nl> + ( 10 , 17 ) - ( 10 , 17 ) This token is not valid as part of a function declaration . <nl> + ( 14 , 26 ) - ( 14 , 26 ) A variable name is expected here . <nl> + ( 18 , 27 ) - ( 18 , 27 ) A variable name is expected here . <nl> + ( 18 , 44 ) - ( 18 , 44 ) A class member , method , type , trait usage , trait require , xhp attribute , xhp use , or xhp category is expected here . <nl> + ( 25 , 47 ) - ( 26 , 1 ) A variable name is expected here . <nl> + ( 34 , 47 ) - ( 35 , 1 ) A variable name is expected here . <nl> new file mode 100644 <nl> index 00000000000 . . aeb430dc0a9 <nl> mmm / dev / null <nl> ppp b / hphp / hack / test / full_fidelity / cases / context / test_method_decl_extra_token . php <nl> <nl> + < ? hh <nl> + <nl> + class C { <nl> + <nl> + / / parsed as a method containing an extra , invalid word : error1056 <nl> + public sta function f ( ) { <nl> + } <nl> + <nl> + / / parsed as a method containing an extra , invalid word : error1056 <nl> + public static meaninglessword function f ( ) { <nl> + } <nl> + <nl> + / / the below case isn ' t fixed yet ; it retains its old behavior . <nl> + public meaninglessword static function f ( ) { <nl> + } <nl> + <nl> + / / the below case isn ' t fixed yet ; it retains its old behavior . <nl> + public meaninglessword1 meaninglessword2 function f ( ) { <nl> + } <nl> + <nl> + } <nl> + <nl> + class C { <nl> + <nl> + public sta / / parsed as property declaration <nl> + <nl> + function f ( ) { / / parsed as method <nl> + } <nl> + <nl> + } <nl> + <nl> + class C { <nl> + <nl> + public sta / / parsed as property declaration <nl> + <nl> + public function f ( ) { / / parsed as method <nl> + } <nl> + <nl> + } <nl> mmm a / hphp / hack / test / full_fidelity / full_fidelity_unit_test . ml <nl> ppp b / hphp / hack / test / full_fidelity / full_fidelity_unit_test . ml <nl> let error_tests = <nl> " context / test_missing_name_in_expression " ; <nl> " context / test_nested_function_lite " ; <nl> " context / test_nested_function " ; <nl> + " context / test_method_decl_extra_token " ; <nl> ] ~ f : mapper <nl> <nl> let test_data = minimal_tests @ error_tests @ <nl> | Improving error recovery on extra tokens in function declarations | facebook/hhvm | 9b0fad9395896a99f2372360945aeb2b4c17e204 | 2017-07-19T22:20:12Z |
mmm a / src / main . cpp <nl> ppp b / src / main . cpp <nl> static bool IsSuperMajority ( int minVersion , const CBlockIndex * pstart , unsigned <nl> <nl> bool ProcessNewBlock ( CValidationState & state , const CChainParams & chainparams , const CNode * pfrom , const CBlock * pblock , bool fForceProcessing , CDiskBlockPos * dbp ) <nl> { <nl> - / / Preliminary checks <nl> - bool checked = CheckBlock ( * pblock , state ) ; <nl> - <nl> { <nl> LOCK ( cs_main ) ; <nl> bool fRequested = MarkBlockAsReceived ( pblock - > GetHash ( ) ) ; <nl> fRequested | = fForceProcessing ; <nl> - if ( ! checked ) { <nl> - return error ( " % s : CheckBlock FAILED % s " , __func__ , FormatStateMessage ( state ) ) ; <nl> - } <nl> <nl> / / Store to disk <nl> CBlockIndex * pindex = NULL ; <nl> | Merge : Eliminate unnecessary call to CheckBlock | bitcoin/bitcoin | eb331794a22b86da0a76d6710cb3eb37903a486e | 2016-02-03T12:23:49Z |
similarity index 100 % <nl> rename from modules / drivers / audio / dag / speaker . dag <nl> rename to modules / drivers / audio / dag / microphone . dag <nl> similarity index 100 % <nl> rename from modules / drivers / audio / launch / speaker . launch <nl> rename to modules / drivers / audio / launch / microphone . launch <nl> | microphone : change name for dag and launch | ApolloAuto/apollo | 119b9bf602b459cfe9990cfe7648307524ef2cb1 | 2020-07-30T18:26:43Z |
mmm a / python / mxnet / contrib / onnx / mx2onnx / _op_translations . py <nl> ppp b / python / mxnet / contrib / onnx / mx2onnx / _op_translations . py <nl> def convert_fully_connected ( node , * * kwargs ) : <nl> <nl> fcnode = [ ] <nl> <nl> + op_name = " flatten_ " + str ( kwargs [ " idx " ] ) <nl> + flatten_node = onnx . helper . make_node ( <nl> + ' Flatten ' , <nl> + inputs = [ input_nodes [ 0 ] ] , <nl> + outputs = [ op_name ] , <nl> + name = op_name <nl> + ) <nl> + <nl> + input_nodes [ 0 ] = op_name <nl> + fcnode . append ( flatten_node ) <nl> + <nl> if no_bias : <nl> data_type = onnx . mapping . NP_TYPE_TO_TENSOR_TYPE [ np . dtype ( ' int64 ' ) ] <nl> bias_name = " bias " + str ( kwargs [ " idx " ] ) <nl> mmm a / tests / python - pytest / onnx / export / mxnet_export_test . py <nl> ppp b / tests / python - pytest / onnx / export / mxnet_export_test . py <nl> def get_test_files ( name ) : <nl> <nl> <nl> def forward_pass ( sym , arg , aux , data_names , input_data ) : <nl> - " " " Perform forward pass on given data " " " <nl> + " " " Perform forward pass on given data <nl> + : param sym : Symbol <nl> + : param arg : Arg params <nl> + : param aux : Aux params <nl> + : param data_names : Input names ( list ) <nl> + : param input_data : Input data ( list ) . If there is only one input , <nl> + pass it as a list . For example , if input is [ 1 , 2 ] , <nl> + pass input_data = [ [ 1 , 2 ] ] <nl> + : return : result of forward pass <nl> + " " " <nl> # create module <nl> mod = mx . mod . Module ( symbol = sym , data_names = data_names , context = mx . cpu ( ) , label_names = None ) <nl> - mod . bind ( for_training = False , data_shapes = [ ( data_names [ 0 ] , input_data . shape ) ] , label_shapes = None ) <nl> + <nl> + data_shapes = [ ] <nl> + data_forward = [ ] <nl> + for idx in range ( len ( data_names ) ) : <nl> + val = input_data [ idx ] <nl> + data_shapes . append ( ( data_names [ idx ] , np . shape ( val ) ) ) <nl> + data_forward . append ( mx . nd . array ( val ) ) <nl> + <nl> + mod . bind ( for_training = False , data_shapes = data_shapes , label_shapes = None ) <nl> mod . set_params ( arg_params = arg , aux_params = aux , <nl> allow_missing = True , allow_extra = True ) <nl> + <nl> # run inference <nl> batch = namedtuple ( ' Batch ' , [ ' data ' ] ) <nl> - mod . forward ( batch ( [ mx . nd . array ( input_data ) ] ) , is_train = False ) <nl> + mod . forward ( batch ( data_forward ) , is_train = False ) <nl> <nl> return mod . get_outputs ( ) [ 0 ] . asnumpy ( ) <nl> <nl> def test_models ( model_name , input_shape , output_shape ) : <nl> logging . info ( " Running inference on onnx re - import model in mxnet " ) <nl> # run test for each test file <nl> for input_data , output_data in zip ( inputs , outputs ) : <nl> - result = forward_pass ( sym , arg_params , aux_params , data_names , input_data ) <nl> + result = forward_pass ( sym , arg_params , aux_params , data_names , [ input_data ] ) <nl> <nl> # verify the results <nl> npt . assert_equal ( result . shape , output_data . shape ) <nl> def test_model_accuracy ( model_name , input_shape ) : <nl> <nl> expected_result = [ ] <nl> for input_data , output_data in zip ( inputs , outputs ) : <nl> - result = forward_pass ( sym , arg_params , aux_params , data_names , input_data ) <nl> + result = forward_pass ( sym , arg_params , aux_params , data_names , [ input_data ] ) <nl> expected_result . append ( result ) <nl> <nl> params = { } <nl> def test_model_accuracy ( model_name , input_shape ) : <nl> <nl> actual_result = [ ] <nl> for input_data , output_data in zip ( inputs , outputs ) : <nl> - result = forward_pass ( sym , arg_params , aux_params , data_names , input_data ) <nl> + result = forward_pass ( sym , arg_params , aux_params , data_names , [ input_data ] ) <nl> actual_result . append ( result ) <nl> <nl> # verify the results <nl> def test_square ( ) : <nl> converted_model = onnx_mxnet . export_model ( square , params , [ np . shape ( input1 ) ] , np . float32 , " square . onnx " ) <nl> <nl> sym , arg_params , aux_params = onnx_mxnet . import_model ( converted_model ) <nl> - result = forward_pass ( sym , arg_params , aux_params , [ ' input1 ' ] , input1 ) <nl> + result = forward_pass ( sym , arg_params , aux_params , [ ' input1 ' ] , [ input1 ] ) <nl> <nl> numpy_op = np . square ( input1 ) <nl> <nl> npt . assert_almost_equal ( result , numpy_op ) <nl> <nl> <nl> + @ with_seed ( ) <nl> + def test_fully_connected ( ) : <nl> + def random_arrays ( * shapes ) : <nl> + " " " Generate some random numpy arrays . " " " <nl> + arrays = [ np . random . randn ( * s ) . astype ( " float32 " ) <nl> + for s in shapes ] <nl> + if len ( arrays ) = = 1 : <nl> + return arrays [ 0 ] <nl> + return arrays <nl> + <nl> + data_names = [ ' x ' , ' w ' , ' b ' ] <nl> + <nl> + dim_in , dim_out = ( 3 , 4 ) <nl> + input_data = random_arrays ( ( 4 , dim_in ) , ( dim_out , dim_in ) , ( dim_out , ) ) <nl> + <nl> + ipsym = [ ] <nl> + data_shapes = [ ] <nl> + data_forward = [ ] <nl> + for idx in range ( len ( data_names ) ) : <nl> + val = input_data [ idx ] <nl> + data_shapes . append ( ( data_names [ idx ] , np . shape ( val ) ) ) <nl> + data_forward . append ( mx . nd . array ( val ) ) <nl> + ipsym . append ( mx . sym . Variable ( data_names [ idx ] ) ) <nl> + <nl> + op = mx . sym . FullyConnected ( data = ipsym [ 0 ] , weight = ipsym [ 1 ] , bias = ipsym [ 2 ] , num_hidden = dim_out , name = ' FC ' ) <nl> + <nl> + model = mx . mod . Module ( op , data_names = data_names , label_names = None ) <nl> + model . bind ( for_training = False , data_shapes = data_shapes , label_shapes = None ) <nl> + <nl> + model . init_params ( ) <nl> + <nl> + args , auxs = model . get_params ( ) <nl> + params = { } <nl> + params . update ( args ) <nl> + params . update ( auxs ) <nl> + <nl> + converted_model = onnx_mxnet . export_model ( op , params , [ shape [ 1 ] for shape in data_shapes ] , np . float32 , " fc . onnx " ) <nl> + <nl> + sym , arg_params , aux_params = onnx_mxnet . import_model ( converted_model ) <nl> + result = forward_pass ( sym , arg_params , aux_params , data_names , input_data ) <nl> + <nl> + numpy_op = np . dot ( input_data [ 0 ] , input_data [ 1 ] . T ) + input_data [ 2 ] <nl> + <nl> + npt . assert_almost_equal ( result , numpy_op ) <nl> + <nl> + <nl> def test_softmax ( ) : <nl> input1 = np . random . rand ( 1000 , 1000 ) . astype ( " float32 " ) <nl> label1 = np . random . rand ( 1000 ) <nl> | ONNX export : Add Flatten before Gemm ( ) | apache/incubator-mxnet | a4f2ed5675a4852ac227f477667c90c32bb293e2 | 2018-12-20T21:17:05Z |
mmm a / tensorflow / compiler / mlir / tensorflow / c / c_api_unified_experimental_mlir . cc <nl> ppp b / tensorflow / compiler / mlir / tensorflow / c / c_api_unified_experimental_mlir . cc <nl> using tensorflow : : AbstractTensorInterface ; <nl> using tensorflow : : dyn_cast ; <nl> using tensorflow : : OutputList ; <nl> using tensorflow : : string ; <nl> + using tensorflow : : errors : : FailedPrecondition ; <nl> + using tensorflow : : errors : : InvalidArgument ; <nl> + using tensorflow : : errors : : Unimplemented ; <nl> using tensorflow : : tracing : : TracingContext ; <nl> using tensorflow : : tracing : : TracingOperation ; <nl> using tensorflow : : tracing : : TracingTensorHandle ; <nl> class MlirTensor : public TracingTensorHandle { <nl> } <nl> <nl> Value getValue ( ) { return value_ ; } <nl> + Type getElementType ( ) { <nl> + return value_ . getType ( ) . cast < ShapedType > ( ) . getElementType ( ) ; <nl> + } <nl> <nl> / / For LLVM style RTTI . <nl> static bool classof ( const AbstractTensorHandle * ptr ) { <nl> class MlirFunctionContext : public TracingContext { <nl> Status Finalize ( OutputList * outputs , AbstractFunction * * f ) override ; <nl> <nl> Status RegisterFunction ( AbstractFunction * func ) override { <nl> - return tensorflow : : errors : : Unimplemented ( <nl> + return Unimplemented ( <nl> " Registering graph functions has not been implemented yet . " ) ; <nl> } <nl> <nl> Status RemoveFunction ( const string & func ) override { <nl> - return tensorflow : : errors : : Unimplemented ( <nl> + return Unimplemented ( <nl> " MlirFunctionContext : : RemoveFunction has not been implemented yet . " ) ; <nl> } <nl> <nl> class MlirFunctionContext : public TracingContext { <nl> <nl> Status MlirAbstractOp : : Reset ( const char * op , const char * device_name ) { <nl> if ( state_ ) { <nl> - return tensorflow : : errors : : FailedPrecondition ( <nl> - " Reset called on already built op . " ) ; <nl> + return FailedPrecondition ( " Reset called on already built op . " ) ; <nl> } <nl> TF_RETURN_IF_ERROR ( <nl> tensorflow : : OpRegistry : : Global ( ) - > LookUpOpDef ( op , & op_def_ ) ) ; <nl> Status MlirAbstractOp : : Reset ( const char * op , const char * device_name ) { <nl> <nl> Status MlirAbstractOp : : SetAttrType ( const char * attr_name , <nl> tensorflow : : DataType dtype ) { <nl> - if ( ! state_ ) { <nl> - return Status ( tensorflow : : error : : Code : : FAILED_PRECONDITION , <nl> - " op_type must be specified before specifying attrs . " ) ; <nl> - } <nl> + if ( ! state_ ) <nl> + return FailedPrecondition ( <nl> + " op_type must be specified before specifying attrs . " ) ; <nl> Type mlir_type ; <nl> Builder builder ( context_ ) ; <nl> TF_RETURN_IF_ERROR ( ConvertDataTypeToTensor ( dtype , builder , & mlir_type ) ) ; <nl> Status MlirAbstractOp : : SetAttrType ( const char * attr_name , <nl> Status MlirAbstractOp : : SetOpName ( const char * const op_name ) { <nl> / / TODO ( aminim ) : should we use a location ? <nl> if ( op_name_ ) { <nl> - return tensorflow : : errors : : FailedPrecondition ( <nl> - " SetOpName called on already built op . " ) ; <nl> + return FailedPrecondition ( " SetOpName called on already built op . " ) ; <nl> } <nl> op_name_ = op_name ; <nl> return Status : : OK ( ) ; <nl> Status MlirAbstractOp : : SetOpName ( const char * const op_name ) { <nl> Status MlirAbstractOp : : AddRef ( Type type , Type * output_type ) { <nl> Type elt_type = getElementTypeOrSelf ( type ) ; <nl> if ( elt_type . isa < mlir : : TF : : TensorFlowRefType > ( ) ) { <nl> - return tensorflow : : errors : : InvalidArgument ( <nl> - " Requested reference to a reference type " ) ; <nl> + return InvalidArgument ( " Requested reference to a reference type " ) ; <nl> } <nl> elt_type = TensorFlowRefType : : get ( elt_type ) ; <nl> if ( RankedTensorType tensor_type = type . dyn_cast < RankedTensorType > ( ) ) { <nl> Status MlirAbstractOp : : Create ( ArrayRef < Value > operands , <nl> Builder builder ( context_ ) ; <nl> <nl> if ( current_ods_input_ ! = op_def_ - > input_arg_size ( ) ) <nl> - return tensorflow : : errors : : InvalidArgument ( <nl> - absl : : StrCat ( " Mismatch in operands number : got " , current_ods_input_ , <nl> - " expected " , op_def_ - > input_arg_size ( ) , " ; for op " , <nl> - state_ - > name . getStringRef ( ) . str ( ) ) ) ; <nl> + return InvalidArgument ( absl : : StrCat ( " Mismatch in operands number : got " , <nl> + current_ods_input_ , " expected " , <nl> + op_def_ - > input_arg_size ( ) , " ; for op " , <nl> + state_ - > name . getStringRef ( ) . str ( ) ) ) ; <nl> <nl> / / Process results according to the op_def and infer types for derived <nl> / / attributes . <nl> Status MlirAbstractOp : : Create ( ArrayRef < Value > operands , <nl> if ( ! output_arg . number_attr ( ) . empty ( ) ) { <nl> / / Same type repeated " repeats " times . <nl> Attribute repeats_attr = attrs_ [ output_arg . number_attr ( ) ] ; <nl> - if ( ! repeats_attr ) { <nl> - return tensorflow : : errors : : InvalidArgument ( <nl> - " Missing attribute ' " , output_arg . number_attr ( ) , <nl> - " ' required for output list ' " , output_arg . name ( ) , " ' " ) ; <nl> - } <nl> - if ( ! repeats_attr . isa < IntegerAttr > ( ) ) { <nl> - return tensorflow : : errors : : InvalidArgument ( <nl> - " Attribute ' " , output_arg . number_attr ( ) , <nl> - " ' required for output list ' " , output_arg . name ( ) , <nl> - " ' isn ' t an integer " ) ; <nl> - } <nl> + if ( ! repeats_attr ) <nl> + return InvalidArgument ( " Missing attribute ' " , output_arg . number_attr ( ) , <nl> + " ' required for output list ' " , <nl> + output_arg . name ( ) , " ' " ) ; <nl> + if ( ! repeats_attr . isa < IntegerAttr > ( ) ) <nl> + return InvalidArgument ( " Attribute ' " , output_arg . number_attr ( ) , <nl> + " ' required for output list ' " , <nl> + output_arg . name ( ) , " ' isn ' t an integer " ) ; <nl> int64_t repeats = repeats_attr . cast < IntegerAttr > ( ) . getInt ( ) ; <nl> <nl> if ( ! output_arg . type_attr ( ) . empty ( ) ) { <nl> / / Same type repeated " repeats " times . <nl> Attribute attr = attrs_ [ output_arg . type_attr ( ) ] ; <nl> - if ( ! attr ) { <nl> - return tensorflow : : errors : : InvalidArgument ( <nl> - " Missing attribute ' " , output_arg . type_attr ( ) , <nl> - " ' required for output ' " , output_arg . name ( ) , " ' " ) ; <nl> - } <nl> + if ( ! attr ) <nl> + return InvalidArgument ( " Missing attribute ' " , output_arg . type_attr ( ) , <nl> + " ' required for output ' " , output_arg . name ( ) , <nl> + " ' " ) ; <nl> TypeAttr type_attr = attr . dyn_cast < TypeAttr > ( ) ; <nl> - if ( ! type_attr ) { <nl> - return tensorflow : : errors : : InvalidArgument ( <nl> - " Attribute ' " , output_arg . type_attr ( ) , " ' required for output ' " , <nl> - output_arg . name ( ) , " ' isn ' t a type attribute " ) ; <nl> - } <nl> + if ( ! type_attr ) <nl> + return InvalidArgument ( " Attribute ' " , output_arg . type_attr ( ) , <nl> + " ' required for output ' " , output_arg . name ( ) , <nl> + " ' isn ' t a type attribute " ) ; <nl> for ( int i = 0 ; i < repeats ; + + i ) <nl> state_ - > types . push_back ( type_attr . getType ( ) ) ; <nl> } else if ( output_arg . type ( ) ! = tensorflow : : DT_INVALID ) { <nl> Status MlirAbstractOp : : Create ( ArrayRef < Value > operands , <nl> state_ - > types . push_back ( type ) ; <nl> } <nl> } else { <nl> - return tensorflow : : errors : : InvalidArgument ( <nl> - " Missing type or type_attr field in " , <nl> - output_arg . ShortDebugString ( ) ) ; <nl> + return InvalidArgument ( " Missing type or type_attr field in " , <nl> + output_arg . ShortDebugString ( ) ) ; <nl> } <nl> } else if ( ! output_arg . type_attr ( ) . empty ( ) ) { <nl> Attribute attr = attrs_ [ output_arg . type_attr ( ) ] ; <nl> - if ( ! attr ) { <nl> - return tensorflow : : errors : : InvalidArgument ( <nl> - " Missing attribute ' " , output_arg . type_attr ( ) , <nl> - " ' required for output ' " , output_arg . name ( ) , " ' " ) ; <nl> - } <nl> + if ( ! attr ) <nl> + return InvalidArgument ( " Missing attribute ' " , output_arg . type_attr ( ) , <nl> + " ' required for output ' " , output_arg . name ( ) , <nl> + " ' " ) ; <nl> TypeAttr type_attr = attr . dyn_cast < TypeAttr > ( ) ; <nl> - if ( ! type_attr ) { <nl> - return tensorflow : : errors : : InvalidArgument ( <nl> - " Attribute ' " , output_arg . type_attr ( ) , " ' required for output ' " , <nl> - output_arg . name ( ) , " ' isn ' t a type attribute " ) ; <nl> - } <nl> + if ( ! type_attr ) <nl> + return InvalidArgument ( " Attribute ' " , output_arg . type_attr ( ) , <nl> + " ' required for output ' " , output_arg . name ( ) , <nl> + " ' isn ' t a type attribute " ) ; <nl> state_ - > types . push_back ( type_attr . getValue ( ) ) ; <nl> } else if ( ! output_arg . type_list_attr ( ) . empty ( ) ) { <nl> / / This is pointing to an attribute which is an array of types . <nl> Attribute attr = attrs_ [ output_arg . type_list_attr ( ) ] ; <nl> - if ( ! attr ) { <nl> - return tensorflow : : errors : : InvalidArgument ( <nl> + if ( ! attr ) <nl> + return InvalidArgument ( <nl> " Missing attribute ' " , output_arg . type_list_attr ( ) , <nl> " ' required for output ' " , output_arg . name ( ) , " ' " ) ; <nl> - } <nl> ArrayAttr array_attr = attr . dyn_cast < ArrayAttr > ( ) ; <nl> - if ( ! array_attr ) { <nl> - return tensorflow : : errors : : InvalidArgument ( <nl> - " Attribute ' " , output_arg . type_list_attr ( ) , <nl> - " ' required for output ' " , output_arg . name ( ) , <nl> - " ' isn ' t an array attribute " ) ; <nl> - } <nl> + if ( ! array_attr ) <nl> + return InvalidArgument ( " Attribute ' " , output_arg . type_list_attr ( ) , <nl> + " ' required for output ' " , output_arg . name ( ) , <nl> + " ' isn ' t an array attribute " ) ; <nl> for ( Attribute attr : array_attr ) { <nl> TypeAttr type_attr = attr . dyn_cast < TypeAttr > ( ) ; <nl> - if ( ! type_attr ) { <nl> - return tensorflow : : errors : : InvalidArgument ( <nl> - " Array Attribute ' " , output_arg . type_list_attr ( ) , <nl> - " ' required for output ' " , output_arg . name ( ) , <nl> - " ' has a non - Type element " ) ; <nl> - } <nl> + if ( ! type_attr ) <nl> + return InvalidArgument ( " Array Attribute ' " , <nl> + output_arg . type_list_attr ( ) , <nl> + " ' required for output ' " , output_arg . name ( ) , <nl> + " ' has a non - Type element " ) ; <nl> state_ - > types . push_back ( type_attr . getValue ( ) ) ; <nl> } <nl> } else if ( output_arg . type ( ) ! = tensorflow : : DT_INVALID ) { <nl> Status MlirAbstractOp : : Create ( ArrayRef < Value > operands , <nl> ConvertDataTypeToTensor ( output_arg . type ( ) , builder , & type ) ) ; <nl> state_ - > types . push_back ( type ) ; <nl> } else { <nl> - return tensorflow : : errors : : InvalidArgument ( " No type fields in " , <nl> - output_arg . ShortDebugString ( ) ) ; <nl> + return InvalidArgument ( " No type fields in " , <nl> + output_arg . ShortDebugString ( ) ) ; <nl> } <nl> if ( output_arg . is_ref ( ) ) { <nl> / / For all types that were added by this function call , make them refs . <nl> Status MlirAbstractOp : : AddInputList ( <nl> <nl> Status MlirAbstractOp : : SetAttrString ( const char * attr_name , const char * data , <nl> size_t length ) { <nl> - return tensorflow : : errors : : Unimplemented ( <nl> - " SetAttrString has not been implemented yet . " ) ; <nl> + return Unimplemented ( " SetAttrString has not been implemented yet . " ) ; <nl> } <nl> Status MlirAbstractOp : : SetAttrInt ( const char * attr_name , int64_t value ) { <nl> - return tensorflow : : errors : : Unimplemented ( <nl> - " SetAttrInt has not been implemented yet . " ) ; <nl> + return Unimplemented ( " SetAttrInt has not been implemented yet . " ) ; <nl> } <nl> Status MlirAbstractOp : : SetAttrFloat ( const char * attr_name , float value ) { <nl> - return tensorflow : : errors : : Unimplemented ( <nl> - " SetAttrFloat has not been implemented yet . " ) ; <nl> + return Unimplemented ( " SetAttrFloat has not been implemented yet . " ) ; <nl> } <nl> Status MlirAbstractOp : : SetAttrBool ( const char * attr_name , bool value ) { <nl> - return tensorflow : : errors : : Unimplemented ( <nl> - " SetAttrBool has not been implemented yet . " ) ; <nl> + return Unimplemented ( " SetAttrBool has not been implemented yet . " ) ; <nl> } <nl> Status MlirAbstractOp : : SetAttrShape ( const char * attr_name , const int64_t * dims , <nl> const int num_dims ) { <nl> - return tensorflow : : errors : : Unimplemented ( <nl> - " SetAttrShape has not been implemented yet . " ) ; <nl> + return Unimplemented ( " SetAttrShape has not been implemented yet . " ) ; <nl> } <nl> Status MlirAbstractOp : : SetAttrFunction ( const char * attr_name , <nl> const AbstractOperation * value ) { <nl> - return tensorflow : : errors : : Unimplemented ( <nl> - " SetAttrFunction has not been implemented yet . " ) ; <nl> + return Unimplemented ( " SetAttrFunction has not been implemented yet . " ) ; <nl> } <nl> Status MlirAbstractOp : : SetAttrFunctionName ( const char * attr_name , <nl> const char * value , size_t length ) { <nl> - return tensorflow : : errors : : Unimplemented ( <nl> - " SetAttrFunctionName has not been implemented yet . " ) ; <nl> + return Unimplemented ( " SetAttrFunctionName has not been implemented yet . " ) ; <nl> } <nl> Status MlirAbstractOp : : SetAttrTensor ( const char * attr_name , <nl> AbstractTensorInterface * tensor ) { <nl> - return tensorflow : : errors : : Unimplemented ( <nl> - " SetAttrTensor has not been implemented yet . " ) ; <nl> + return Unimplemented ( " SetAttrTensor has not been implemented yet . " ) ; <nl> } <nl> Status MlirAbstractOp : : SetAttrStringList ( const char * attr_name , <nl> const void * const * values , <nl> const size_t * lengths , <nl> int num_values ) { <nl> - return tensorflow : : errors : : Unimplemented ( <nl> - " SetAttrStringList has not been implemented yet . " ) ; <nl> + return Unimplemented ( " SetAttrStringList has not been implemented yet . " ) ; <nl> } <nl> Status MlirAbstractOp : : SetAttrFloatList ( const char * attr_name , <nl> const float * values , int num_values ) { <nl> - return tensorflow : : errors : : Unimplemented ( <nl> - " SetAttrFloatList has not been implemented yet . " ) ; <nl> + return Unimplemented ( " SetAttrFloatList has not been implemented yet . " ) ; <nl> } <nl> Status MlirAbstractOp : : SetAttrIntList ( const char * attr_name , <nl> const int64_t * values , int num_values ) { <nl> - return tensorflow : : errors : : Unimplemented ( <nl> - " SetAttrIntList has not been implemented yet . " ) ; <nl> + return Unimplemented ( " SetAttrIntList has not been implemented yet . " ) ; <nl> } <nl> Status MlirAbstractOp : : SetAttrTypeList ( const char * attr_name , <nl> const tensorflow : : DataType * values , <nl> int num_values ) { <nl> - return tensorflow : : errors : : Unimplemented ( <nl> - " SetAttrTypeList has not been implemented yet . " ) ; <nl> + return Unimplemented ( " SetAttrTypeList has not been implemented yet . " ) ; <nl> } <nl> Status MlirAbstractOp : : SetAttrBoolList ( const char * attr_name , <nl> const unsigned char * values , <nl> int num_values ) { <nl> - return tensorflow : : errors : : Unimplemented ( <nl> - " SetAttrBoolList has not been implemented yet . " ) ; <nl> + return Unimplemented ( " SetAttrBoolList has not been implemented yet . " ) ; <nl> } <nl> Status MlirAbstractOp : : SetAttrShapeList ( const char * attr_name , <nl> const int64_t * * dims , <nl> const int * num_dims , int num_values ) { <nl> - return tensorflow : : errors : : Unimplemented ( <nl> - " SetAttrShapeList has not been implemented yet . " ) ; <nl> + return Unimplemented ( " SetAttrShapeList has not been implemented yet . " ) ; <nl> } <nl> Status MlirAbstractOp : : SetAttrFunctionList ( <nl> const char * attr_name , absl : : Span < const AbstractOperation * > values ) { <nl> - return tensorflow : : errors : : Unimplemented ( <nl> - " SetAttrFunctionList has not been implemented yet . " ) ; <nl> + return Unimplemented ( " SetAttrFunctionList has not been implemented yet . " ) ; <nl> } <nl> <nl> Status MlirFunction : : GetFunctionDef ( tensorflow : : FunctionDef * * f ) { <nl> Status MlirFunctionContext : : AddParameter ( tensorflow : : DataType dtype , <nl> <nl> Status MlirAbstractOp : : AddInput ( AbstractTensorHandle * input ) { <nl> if ( current_ods_input_ > = op_def_ - > input_arg_size ( ) ) <nl> - return tensorflow : : errors : : InvalidArgument ( <nl> + return InvalidArgument ( <nl> absl : : StrCat ( " More Input ( ) ( " , current_ods_input_ , " ) calls than the " , <nl> op_def_ - > input_arg_size ( ) , " allowed input_args ; for op " , <nl> state_ - > name . getStringRef ( ) . str ( ) ) ) ; <nl> <nl> auto * operand = dyn_cast < MlirTensor > ( input ) ; <nl> - if ( ! operand ) <nl> - return tensorflow : : errors : : InvalidArgument ( <nl> - " Unable to cast input to MlirTensor " ) ; <nl> + if ( ! operand ) return InvalidArgument ( " Unable to cast input to MlirTensor " ) ; <nl> operands_ . push_back ( operand - > getValue ( ) ) ; <nl> <nl> / / Get the next ArgDef and use it to infer the derived attributes associated <nl> Status MlirFunctionContext : : Finalize ( OutputList * outputs , <nl> SmallVector < Value , 8 > ret_operands ; <nl> for ( auto * output : outputs - > outputs ) { <nl> auto * operand = dyn_cast < MlirTensor > ( output ) ; <nl> - if ( ! operand ) { <nl> - return tensorflow : : errors : : InvalidArgument ( <nl> - " Capturing eager tensors is not supported yet . " ) ; <nl> - } <nl> - if ( operand - > getValue ( ) . getContext ( ) ! = context_ . get ( ) ) { <nl> - return tensorflow : : errors : : InvalidArgument ( <nl> + if ( ! operand ) <nl> + return InvalidArgument ( " Capturing eager tensors is not supported yet . " ) ; <nl> + if ( operand - > getValue ( ) . getContext ( ) ! = context_ . get ( ) ) <nl> + return InvalidArgument ( <nl> " Capturing tensors from other context is not supported . " ) ; <nl> - } <nl> ret_operands . push_back ( operand - > getValue ( ) ) ; <nl> } <nl> builder_ . create < ReturnOp > ( func_ . getLoc ( ) , ret_operands ) ; <nl> | Add " using " directive for tensorflow : : errors and add ` getElementType ( ) ` helper on MlirTensor to simplify the code ( NFC ) | tensorflow/tensorflow | b1a198b935f25476850216f8b08324785c494888 | 2020-08-17T19:45:35Z |
mmm a / configure . ac <nl> ppp b / configure . ac <nl> AC_LINK_IFELSE ( [ AC_LANG_SOURCE ( [ <nl> ] <nl> ) <nl> <nl> + # Check for different ways of gathering OS randomness <nl> + AC_MSG_CHECKING ( for Linux getrandom syscall ) <nl> + AC_COMPILE_IFELSE ( [ AC_LANG_PROGRAM ( [ [ # include < unistd . h > <nl> + # include < sys / syscall . h > <nl> + # include < linux / random . h > ] ] , <nl> + [ [ syscall ( SYS_getrandom , nullptr , 32 , 0 ) ; ] ] ) ] , <nl> + [ AC_MSG_RESULT ( yes ) ; AC_DEFINE ( HAVE_SYS_GETRANDOM , 1 , [ Define this symbol if the Linux getrandom system call is available ] ) ] , <nl> + [ AC_MSG_RESULT ( no ) ] <nl> + ) <nl> + <nl> + AC_MSG_CHECKING ( for getentropy ) <nl> + AC_COMPILE_IFELSE ( [ AC_LANG_PROGRAM ( [ [ # include < unistd . h > ] ] , <nl> + [ [ getentropy ( nullptr , 32 ) ] ] ) ] , <nl> + [ AC_MSG_RESULT ( yes ) ; AC_DEFINE ( HAVE_GETENTROPY , 1 , [ Define this symbol if the BSD getentropy system call is available ] ) ] , <nl> + [ AC_MSG_RESULT ( no ) ] <nl> + ) <nl> + <nl> + AC_MSG_CHECKING ( for sysctl KERN_ARND ) <nl> + AC_COMPILE_IFELSE ( [ AC_LANG_PROGRAM ( [ [ # include < sys / types . h > <nl> + # include < sys / sysctl . h > ] ] , <nl> + [ [ static const int name [ 2 ] = { CTL_KERN , KERN_ARND } ; <nl> + sysctl ( name , 2 , nullptr , nullptr , nullptr , 0 ) ; ] ] ) ] , <nl> + [ AC_MSG_RESULT ( yes ) ; AC_DEFINE ( HAVE_SYSCTL_ARND , 1 , [ Define this symbol if the BSD sysctl ( KERN_ARND ) is available ] ) ] , <nl> + [ AC_MSG_RESULT ( no ) ] <nl> + ) <nl> + <nl> + # Check for reduced exports <nl> if test x $ use_reduce_exports = xyes ; then <nl> AX_CHECK_COMPILE_FLAG ( [ - fvisibility = hidden ] , [ RE_CXXFLAGS = " - fvisibility = hidden " ] , <nl> [ AC_MSG_ERROR ( [ Cannot set default symbol visibility . Use - - disable - reduce - exports . ] ) ] ) <nl> mmm a / src / Makefile . test . include <nl> ppp b / src / Makefile . test . include <nl> BITCOIN_TESTS = \ <nl> test / policyestimator_tests . cpp \ <nl> test / pow_tests . cpp \ <nl> test / prevector_tests . cpp \ <nl> + test / random_tests . cpp \ <nl> test / raii_event_tests . cpp \ <nl> test / reverselock_tests . cpp \ <nl> test / rpc_tests . cpp \ <nl> mmm a / src / init . cpp <nl> ppp b / src / init . cpp <nl> bool InitSanityCheck ( void ) <nl> InitError ( " Elliptic curve cryptography sanity check failure . Aborting . " ) ; <nl> return false ; <nl> } <nl> + <nl> if ( ! glibc_sanity_test ( ) | | ! glibcxx_sanity_test ( ) ) <nl> return false ; <nl> <nl> + if ( ! Random_SanityCheck ( ) ) { <nl> + InitError ( " OS cryptographic RNG sanity check failure . Aborting . " ) ; <nl> + return false ; <nl> + } <nl> + <nl> return true ; <nl> } <nl> <nl> mmm a / src / random . cpp <nl> ppp b / src / random . cpp <nl> <nl> # include < sys / time . h > <nl> # endif <nl> <nl> + # ifdef HAVE_SYS_GETRANDOM <nl> + # include < sys / syscall . h > <nl> + # include < linux / random . h > <nl> + # endif <nl> + # ifdef HAVE_GETENTROPY <nl> + # include < unistd . h > <nl> + # endif <nl> + # ifdef HAVE_SYSCTL_ARND <nl> + # include < sys / sysctl . h > <nl> + # endif <nl> + <nl> # include < openssl / err . h > <nl> # include < openssl / rand . h > <nl> <nl> static void RandAddSeedPerfmon ( ) <nl> # endif <nl> } <nl> <nl> + # ifndef WIN32 <nl> + / * * Fallback : get 32 bytes of system entropy from / dev / urandom . The most <nl> + * compatible way to get cryptographic randomness on UNIX - ish platforms . <nl> + * / <nl> + void GetDevURandom ( unsigned char * ent32 ) <nl> + { <nl> + int f = open ( " / dev / urandom " , O_RDONLY ) ; <nl> + if ( f = = - 1 ) { <nl> + RandFailure ( ) ; <nl> + } <nl> + int have = 0 ; <nl> + do { <nl> + ssize_t n = read ( f , ent32 + have , NUM_OS_RANDOM_BYTES - have ) ; <nl> + if ( n < = 0 | | n + have > NUM_OS_RANDOM_BYTES ) { <nl> + RandFailure ( ) ; <nl> + } <nl> + have + = n ; <nl> + } while ( have < NUM_OS_RANDOM_BYTES ) ; <nl> + close ( f ) ; <nl> + } <nl> + # endif <nl> + <nl> / * * Get 32 bytes of system entropy . * / <nl> - static void GetOSRand ( unsigned char * ent32 ) <nl> + void GetOSRand ( unsigned char * ent32 ) <nl> { <nl> - # ifdef WIN32 <nl> + # if defined ( WIN32 ) <nl> HCRYPTPROV hProvider ; <nl> int ret = CryptAcquireContextW ( & hProvider , NULL , NULL , PROV_RSA_FULL , CRYPT_VERIFYCONTEXT ) ; <nl> if ( ! ret ) { <nl> RandFailure ( ) ; <nl> } <nl> - ret = CryptGenRandom ( hProvider , 32 , ent32 ) ; <nl> + ret = CryptGenRandom ( hProvider , NUM_OS_RANDOM_BYTES , ent32 ) ; <nl> if ( ! ret ) { <nl> RandFailure ( ) ; <nl> } <nl> CryptReleaseContext ( hProvider , 0 ) ; <nl> - # else <nl> - int f = open ( " / dev / urandom " , O_RDONLY ) ; <nl> - if ( f = = - 1 ) { <nl> + # elif defined ( HAVE_SYS_GETRANDOM ) <nl> + / * Linux . From the getrandom ( 2 ) man page : <nl> + * " If the urandom source has been initialized , reads of up to 256 bytes <nl> + * will always return as many bytes as requested and will not be <nl> + * interrupted by signals . " <nl> + * / <nl> + int rv = syscall ( SYS_getrandom , ent32 , NUM_OS_RANDOM_BYTES , 0 ) ; <nl> + if ( rv ! = NUM_OS_RANDOM_BYTES ) { <nl> + if ( rv < 0 & & errno = = ENOSYS ) { <nl> + / * Fallback for kernel < 3 . 17 : the return value will be - 1 and errno <nl> + * ENOSYS if the syscall is not available , in that case fall back <nl> + * to / dev / urandom . <nl> + * / <nl> + GetDevURandom ( ent32 ) ; <nl> + } else { <nl> + RandFailure ( ) ; <nl> + } <nl> + } <nl> + # elif defined ( HAVE_GETENTROPY ) <nl> + / * On OpenBSD this can return up to 256 bytes of entropy , will return an <nl> + * error if more are requested . <nl> + * The call cannot return less than the requested number of bytes . <nl> + * / <nl> + if ( getentropy ( ent32 , NUM_OS_RANDOM_BYTES ) ! = 0 ) { <nl> RandFailure ( ) ; <nl> } <nl> + # elif defined ( HAVE_SYSCTL_ARND ) <nl> + / * FreeBSD and similar . It is possible for the call to return less <nl> + * bytes than requested , so need to read in a loop . <nl> + * / <nl> + static const int name [ 2 ] = { CTL_KERN , KERN_ARND } ; <nl> int have = 0 ; <nl> do { <nl> - ssize_t n = read ( f , ent32 + have , 32 - have ) ; <nl> - if ( n < = 0 | | n + have > 32 ) { <nl> + size_t len = NUM_OS_RANDOM_BYTES - have ; <nl> + if ( sysctl ( name , ARRAYLEN ( name ) , ent32 + have , & len , NULL , 0 ) ! = 0 ) { <nl> RandFailure ( ) ; <nl> } <nl> - have + = n ; <nl> - } while ( have < 32 ) ; <nl> - close ( f ) ; <nl> + have + = len ; <nl> + } while ( have < NUM_OS_RANDOM_BYTES ) ; <nl> + # else <nl> + / * Fall back to / dev / urandom if there is no specific method implemented to <nl> + * get system entropy for this OS . <nl> + * / <nl> + GetDevURandom ( ent32 ) ; <nl> # endif <nl> } <nl> <nl> FastRandomContext : : FastRandomContext ( bool fDeterministic ) <nl> } <nl> } <nl> <nl> + bool Random_SanityCheck ( ) <nl> + { <nl> + / * This does not measure the quality of randomness , but it does test that <nl> + * OSRandom ( ) overwrites all 32 bytes of the output given a maximum <nl> + * number of tries . <nl> + * / <nl> + static const ssize_t MAX_TRIES = 1024 ; <nl> + uint8_t data [ NUM_OS_RANDOM_BYTES ] ; <nl> + bool overwritten [ NUM_OS_RANDOM_BYTES ] = { } ; / * Tracks which bytes have been overwritten at least once * / <nl> + int num_overwritten ; <nl> + int tries = 0 ; <nl> + / * Loop until all bytes have been overwritten at least once , or max number tries reached * / <nl> + do { <nl> + memset ( data , 0 , NUM_OS_RANDOM_BYTES ) ; <nl> + GetOSRand ( data ) ; <nl> + for ( int x = 0 ; x < NUM_OS_RANDOM_BYTES ; + + x ) { <nl> + overwritten [ x ] | = ( data [ x ] ! = 0 ) ; <nl> + } <nl> + <nl> + num_overwritten = 0 ; <nl> + for ( int x = 0 ; x < NUM_OS_RANDOM_BYTES ; + + x ) { <nl> + if ( overwritten [ x ] ) { <nl> + num_overwritten + = 1 ; <nl> + } <nl> + } <nl> + <nl> + tries + = 1 ; <nl> + } while ( num_overwritten < NUM_OS_RANDOM_BYTES & & tries < MAX_TRIES ) ; <nl> + return ( num_overwritten = = NUM_OS_RANDOM_BYTES ) ; / * If this failed , bailed out after too many tries * / <nl> + } <nl> mmm a / src / random . h <nl> ppp b / src / random . h <nl> class FastRandomContext { <nl> uint32_t Rw ; <nl> } ; <nl> <nl> + / * Number of random bytes returned by GetOSRand . <nl> + * When changing this constant make sure to change all call sites , and make <nl> + * sure that the underlying OS APIs for all platforms support the number . <nl> + * ( many cap out at 256 bytes ) . <nl> + * / <nl> + static const ssize_t NUM_OS_RANDOM_BYTES = 32 ; <nl> + <nl> + / * * Get 32 bytes of system entropy . Do not use this in application code : use <nl> + * GetStrongRandBytes instead . <nl> + * / <nl> + void GetOSRand ( unsigned char * ent32 ) ; <nl> + <nl> + / * * Check that OS randomness is available and returning the requested number <nl> + * of bytes . <nl> + * / <nl> + bool Random_SanityCheck ( ) ; <nl> + <nl> # endif / / BITCOIN_RANDOM_H <nl> new file mode 100644 <nl> index 000000000000 . . d2c46c0daabc <nl> mmm / dev / null <nl> ppp b / src / test / random_tests . cpp <nl> <nl> + / / Copyright ( c ) 2017 The Bitcoin Core developers <nl> + / / Distributed under the MIT software license , see the accompanying <nl> + / / file COPYING or http : / / www . opensource . org / licenses / mit - license . php . <nl> + <nl> + # include " random . h " <nl> + <nl> + # include " test / test_bitcoin . h " <nl> + <nl> + # include < boost / test / unit_test . hpp > <nl> + <nl> + BOOST_FIXTURE_TEST_SUITE ( random_tests , BasicTestingSetup ) <nl> + <nl> + BOOST_AUTO_TEST_CASE ( osrandom_tests ) <nl> + { <nl> + BOOST_CHECK ( Random_SanityCheck ( ) ) ; <nl> + } <nl> + <nl> + BOOST_AUTO_TEST_SUITE_END ( ) <nl> + <nl> | Merge : util : Specific GetOSRandom for Linux / FreeBSD / OpenBSD | bitcoin/bitcoin | d19d45a1e6a4345a57d5983d466b16dadbec0da9 | 2017-03-01T11:41:53Z |
mmm a / tensorflow / c / eager / c_api . cc <nl> ppp b / tensorflow / c / eager / c_api . cc <nl> limitations under the License . <nl> # include " absl / memory / memory . h " <nl> # include " tensorflow / c / c_api . h " <nl> # include " tensorflow / c / c_api_internal . h " <nl> + # include " tensorflow / c / eager / tensor_handle_interface . h " <nl> # include " tensorflow / c / tf_tensor_internal . h " <nl> # include " tensorflow / c / eager / c_api_experimental . h " <nl> # include " tensorflow / c / eager / c_api_internal . h " <nl> limitations under the License . <nl> # include " tensorflow / core / lib / gtl / map_util . h " <nl> <nl> # include " tensorflow / core / lib / random / random . h " <nl> + # include " tensorflow / core / platform / casts . h " <nl> # include " tensorflow / core / platform / env . h " <nl> # include " tensorflow / core / platform / mutex . h " <nl> # include " tensorflow / core / platform / thread_annotations . h " <nl> tensorflow : : Status OpInferSingleInputAttrs ( TFE_Op * op , <nl> const std : : string & type_attr = input_def . type_attr ( ) ; <nl> if ( ! type_attr . empty ( ) & & ictx - > attrs . find ( type_attr ) = = ictx - > attrs . end ( ) ) { <nl> op - > operation . MutableAttrs ( ) - > Set ( <nl> - type_attr , static_cast < tensorflow : : DataType > ( input - > handle . DataType ( ) ) ) ; <nl> + type_attr , <nl> + static_cast < tensorflow : : DataType > ( input - > handle - > DataType ( ) ) ) ; <nl> ictx - > attrs . insert ( type_attr ) ; <nl> } <nl> return tensorflow : : Status : : OK ( ) ; <nl> tensorflow : : Status OpInferInputListAttrs ( TFE_Op * op , TFE_TensorHandle * * inputs , <nl> if ( ! input_def . type_list_attr ( ) . empty ( ) ) { <nl> std : : vector < tensorflow : : DataType > dtypes ( num_inputs ) ; <nl> for ( int i = 0 ; i < num_inputs ; + + i ) { <nl> - dtypes [ i ] = <nl> - static_cast < const tensorflow : : DataType > ( inputs [ i ] - > handle . DataType ( ) ) ; <nl> + dtypes [ i ] = static_cast < const tensorflow : : DataType > ( <nl> + inputs [ i ] - > handle - > DataType ( ) ) ; <nl> } <nl> OpInferMixedTypeInputListAttrs ( op , input_def , dtypes ) ; <nl> } else if ( ! input_def . type_attr ( ) . empty ( ) & & <nl> ! input_def . number_attr ( ) . empty ( ) ) { <nl> OpInferSingleTypeInputListAttrs ( <nl> op , input_def , <nl> - static_cast < const tensorflow : : DataType > ( inputs [ 0 ] - > handle . DataType ( ) ) , <nl> + static_cast < const tensorflow : : DataType > ( inputs [ 0 ] - > handle - > DataType ( ) ) , <nl> num_inputs ) ; <nl> } else { <nl> return tensorflow : : errors : : InvalidArgument ( " Invalid input list definition " ) ; <nl> bool tensorflow : : TensorHandleInterface : : IsValid ( Status * status ) const { <nl> } <nl> <nl> TF_DataType TFE_TensorHandleDataType ( TFE_TensorHandle * h ) { <nl> - return h - > handle . DataType ( ) ; <nl> + return h - > handle - > DataType ( ) ; <nl> } <nl> <nl> TF_DataType tensorflow : : TensorHandleInterface : : DataType ( ) const { <nl> int TFE_TensorHandleNumDims ( TFE_TensorHandle * h , TF_Status * status ) { <nl> return - 1 ; <nl> } <nl> <nl> - return h - > handle . NumDims ( & status - > status ) ; <nl> + return h - > handle - > NumDims ( & status - > status ) ; <nl> } <nl> <nl> int tensorflow : : TensorHandleInterface : : NumDims ( Status * status ) const { <nl> int64_t TFE_TensorHandleNumElements ( TFE_TensorHandle * h , TF_Status * status ) { <nl> return - 1 ; <nl> } <nl> <nl> - return h - > handle . NumElements ( & status - > status ) ; <nl> + return h - > handle - > NumElements ( & status - > status ) ; <nl> } <nl> <nl> int64_t tensorflow : : TensorHandleInterface : : NumElements ( Status * status ) const { <nl> int64_t TFE_TensorHandleDim ( TFE_TensorHandle * h , int dim_index , <nl> return - 1 ; <nl> } <nl> <nl> - return h - > handle . Dim ( dim_index , & status - > status ) ; <nl> + return h - > handle - > Dim ( dim_index , & status - > status ) ; <nl> } <nl> <nl> int64_t tensorflow : : TensorHandleInterface : : Dim ( int dim_index , <nl> const char * TFE_TensorHandleDeviceName ( TFE_TensorHandle * h , TF_Status * status ) { <nl> " The passed in handle is a nullptr " ) ; <nl> return nullptr ; <nl> } <nl> - return h - > handle . DeviceName ( & status - > status ) ; <nl> + return h - > handle - > DeviceName ( & status - > status ) ; <nl> } <nl> <nl> const char * tensorflow : : TensorHandleInterface : : DeviceName ( <nl> const char * TFE_TensorHandleBackingDeviceName ( TFE_TensorHandle * h , <nl> " The passed in handle is a nullptr " ) ; <nl> return nullptr ; <nl> } <nl> - return h - > handle . BackingDeviceName ( & status - > status ) ; <nl> + return h - > handle - > BackingDeviceName ( & status - > status ) ; <nl> } <nl> <nl> const char * tensorflow : : TensorHandleInterface : : BackingDeviceName ( <nl> const char * tensorflow : : TensorHandleInterface : : BackingDeviceName ( <nl> <nl> TF_CAPI_EXPORT extern TFE_TensorHandle * TFE_TensorHandleCopySharingTensor ( <nl> TFE_TensorHandle * h , TF_Status * status ) { <nl> - if ( h = = nullptr | | ! h - > handle . IsValid ( & status - > status ) ) { <nl> + if ( h = = nullptr | | ! h - > handle - > IsValid ( & status - > status ) ) { <nl> status - > status = tensorflow : : errors : : InvalidArgument ( <nl> " The passed in handle is a nullptr " ) ; <nl> return nullptr ; <nl> } <nl> <nl> - return h - > handle . Copy ( ) ; <nl> + return new TFE_TensorHandle { <nl> + std : : unique_ptr < AbstractTensorHandleInterface > ( h - > handle - > Copy ( ) ) } ; <nl> } <nl> <nl> - TFE_TensorHandle * tensorflow : : TensorHandleInterface : : Copy ( ) { <nl> + AbstractTensorHandleInterface * tensorflow : : TensorHandleInterface : : Copy ( ) { <nl> handle_ - > Ref ( ) ; <nl> - return new TFE_TensorHandle { TensorHandleInterface ( handle_ ) } ; <nl> + return new TensorHandleInterface ( handle_ ) ; <nl> } <nl> <nl> TF_Tensor * TFE_TensorHandleResolve ( TFE_TensorHandle * h , TF_Status * status ) { <nl> TF_Tensor * TFE_TensorHandleResolve ( TFE_TensorHandle * h , TF_Status * status ) { <nl> return nullptr ; <nl> } <nl> <nl> - return h - > handle . Resolve ( & status - > status ) ; <nl> + return h - > handle - > Resolve ( & status - > status ) ; <nl> } <nl> <nl> TF_Tensor * tensorflow : : TensorHandleInterface : : Resolve ( Status * status ) { <nl> TF_Tensor * tensorflow : : TensorHandleInterface : : Resolve ( Status * status ) { <nl> } <nl> <nl> void * TFE_TensorHandleDevicePointer ( TFE_TensorHandle * h , TF_Status * status ) { <nl> - if ( h = = nullptr | | ! h - > handle . IsValid ( & status - > status ) ) { <nl> + if ( h = = nullptr | | ! h - > handle - > IsValid ( & status - > status ) ) { <nl> status - > status = tensorflow : : errors : : InvalidArgument ( <nl> " The passed in handle is a nullptr " ) ; <nl> return nullptr ; <nl> } <nl> - tensorflow : : TensorHandle * handle = h - > handle . Handle ( ) ; <nl> + tensorflow : : TensorHandle * handle = <nl> + tensorflow : : down_cast < tensorflow : : TensorHandleInterface * > ( h - > handle . get ( ) ) <nl> + - > Handle ( ) ; <nl> <nl> if ( handle - > IsRemote ( ) ) { <nl> status - > status = tensorflow : : errors : : InvalidArgument ( <nl> TFE_TensorHandle * TFE_NewTensorHandleFromDeviceMemory ( <nl> if ( ! status - > status . ok ( ) ) { <nl> return nullptr ; <nl> } <nl> - return new TFE_TensorHandle { tensorflow : : TensorHandleInterface ( ret_handle ) } ; <nl> + return new TFE_TensorHandle { <nl> + std : : make_unique < tensorflow : : TensorHandleInterface > ( ret_handle ) } ; <nl> } <nl> <nl> / / This function will block till the operation that produces ` h ` has <nl> TFE_TensorHandle * TFE_NewTensorHandleFromDeviceMemory ( <nl> / / bytes of the memory pointed to by the device pointer returned above . <nl> size_t TFE_TensorHandleDeviceMemorySize ( TFE_TensorHandle * h , <nl> TF_Status * status ) { <nl> - if ( h = = nullptr | | ! h - > handle . IsValid ( & status - > status ) ) { <nl> + if ( h = = nullptr | | ! h - > handle - > IsValid ( & status - > status ) ) { <nl> status - > status = tensorflow : : errors : : InvalidArgument ( <nl> " The passed in handle is a nullptr " ) ; <nl> return 0 ; <nl> } <nl> - tensorflow : : TensorHandle * handle = h - > handle . Handle ( ) ; <nl> + tensorflow : : TensorHandle * handle = <nl> + tensorflow : : down_cast < tensorflow : : TensorHandleInterface * > ( h - > handle . get ( ) ) <nl> + - > Handle ( ) ; <nl> <nl> if ( handle - > IsRemote ( ) ) { <nl> status - > status = tensorflow : : errors : : InvalidArgument ( <nl> void TFE_OpAddInput ( TFE_Op * op , TFE_TensorHandle * input , TF_Status * status ) { <nl> } <nl> <nl> void TFE_Op : : AddInput ( TFE_TensorHandle * input , TF_Status * status ) { <nl> - operation . AddInput ( input - > handle . Handle ( ) ) ; <nl> + operation . AddInput ( tensorflow : : down_cast < tensorflow : : TensorHandleInterface * > ( <nl> + input - > handle . get ( ) ) <nl> + - > Handle ( ) ) ; <nl> if ( inference_ctx ) { <nl> status - > status = OpInferSingleInputAttrs ( this , input ) ; <nl> } <nl> void TFE_Op : : AddInput ( TFE_TensorHandle * input , TF_Status * status ) { <nl> void TFE_OpAddInputList ( TFE_Op * op , TFE_TensorHandle * * inputs , int num_inputs , <nl> TF_Status * status ) { <nl> for ( int i = 0 ; i < num_inputs ; + + i ) { <nl> - op - > operation . AddInput ( inputs [ i ] - > handle . Handle ( ) ) ; <nl> + op - > operation . AddInput ( <nl> + tensorflow : : down_cast < tensorflow : : TensorHandleInterface * > ( <nl> + inputs [ i ] - > handle . get ( ) ) <nl> + - > Handle ( ) ) ; <nl> } <nl> if ( op - > inference_ctx ) { <nl> status - > status = OpInferInputListAttrs ( op , inputs , num_inputs ) ; <nl> void TFE_Op : : Execute ( TFE_TensorHandle * * retvals , int * num_retvals , <nl> } <nl> for ( int i = 0 ; i < * num_retvals ; + + i ) { <nl> retvals [ i ] = new TFE_TensorHandle { <nl> - tensorflow : : TensorHandleInterface ( handle_retvals [ i ] ) } ; <nl> + std : : make_unique < tensorflow : : TensorHandleInterface > ( handle_retvals [ i ] ) } ; <nl> } <nl> } <nl> <nl> TFE_TensorHandle * TFE_TensorHandleCopyToDevice ( TFE_TensorHandle * h , <nl> if ( ! status - > status . ok ( ) ) { <nl> return nullptr ; <nl> } <nl> - status - > status = tensorflow : : EagerCopyToDevice ( h - > handle . Handle ( ) , context , <nl> - & context - > Executor ( ) , device , <nl> - false , & handle ) ; <nl> + status - > status = tensorflow : : EagerCopyToDevice ( <nl> + tensorflow : : down_cast < tensorflow : : TensorHandleInterface * > ( h - > handle . get ( ) ) <nl> + - > Handle ( ) , <nl> + context , & context - > Executor ( ) , device , false , & handle ) ; <nl> if ( status - > status . ok ( ) ) { <nl> - return new TFE_TensorHandle { tensorflow : : TensorHandleInterface ( handle ) } ; <nl> + return new TFE_TensorHandle { <nl> + std : : make_unique < tensorflow : : TensorHandleInterface > ( handle ) } ; <nl> } <nl> return nullptr ; <nl> } <nl> mmm a / tensorflow / c / eager / c_api_debug . cc <nl> ppp b / tensorflow / c / eager / c_api_debug . cc <nl> extern " C " { <nl> <nl> TF_CAPI_EXPORT extern TFE_TensorDebugInfo * TFE_TensorHandleTensorDebugInfo ( <nl> TFE_TensorHandle * h , TF_Status * status ) { <nl> - return h - > handle . TensorDebugInfo ( & status - > status ) ; <nl> + return h - > handle - > TensorDebugInfo ( & status - > status ) ; <nl> } <nl> <nl> TFE_TensorDebugInfo * tensorflow : : TensorHandleInterface : : TensorDebugInfo ( <nl> mmm a / tensorflow / c / eager / c_api_experimental . cc <nl> ppp b / tensorflow / c / eager / c_api_experimental . cc <nl> limitations under the License . <nl> # include " tensorflow / core / lib / monitoring / gauge . h " <nl> # include " tensorflow / core / lib / monitoring / sampler . h " <nl> # include " tensorflow / core / lib / strings / strcat . h " <nl> + # include " tensorflow / core / platform / casts . h " <nl> # include " tensorflow / core / platform / mutex . h " <nl> # include " tensorflow / core / profiler / rpc / client / capture_profile . h " <nl> # include " tensorflow / core / profiler / rpc / profiler_server . h " <nl> void TFE_OpReset ( TFE_Context * ctx , const char * op_or_function_name , <nl> } <nl> <nl> void TFE_OpConsumeInput ( TFE_Op * op , TFE_TensorHandle * h , TF_Status * status ) { <nl> - op - > operation . ConsumeInput ( h - > handle . Handle ( ) ) ; <nl> + op - > operation . ConsumeInput ( <nl> + tensorflow : : down_cast < tensorflow : : TensorHandleInterface * > ( h - > handle . get ( ) ) <nl> + - > Handle ( ) ) ; <nl> } <nl> <nl> TFE_Profiler * TFE_NewProfiler ( ) { return new TFE_Profiler ( ) ; } <nl> mmm a / tensorflow / c / eager / c_api_internal . h <nl> ppp b / tensorflow / c / eager / c_api_internal . h <nl> struct TFE_TensorHandle { <nl> if ( ! s - > status . ok ( ) ) { <nl> return nullptr ; <nl> } <nl> - return new TFE_TensorHandle { tensorflow : : TensorHandleInterface ( handle ) } ; <nl> + return new TFE_TensorHandle { <nl> + std : : make_unique < tensorflow : : TensorHandleInterface > ( handle ) } ; <nl> } <nl> <nl> - tensorflow : : TensorHandleInterface handle ; <nl> + std : : unique_ptr < AbstractTensorHandleInterface > handle ; <nl> } ; <nl> <nl> struct TFE_TensorDebugInfo { <nl> mmm a / tensorflow / c / eager / tensor_handle_interface . h <nl> ppp b / tensorflow / c / eager / tensor_handle_interface . h <nl> limitations under the License . <nl> # include " tensorflow / c / tf_datatype . h " <nl> # include " tensorflow / core / common_runtime / eager / tensor_handle . h " <nl> <nl> + / / Abstract interface to a TensorHandle . <nl> + / / <nl> + / / A TensorHandle is management class around a Tensor which may track additional <nl> + / / metadata and synchronization . <nl> + / / <nl> + / / This allows us to hide concrete implementations of TensorHandle from header <nl> + / / files . The interface lists the common functionality that must be provided by <nl> + / / any concrete implementation . However , in cases where the true concrete class <nl> + / / is needed a static_cast can be applied . <nl> + class AbstractTensorHandleInterface { <nl> + public : <nl> + virtual ~ AbstractTensorHandleInterface ( ) { } <nl> + <nl> + / / Check if the handle is in a valid initialized state . <nl> + virtual bool IsValid ( tensorflow : : Status * status ) const = 0 ; <nl> + / / Returns tensor dtype . <nl> + virtual TF_DataType DataType ( ) const = 0 ; <nl> + / / Returns number of dimensions . <nl> + virtual int NumDims ( tensorflow : : Status * status ) const = 0 ; <nl> + / / Returns number of elements across all dimensions . <nl> + virtual int64_t NumElements ( tensorflow : : Status * status ) const = 0 ; <nl> + / / Returns size of specified dimension <nl> + virtual int64_t Dim ( int dim_index , tensorflow : : Status * status ) const = 0 ; <nl> + <nl> + / / Returns the device which created the handle . <nl> + virtual const char * DeviceName ( tensorflow : : Status * status ) const = 0 ; <nl> + / / Returns the device where the tensor was placed . <nl> + virtual const char * BackingDeviceName ( tensorflow : : Status * status ) const = 0 ; <nl> + / / Returns a tensor for the handle . If tensor is remote , it will be copied . <nl> + virtual TF_Tensor * Resolve ( tensorflow : : Status * status ) = 0 ; <nl> + / / Returns debug information about the tensor . <nl> + virtual TFE_TensorDebugInfo * TensorDebugInfo ( tensorflow : : Status * status ) = 0 ; <nl> + <nl> + / / Return a copy of the handle . <nl> + virtual AbstractTensorHandleInterface * Copy ( ) = 0 ; <nl> + } ; <nl> + <nl> namespace tensorflow { <nl> <nl> - class TensorHandleInterface { <nl> + class TensorHandleInterface : public AbstractTensorHandleInterface { <nl> public : <nl> explicit TensorHandleInterface ( TensorHandle * h ) : handle_ ( h ) { } <nl> - ~ TensorHandleInterface ( ) ; <nl> - <nl> - bool IsValid ( Status * status ) const ; <nl> - TF_DataType DataType ( ) const ; <nl> - int NumDims ( Status * status ) const ; <nl> - int64_t NumElements ( Status * status ) const ; <nl> - int64_t Dim ( int dim_index , Status * status ) const ; <nl> - <nl> - const char * DeviceName ( Status * status ) const ; <nl> - const char * BackingDeviceName ( Status * status ) const ; <nl> - TFE_TensorHandle * Copy ( ) ; <nl> - TF_Tensor * Resolve ( Status * status ) ; <nl> - TFE_TensorDebugInfo * TensorDebugInfo ( Status * status ) ; <nl> + ~ TensorHandleInterface ( ) override ; <nl> + <nl> + bool IsValid ( Status * status ) const override ; <nl> + TF_DataType DataType ( ) const override ; <nl> + int NumDims ( Status * status ) const override ; <nl> + int64_t NumElements ( Status * status ) const override ; <nl> + int64_t Dim ( int dim_index , Status * status ) const override ; <nl> + <nl> + const char * DeviceName ( Status * status ) const override ; <nl> + const char * BackingDeviceName ( Status * status ) const override ; <nl> + TF_Tensor * Resolve ( Status * status ) override ; <nl> + TFE_TensorDebugInfo * TensorDebugInfo ( Status * status ) override ; <nl> + <nl> + AbstractTensorHandleInterface * Copy ( ) override ; <nl> <nl> / / TODO ( gjn ) : This is not a very generic interface , but is needed for specific <nl> / / use cases . <nl> mmm a / tensorflow / c / tf_tensor . cc <nl> ppp b / tensorflow / c / tf_tensor . cc <nl> TF_Tensor * TF_NewTensor ( TF_DataType dtype , const int64_t * dims , int num_dims , <nl> buf = new TF_ManagedBuffer ( data , len , deallocator , deallocator_arg ) ; <nl> } <nl> <nl> - TF_Tensor * ret = new TF_Tensor { tensorflow : : TensorInterface ( <nl> + / / TODO ( gjn ) : Make the choice of interface a compile - time configuration . <nl> + tensorflow : : TensorInterface ret ( <nl> Tensor ( static_cast < tensorflow : : DataType > ( dtype ) , <nl> - tensorflow : : TensorShape ( dimvec ) , buf ) ) } ; <nl> + tensorflow : : TensorShape ( dimvec ) , buf ) ) ; <nl> buf - > Unref ( ) ; <nl> size_t elem_size = TF_DataTypeSize ( dtype ) ; <nl> - if ( elem_size > 0 & & len < ( elem_size * ret - > tensor . NumElements ( ) ) ) { <nl> - delete ret ; <nl> + if ( elem_size > 0 & & len < ( elem_size * ret . NumElements ( ) ) ) { <nl> return nullptr ; <nl> } <nl> - return ret ; <nl> + return new TF_Tensor { std : : make_unique < tensorflow : : TensorInterface > ( ret ) } ; <nl> } <nl> <nl> TF_Tensor * TF_TensorMaybeMove ( TF_Tensor * t ) { <nl> - return t - > tensor . CanMove ( ) ? t : nullptr ; <nl> + return t - > tensor - > CanMove ( ) ? t : nullptr ; <nl> } <nl> <nl> void TF_DeleteTensor ( TF_Tensor * t ) { delete t ; } <nl> <nl> - TF_DataType TF_TensorType ( const TF_Tensor * t ) { return t - > tensor . Type ( ) ; } <nl> + TF_DataType TF_TensorType ( const TF_Tensor * t ) { return t - > tensor - > Type ( ) ; } <nl> <nl> - int TF_NumDims ( const TF_Tensor * t ) { return t - > tensor . NumDims ( ) ; } <nl> + int TF_NumDims ( const TF_Tensor * t ) { return t - > tensor - > NumDims ( ) ; } <nl> <nl> int64_t TF_Dim ( const TF_Tensor * t , int dim_index ) { <nl> - return t - > tensor . Dim ( dim_index ) ; <nl> + return t - > tensor - > Dim ( dim_index ) ; <nl> } <nl> <nl> - size_t TF_TensorByteSize ( const TF_Tensor * t ) { return t - > tensor . ByteSize ( ) ; } <nl> + size_t TF_TensorByteSize ( const TF_Tensor * t ) { return t - > tensor - > ByteSize ( ) ; } <nl> <nl> - void * TF_TensorData ( const TF_Tensor * t ) { return t - > tensor . Data ( ) ; } <nl> + void * TF_TensorData ( const TF_Tensor * t ) { return t - > tensor - > Data ( ) ; } <nl> <nl> int64_t TF_TensorElementCount ( const TF_Tensor * t ) { <nl> int64_t result = 1 ; <nl> void TF_TensorBitcastFrom ( const TF_Tensor * from , TF_DataType type , <nl> int num_new_dims , TF_Status * status ) { <nl> TF_SetStatus ( status , TF_OK , " " ) ; <nl> Status cc_status ( <nl> - to - > tensor . BitcastFrom ( from - > tensor , type , new_dims , num_new_dims ) ) ; <nl> + static_cast < tensorflow : : TensorInterface * > ( to - > tensor . get ( ) ) <nl> + - > BitcastFrom ( * static_cast < const tensorflow : : TensorInterface * > ( <nl> + from - > tensor . get ( ) ) , <nl> + type , new_dims , num_new_dims ) ) ; <nl> Set_TF_Status_from_Status ( status , cc_status ) ; <nl> } <nl> <nl> TF_Tensor * TF_TensorFromTensor ( const tensorflow : : Tensor & src , Status * status ) { <nl> return t ; <nl> } <nl> if ( src . dtype ( ) ! = tensorflow : : DT_STRING ) { <nl> - auto * result = new TF_Tensor ( ) ; <nl> - if ( ! result - > tensor . CopyFrom ( src , src . shape ( ) ) ) { <nl> - delete result ; <nl> + Tensor tensor ; <nl> + if ( ! tensor . CopyFrom ( src , src . shape ( ) ) ) { <nl> return nullptr ; <nl> } <nl> - return result ; <nl> + return new TF_Tensor { std : : make_unique < tensorflow : : TensorInterface > ( tensor ) } ; <nl> } <nl> / / DT_STRING tensors require a copying since TF_Tensor . buffer expects a flatly <nl> / / encoded sequence of strings . <nl> TF_Tensor * TF_TensorFromTensor ( const tensorflow : : Tensor & src , Status * status ) { <nl> } <nl> <nl> Status TF_TensorToTensor ( const TF_Tensor * src , Tensor * dst ) { <nl> - return src - > tensor . ToTensor ( dst ) ; <nl> + return static_cast < const tensorflow : : TensorInterface * > ( src - > tensor . get ( ) ) <nl> + - > ToTensor ( dst ) ; <nl> } <nl> <nl> Status TensorInterface : : ToTensor ( Tensor * dst ) const { <nl> Status TensorInterface : : ToTensor ( Tensor * dst ) const { <nl> return Status : : OK ( ) ; <nl> } <nl> <nl> - bool TensorInterface : : CopyFrom ( const Tensor & other , const TensorShape & shape ) { <nl> - return tensor_ . CopyFrom ( other , shape ) ; <nl> - } <nl> - <nl> bool TensorInterface : : IsAligned ( ) const { return tensor_ . IsAligned ( ) ; } <nl> <nl> } / / namespace tensorflow <nl> <nl> - bool TF_TensorIsAligned ( const TF_Tensor * t ) { return t - > tensor . IsAligned ( ) ; } <nl> + bool TF_TensorIsAligned ( const TF_Tensor * t ) { return t - > tensor - > IsAligned ( ) ; } <nl> mmm a / tensorflow / c / tf_tensor_internal . h <nl> ppp b / tensorflow / c / tf_tensor_internal . h <nl> limitations under the License . <nl> / / passed to or returned from C functions * by pointer * . Otherwise , changes to <nl> / / its internal structure will break the C API ' s binary interface . <nl> typedef struct TF_Tensor { <nl> - tensorflow : : TensorInterface tensor ; <nl> + std : : unique_ptr < AbstractTensorInterface > tensor ; <nl> } TF_Tensor ; <nl> <nl> class TF_ManagedBuffer : public tensorflow : : TensorBuffer { <nl> mmm a / tensorflow / core / framework / tensor_interface . h <nl> ppp b / tensorflow / core / framework / tensor_interface . h <nl> limitations under the License . <nl> # include " tensorflow / c / tf_status . h " <nl> # include " tensorflow / core / framework / tensor . h " <nl> <nl> - / / Internal structures used by the C API . These are likely to change and should <nl> - / / not be depended on . <nl> + / / Abstract interface to a Tensor . <nl> + / / <nl> + / / This allows us to hide concrete implementations of Tensor from header <nl> + / / files . The interface lists the common functionality that must be provided by <nl> + / / any concrete implementation . However , in cases where the true concrete class <nl> + / / is needed a static_cast can be applied . <nl> + class AbstractTensorInterface { <nl> + public : <nl> + virtual ~ AbstractTensorInterface ( ) { } <nl> + <nl> + / / Returns tensor dtype . <nl> + virtual TF_DataType Type ( ) const = 0 ; <nl> + / / Returns number of dimensions . <nl> + virtual int NumDims ( ) const = 0 ; <nl> + / / Returns size of specified dimension <nl> + virtual int64_t Dim ( int dim_index ) const = 0 ; <nl> + / / Returns number of elements across all dimensions . <nl> + virtual int64_t NumElements ( ) const = 0 ; <nl> + / / Return size in bytes of the Tensor <nl> + virtual size_t ByteSize ( ) const = 0 ; <nl> + / / Returns a pointer to tensor data <nl> + virtual void * Data ( ) const = 0 ; <nl> + <nl> + / / Returns if the tensor is aligned <nl> + virtual bool IsAligned ( ) const = 0 ; <nl> + / / Returns if their is sole ownership of this Tensor and thus it can be moved . <nl> + virtual bool CanMove ( ) const = 0 ; <nl> + } ; <nl> <nl> namespace tensorflow { <nl> <nl> - class TensorInterface { <nl> + class TensorInterface : public AbstractTensorInterface { <nl> public : <nl> TensorInterface ( ) { } <nl> explicit TensorInterface ( Tensor t ) : tensor_ ( std : : move ( t ) ) { } <nl> + ~ TensorInterface ( ) override { } <nl> <nl> - TF_DataType Type ( ) const ; <nl> - int NumDims ( ) const ; <nl> - int64_t Dim ( int dim_index ) const ; <nl> - int64_t NumElements ( ) const ; <nl> - size_t ByteSize ( ) const ; <nl> - void * Data ( ) const ; <nl> - bool IsAligned ( ) const ; <nl> + TF_DataType Type ( ) const override ; <nl> + int NumDims ( ) const override ; <nl> + int64_t Dim ( int dim_index ) const override ; <nl> + int64_t NumElements ( ) const override ; <nl> + size_t ByteSize ( ) const override ; <nl> + void * Data ( ) const override ; <nl> + bool IsAligned ( ) const override ; <nl> + bool CanMove ( ) const override ; <nl> <nl> Status ToTensor ( Tensor * dst ) const ; <nl> - bool CopyFrom ( const Tensor & other , const TensorShape & shape ) ; <nl> Status BitcastFrom ( const TensorInterface & from , TF_DataType type , <nl> const int64_t * new_dims , int num_new_dims ) ; <nl> <nl> - bool CanMove ( ) const ; <nl> - <nl> private : <nl> Tensor tensor_ ; <nl> } ; <nl> mmm a / tensorflow / python / eager / pywrap_tensor . cc <nl> ppp b / tensorflow / python / eager / pywrap_tensor . cc <nl> TFE_TensorHandle * NumpyToTFE_TensorHandle ( TFE_Context * ctx , PyObject * obj ) { <nl> . c_str ( ) ) ; <nl> return nullptr ; <nl> } <nl> - return new TFE_TensorHandle { tensorflow : : TensorHandleInterface ( handle ) } ; <nl> + return new TFE_TensorHandle { <nl> + std : : make_unique < tensorflow : : TensorHandleInterface > ( handle ) } ; <nl> } <nl> <nl> / / Convert a TFE_TensorHandle to a Python numpy . ndarray object . <nl> mmm a / tensorflow / python / eager / pywrap_tensor_conversion . cc <nl> ppp b / tensorflow / python / eager / pywrap_tensor_conversion . cc <nl> TFE_TensorHandle * TFE_TensorHandleCache : : Lookup ( <nl> <nl> scalar_cache_hits - > GetCell ( ) - > IncrementBy ( 1 ) ; <nl> auto * h = it - > second ; <nl> - return h - > handle . Copy ( ) ; <nl> + return new TFE_TensorHandle { <nl> + std : : unique_ptr < AbstractTensorHandleInterface > ( h - > handle - > Copy ( ) ) } ; <nl> } <nl> <nl> void TFE_TensorHandleCache : : Insert ( PyObject * value , tensorflow : : DataType dtype , <nl> absl : : string_view device_name , <nl> TFE_TensorHandle * h ) { <nl> Py_INCREF ( value ) ; <nl> - cache . emplace ( Key { PyObjectPtr { value } , dtype , device_name } , h - > handle . Copy ( ) ) ; <nl> + cache . emplace ( <nl> + Key { PyObjectPtr { value } , dtype , device_name } , <nl> + new TFE_TensorHandle { <nl> + std : : unique_ptr < AbstractTensorHandleInterface > ( h - > handle - > Copy ( ) ) } ) ; <nl> } <nl> <nl> void TFE_TensorHandleCache : : Clear ( ) { <nl> mmm a / tensorflow / python / eager / pywrap_tfe_src . cc <nl> ppp b / tensorflow / python / eager / pywrap_tfe_src . cc <nl> static PyTapeTensor TapeTensorFromTensor ( PyObject * tensor ) { <nl> TFE_TensorHandle * t = EagerTensor_Handle ( tensor ) ; <nl> tensorflow : : int64 id = PyEagerTensor_ID ( tensor ) ; <nl> tensorflow : : DataType dtype = <nl> - static_cast < tensorflow : : DataType > ( t - > handle . DataType ( ) ) ; <nl> + static_cast < tensorflow : : DataType > ( t - > handle - > DataType ( ) ) ; <nl> if ( dtype = = tensorflow : : DT_VARIANT ) { <nl> return PyTapeTensor ( id , dtype , tensor ) ; <nl> } <nl> <nl> tensorflow : : Status status ; <nl> tensorflow : : TensorShape tensor_shape ; <nl> - int num_dims = t - > handle . NumDims ( & status ) ; <nl> + int num_dims = t - > handle - > NumDims ( & status ) ; <nl> if ( status . ok ( ) ) { <nl> for ( int i = 0 ; i < num_dims ; + + i ) { <nl> - tensorflow : : int64 dim_size = t - > handle . Dim ( i , & status ) ; <nl> + tensorflow : : int64 dim_size = t - > handle - > Dim ( i , & status ) ; <nl> if ( ! status . ok ( ) ) break ; <nl> tensor_shape . AddDim ( dim_size ) ; <nl> } <nl> static PyTapeTensor TapeTensorFromTensor ( PyObject * tensor ) { <nl> <nl> auto l = MakeIntList ( shape_tuple . get ( ) ) ; <nl> / / Replace - 1 , which represents accidental Nones which can occur in graph mode <nl> - / / and can cause errors in shape cosntruction with 0s . <nl> + / / and can cause errors in shape construction with 0s . <nl> for ( auto & c : l ) { <nl> if ( c < 0 ) { <nl> c = 0 ; <nl> tensorflow : : Status TFE_Py_EncodeTensor ( PyObject * arg , <nl> TFE_TensorHandle * t = EagerTensor_Handle ( arg ) ; <nl> <nl> absl : : StrAppend ( & result - > str , kDType , <nl> - static_cast < tensorflow : : DataType > ( t - > handle . DataType ( ) ) ) ; <nl> + static_cast < tensorflow : : DataType > ( t - > handle - > DataType ( ) ) ) ; <nl> absl : : StrAppend ( & result - > str , kShape ) ; <nl> <nl> tensorflow : : Status status ; <nl> - int num_dims = t - > handle . NumDims ( & status ) ; <nl> + int num_dims = t - > handle - > NumDims ( & status ) ; <nl> if ( ! status . ok ( ) ) return status ; <nl> <nl> if ( include_tensor_ranks_only ) { <nl> absl : : StrAppend ( & result - > str , num_dims ) ; <nl> } else { <nl> for ( int i = 0 ; i < num_dims ; + + i ) { <nl> - tensorflow : : int64 dim_size = t - > handle . Dim ( i , & status ) ; <nl> + tensorflow : : int64 dim_size = t - > handle - > Dim ( i , & status ) ; <nl> if ( ! status . ok ( ) ) return status ; <nl> absl : : StrAppend ( & result - > str , dim_size , kShapeDelim ) ; <nl> } <nl> mmm a / tensorflow / python / lib / core / py_func . cc <nl> ppp b / tensorflow / python / lib / core / py_func . cc <nl> limitations under the License . <nl> # include " tensorflow / core / lib / core / errors . h " <nl> # include " tensorflow / core / lib / core / status . h " <nl> # include " tensorflow / core / lib / core / threadpool . h " <nl> + # include " tensorflow / core / platform / casts . h " <nl> # include " tensorflow / core / platform / macros . h " <nl> # include " tensorflow / core / platform / mutex . h " <nl> # include " tensorflow / core / platform / types . h " <nl> Status MakeArgTuple ( const PyCall * call , EagerContext * ctx , PyObject * * tuple ) { <nl> TensorHandle * handle ; <nl> TF_RETURN_IF_ERROR ( TensorHandle : : CreateLocalHandle ( <nl> t , ctx - > CanonicalDevice ( device ) , ctx , & handle ) ) ; <nl> - arg = EagerTensorFromHandle ( <nl> - new TFE_TensorHandle { tensorflow : : TensorHandleInterface ( handle ) } ) ; <nl> + arg = EagerTensorFromHandle ( new TFE_TensorHandle { <nl> + std : : make_unique < tensorflow : : TensorHandleInterface > ( handle ) } ) ; <nl> if ( arg = = nullptr ) { <nl> Py_DECREF ( lst ) ; <nl> return errors : : Internal ( " Unable to procure EagerTensor from Tensor . " ) ; <nl> bool IsSingleNone ( PyObject * obj ) { <nl> tensorflow : : Status ExtractTensorFromEagerTensor ( const PyObject * eager_tensor , <nl> const Device * expected_device , <nl> const Tensor * * output_tensor ) { <nl> - auto handle = EagerTensor_Handle ( eager_tensor ) - > handle . Handle ( ) ; <nl> + auto handle = down_cast < tensorflow : : TensorHandleInterface * > ( <nl> + EagerTensor_Handle ( eager_tensor ) - > handle . get ( ) ) <nl> + - > Handle ( ) ; <nl> Device * actual_device = handle - > device ( ) ; <nl> TF_RETURN_IF_ERROR ( handle - > Tensor ( output_tensor ) ) ; <nl> / / actual_device may be nullptr , which implies local CPU . <nl> mmm a / tensorflow / python / lib / core / py_seq_tensor . cc <nl> ppp b / tensorflow / python / lib / core / py_seq_tensor . cc <nl> struct Converter { <nl> if ( ! status . ok ( ) ) { <nl> return status ; <nl> } <nl> - * h = new TFE_TensorHandle { TensorHandleInterface ( handle ) } ; <nl> + * h = new TFE_TensorHandle { std : : make_unique < TensorHandleInterface > ( handle ) } ; <nl> return Status : : OK ( ) ; <nl> } <nl> } ; <nl> TFE_TensorHandle * PySeqToTFE_TensorHandle ( TFE_Context * ctx , PyObject * obj , <nl> PyErr_SetString ( PyExc_ValueError , status . error_message ( ) . c_str ( ) ) ; <nl> return nullptr ; <nl> } <nl> - return new TFE_TensorHandle { TensorHandleInterface ( h ) } ; <nl> + return new TFE_TensorHandle { std : : make_unique < TensorHandleInterface > ( h ) } ; <nl> } <nl> <nl> default : <nl> | Make tensor & handle inherit from abstract class | tensorflow/tensorflow | 3dec91764cd0661bdc97b6a9b600982f4f3937b2 | 2020-01-15T01:00:15Z |
mmm a / tensorflow / tools / api / golden / v1 / tensorflow . raw_ops . pbtxt <nl> ppp b / tensorflow / tools / api / golden / v1 / tensorflow . raw_ops . pbtxt <nl> tf_module { <nl> } <nl> member_method { <nl> name : " QuantizedMatMulWithBias " <nl> - argspec : " args = [ \ ' a \ ' , \ ' b \ ' , \ ' bias \ ' , \ ' min_a \ ' , \ ' max_a \ ' , \ ' min_b \ ' , \ ' max_b \ ' , \ ' Toutput \ ' , \ ' transpose_a \ ' , \ ' transpose_b \ ' , \ ' input_quant_mode \ ' ] , varargs = None , keywords = None , defaults = None " <nl> + argspec : " args = [ \ ' a \ ' , \ ' b \ ' , \ ' bias \ ' , \ ' min_a \ ' , \ ' max_a \ ' , \ ' min_b \ ' , \ ' max_b \ ' , \ ' Toutput \ ' , \ ' transpose_a \ ' , \ ' transpose_b \ ' , \ ' input_quant_mode \ ' , \ ' name \ ' ] , varargs = None , keywords = None , defaults = [ \ " < dtype : \ ' qint32 \ ' > \ " , \ ' False \ ' , \ ' False \ ' , \ ' MIN_FIRST \ ' , \ ' None \ ' ] , " <nl> } <nl> member_method { <nl> name : " QuantizedMatMulWithBiasAndRelu " <nl> - argspec : " args = [ \ ' a \ ' , \ ' b \ ' , \ ' bias \ ' , \ ' min_a \ ' , \ ' max_a \ ' , \ ' min_b \ ' , \ ' max_b \ ' , \ ' Toutput \ ' , \ ' transpose_a \ ' , \ ' transpose_b \ ' , \ ' input_quant_mode \ ' ] , varargs = None , keywords = None , defaults = None " <nl> + argspec : " args = [ \ ' a \ ' , \ ' b \ ' , \ ' bias \ ' , \ ' min_a \ ' , \ ' max_a \ ' , \ ' min_b \ ' , \ ' max_b \ ' , \ ' Toutput \ ' , \ ' transpose_a \ ' , \ ' transpose_b \ ' , \ ' input_quant_mode \ ' , \ ' name \ ' ] , varargs = None , keywords = None , defaults = [ \ " < dtype : \ ' qint32 \ ' > \ " , \ ' False \ ' , \ ' False \ ' , \ ' MIN_FIRST \ ' , \ ' None \ ' ] , " <nl> } <nl> member_method { <nl> name : " QuantizedMatMulWithBiasAndReluAndRequantize " <nl> - argspec : " args = [ \ ' a \ ' , \ ' b \ ' , \ ' bias \ ' , \ ' min_a \ ' , \ ' max_a \ ' , \ ' min_b \ ' , \ ' max_b \ ' , \ ' min_freezed_output \ ' , \ ' max_freezed_output \ ' , \ ' Toutput \ ' , \ ' transpose_a \ ' , \ ' transpose_b \ ' , \ ' input_quant_mode \ ' ] , varargs = None , keywords = None , defaults = None " <nl> + argspec : " args = [ \ ' a \ ' , \ ' b \ ' , \ ' bias \ ' , \ ' min_a \ ' , \ ' max_a \ ' , \ ' min_b \ ' , \ ' max_b \ ' , \ ' min_freezed_output \ ' , \ ' max_freezed_output \ ' , \ ' Toutput \ ' , \ ' transpose_a \ ' , \ ' transpose_b \ ' , \ ' input_quant_mode \ ' , \ ' name \ ' ] , varargs = None , keywords = None , defaults = [ \ " < dtype : \ ' quint8 \ ' > \ " , \ ' False \ ' , \ ' False \ ' , \ ' MIN_FIRST \ ' , \ ' None \ ' ] , " <nl> } <nl> member_method { <nl> name : " QuantizedMaxPool " <nl> mmm a / tensorflow / tools / api / golden / v1 / tensorflow . train . - looper - thread . pbtxt <nl> ppp b / tensorflow / tools / api / golden / v1 / tensorflow . train . - looper - thread . pbtxt <nl> tf_class { <nl> } <nl> member_method { <nl> name : " join " <nl> - argspec : " args = [ \ ' self \ ' , \ ' timeout \ ' ] , varargs = None , keywords = None , defaults = [ \ ' None \ ' ] , " <nl> + argspec : " args = [ \ ' self \ ' , \ ' timeout \ ' , \ ' balancing \ ' ] , varargs = None , keywords = None , defaults = [ \ ' None \ ' , \ ' True \ ' ] , " <nl> } <nl> member_method { <nl> name : " loop " <nl> mmm a / tensorflow / tools / api / golden / v2 / tensorflow . raw_ops . pbtxt <nl> ppp b / tensorflow / tools / api / golden / v2 / tensorflow . raw_ops . pbtxt <nl> tf_module { <nl> } <nl> member_method { <nl> name : " QuantizedMatMulWithBias " <nl> - argspec : " args = [ \ ' a \ ' , \ ' b \ ' , \ ' bias \ ' , \ ' min_a \ ' , \ ' max_a \ ' , \ ' min_b \ ' , \ ' max_b \ ' , \ ' Toutput \ ' , \ ' transpose_a \ ' , \ ' transpose_b \ ' , \ ' input_quant_mode \ ' ] , varargs = None , keywords = None , defaults = None " <nl> + argspec : " args = [ \ ' a \ ' , \ ' b \ ' , \ ' bias \ ' , \ ' min_a \ ' , \ ' max_a \ ' , \ ' min_b \ ' , \ ' max_b \ ' , \ ' Toutput \ ' , \ ' transpose_a \ ' , \ ' transpose_b \ ' , \ ' input_quant_mode \ ' , \ ' name \ ' ] , varargs = None , keywords = None , defaults = [ \ " < dtype : \ ' qint32 \ ' > \ " , \ ' False \ ' , \ ' False \ ' , \ ' MIN_FIRST \ ' , \ ' None \ ' ] , " <nl> } <nl> member_method { <nl> name : " QuantizedMatMulWithBiasAndRelu " <nl> - argspec : " args = [ \ ' a \ ' , \ ' b \ ' , \ ' bias \ ' , \ ' min_a \ ' , \ ' max_a \ ' , \ ' min_b \ ' , \ ' max_b \ ' , \ ' Toutput \ ' , \ ' transpose_a \ ' , \ ' transpose_b \ ' , \ ' input_quant_mode \ ' ] , varargs = None , keywords = None , defaults = None " <nl> + argspec : " args = [ \ ' a \ ' , \ ' b \ ' , \ ' bias \ ' , \ ' min_a \ ' , \ ' max_a \ ' , \ ' min_b \ ' , \ ' max_b \ ' , \ ' Toutput \ ' , \ ' transpose_a \ ' , \ ' transpose_b \ ' , \ ' input_quant_mode \ ' , \ ' name \ ' ] , varargs = None , keywords = None , defaults = [ \ " < dtype : \ ' qint32 \ ' > \ " , \ ' False \ ' , \ ' False \ ' , \ ' MIN_FIRST \ ' , \ ' None \ ' ] , " <nl> } <nl> member_method { <nl> name : " QuantizedMatMulWithBiasAndReluAndRequantize " <nl> - argspec : " args = [ \ ' a \ ' , \ ' b \ ' , \ ' bias \ ' , \ ' min_a \ ' , \ ' max_a \ ' , \ ' min_b \ ' , \ ' max_b \ ' , \ ' min_freezed_output \ ' , \ ' max_freezed_output \ ' , \ ' Toutput \ ' , \ ' transpose_a \ ' , \ ' transpose_b \ ' , \ ' input_quant_mode \ ' ] , varargs = None , keywords = None , defaults = None " <nl> + argspec : " args = [ \ ' a \ ' , \ ' b \ ' , \ ' bias \ ' , \ ' min_a \ ' , \ ' max_a \ ' , \ ' min_b \ ' , \ ' max_b \ ' , \ ' min_freezed_output \ ' , \ ' max_freezed_output \ ' , \ ' Toutput \ ' , \ ' transpose_a \ ' , \ ' transpose_b \ ' , \ ' input_quant_mode \ ' , \ ' name \ ' ] , varargs = None , keywords = None , defaults = [ \ " < dtype : \ ' quint8 \ ' > \ " , \ ' False \ ' , \ ' False \ ' , \ ' MIN_FIRST \ ' , \ ' None \ ' ] , " <nl> } <nl> member_method { <nl> name : " QuantizedMaxPool " <nl> mmm a / tensorflow / tools / api / golden / v2 / tensorflow . summary . pbtxt <nl> ppp b / tensorflow / tools / api / golden / v2 / tensorflow . summary . pbtxt <nl> tf_module { <nl> } <nl> member_method { <nl> name : " audio " <nl> - argspec : " args = [ \ ' name \ ' , \ ' data \ ' , \ ' sample_rate \ ' , \ ' step \ ' , \ ' max_outputs \ ' , \ ' encoding \ ' , \ ' description \ ' ] , varargs = None , keywords = None , defaults = [ \ ' None \ ' , \ ' 3 \ ' , \ ' None \ ' , \ ' None \ ' ] , " <nl> + argspec : " args = [ \ ' name \ ' , \ ' data \ ' , \ ' sample_rate \ ' , \ ' step \ ' , \ ' max_outputs \ ' , \ ' encoding \ ' , \ ' description \ ' ] , varargs = None , keywords = None , defaults = [ \ ' 3 \ ' , \ ' None \ ' , \ ' None \ ' ] , " <nl> } <nl> member_method { <nl> name : " create_file_writer " <nl> tf_module { <nl> } <nl> member_method { <nl> name : " histogram " <nl> - argspec : " args = [ \ ' name \ ' , \ ' data \ ' , \ ' step \ ' , \ ' buckets \ ' , \ ' description \ ' ] , varargs = None , keywords = None , defaults = [ \ ' None \ ' , \ ' None \ ' , \ ' None \ ' ] , " <nl> + argspec : " args = [ \ ' name \ ' , \ ' data \ ' , \ ' step \ ' , \ ' buckets \ ' , \ ' description \ ' ] , varargs = None , keywords = None , defaults = [ \ ' None \ ' , \ ' None \ ' ] , " <nl> } <nl> member_method { <nl> name : " image " <nl> - argspec : " args = [ \ ' name \ ' , \ ' data \ ' , \ ' step \ ' , \ ' max_outputs \ ' , \ ' description \ ' ] , varargs = None , keywords = None , defaults = [ \ ' None \ ' , \ ' 3 \ ' , \ ' None \ ' ] , " <nl> + argspec : " args = [ \ ' name \ ' , \ ' data \ ' , \ ' step \ ' , \ ' max_outputs \ ' , \ ' description \ ' ] , varargs = None , keywords = None , defaults = [ \ ' 3 \ ' , \ ' None \ ' ] , " <nl> } <nl> member_method { <nl> name : " record_if " <nl> tf_module { <nl> } <nl> member_method { <nl> name : " scalar " <nl> - argspec : " args = [ \ ' name \ ' , \ ' data \ ' , \ ' step \ ' , \ ' description \ ' ] , varargs = None , keywords = None , defaults = [ \ ' None \ ' , \ ' None \ ' ] , " <nl> + argspec : " args = [ \ ' name \ ' , \ ' data \ ' , \ ' step \ ' , \ ' description \ ' ] , varargs = None , keywords = None , defaults = [ \ ' None \ ' ] , " <nl> } <nl> member_method { <nl> name : " text " <nl> - argspec : " args = [ \ ' name \ ' , \ ' data \ ' , \ ' step \ ' , \ ' description \ ' ] , varargs = None , keywords = None , defaults = [ \ ' None \ ' , \ ' None \ ' ] , " <nl> + argspec : " args = [ \ ' name \ ' , \ ' data \ ' , \ ' step \ ' , \ ' description \ ' ] , varargs = None , keywords = None , defaults = [ \ ' None \ ' ] , " <nl> } <nl> member_method { <nl> name : " trace_export " <nl> | Updated API golden files . | tensorflow/tensorflow | 224447cd783d57f4098d50c293bfb2587e96d31f | 2019-05-29T00:32:35Z |
mmm a / drivers / gles2 / shaders / canvas . glsl <nl> ppp b / drivers / gles2 / shaders / canvas . glsl <nl> <nl> [ vertex ] <nl> <nl> # ifdef USE_GLES_OVER_GL <nl> + # define lowp <nl> # define mediump <nl> # define highp <nl> # else <nl> uniform vec4 src_rect ; <nl> <nl> uniform highp float time ; <nl> <nl> - <nl> - <nl> # ifdef USE_LIGHTING <nl> <nl> / / light matrices <nl> const bool at_light_pass = true ; <nl> const bool at_light_pass = false ; <nl> # endif <nl> <nl> - <nl> / * clang - format off * / <nl> <nl> VERTEX_SHADER_GLOBALS <nl> vec2 select ( vec2 a , vec2 b , bvec2 c ) { <nl> <nl> void main ( ) { <nl> <nl> - <nl> vec4 color = color_attrib ; <nl> <nl> # ifdef USE_INSTANCING <nl> VERTEX_SHADER_CODE <nl> # endif <nl> <nl> # endif <nl> - <nl> } <nl> <nl> / * clang - format off * / <nl> [ fragment ] <nl> <nl> # ifdef USE_GLES_OVER_GL <nl> + # define lowp <nl> # define mediump <nl> # define highp <nl> # else <nl> const bool at_light_pass = false ; <nl> <nl> uniform bool use_default_normal ; <nl> <nl> - <nl> / * clang - format off * / <nl> <nl> FRAGMENT_SHADER_GLOBALS <nl> mmm a / drivers / gles2 / shaders / canvas_shadow . glsl <nl> ppp b / drivers / gles2 / shaders / canvas_shadow . glsl <nl> <nl> [ vertex ] <nl> <nl> # ifdef USE_GLES_OVER_GL <nl> + # define lowp <nl> # define mediump <nl> # define highp <nl> # else <nl> void main ( ) { <nl> [ fragment ] <nl> <nl> # ifdef USE_GLES_OVER_GL <nl> + # define lowp <nl> # define mediump <nl> # define highp <nl> # else <nl> precision mediump int ; <nl> varying highp vec4 position_interp ; <nl> / * clang - format on * / <nl> <nl> - <nl> void main ( ) { <nl> <nl> highp float depth = ( ( position_interp . z / position_interp . w ) + 1 . 0 ) * 0 . 5 + 0 . 0 ; / / bias <nl> mmm a / drivers / gles2 / shaders / copy . glsl <nl> ppp b / drivers / gles2 / shaders / copy . glsl <nl> <nl> [ vertex ] <nl> <nl> # ifdef USE_GLES_OVER_GL <nl> + # define lowp <nl> # define mediump <nl> # define highp <nl> # else <nl> void main ( ) { <nl> # define M_PI 3 . 14159265359 <nl> <nl> # ifdef USE_GLES_OVER_GL <nl> + # define lowp <nl> # define mediump <nl> # define highp <nl> # else <nl> mmm a / drivers / gles2 / shaders / cube_to_dp . glsl <nl> ppp b / drivers / gles2 / shaders / cube_to_dp . glsl <nl> <nl> [ vertex ] <nl> <nl> # ifdef USE_GLES_OVER_GL <nl> + # define lowp <nl> # define mediump <nl> # define highp <nl> # else <nl> void main ( ) { <nl> [ fragment ] <nl> <nl> # ifdef USE_GLES_OVER_GL <nl> + # define lowp <nl> # define mediump <nl> # define highp <nl> # else <nl> mmm a / drivers / gles2 / shaders / cubemap_filter . glsl <nl> ppp b / drivers / gles2 / shaders / cubemap_filter . glsl <nl> <nl> [ vertex ] <nl> <nl> # ifdef USE_GLES_OVER_GL <nl> + # define lowp <nl> # define mediump <nl> # define highp <nl> # else <nl> void main ( ) { <nl> # endif <nl> <nl> # ifdef USE_GLES_OVER_GL <nl> + # define lowp <nl> # define mediump <nl> # define highp <nl> # else <nl> mmm a / drivers / gles2 / shaders / lens_distorted . glsl <nl> ppp b / drivers / gles2 / shaders / lens_distorted . glsl <nl> <nl> [ vertex ] <nl> <nl> # ifdef USE_GLES_OVER_GL <nl> + # define lowp <nl> # define mediump <nl> # define highp <nl> # else <nl> void main ( ) { <nl> [ fragment ] <nl> <nl> # ifdef USE_GLES_OVER_GL <nl> + # define lowp <nl> # define mediump <nl> # define highp <nl> # else <nl> mmm a / drivers / gles2 / shaders / scene . glsl <nl> ppp b / drivers / gles2 / shaders / scene . glsl <nl> <nl> [ vertex ] <nl> <nl> # ifdef USE_GLES_OVER_GL <nl> + # define lowp <nl> # define mediump <nl> # define highp <nl> # else <nl> VERTEX_SHADER_CODE <nl> # endif <nl> <nl> # ifdef USE_GLES_OVER_GL <nl> + # define lowp <nl> # define mediump <nl> # define highp <nl> # else <nl> | Merge pull request from akien - mga / opengl - 2 . 1 - lowp | godotengine/godot | a0d8bfb0d2ff50f4de7837767611688b962fd564 | 2018-12-21T14:56:05Z |
mmm a / hphp / runtime / base / mixed - array - x64 . S <nl> ppp b / hphp / runtime / base / mixed - array - x64 . S <nl> <nl> ETCH_SECTION ( _ZN4HPHP10MixedArray8NvGetStrEPKNS_9ArrayDataEPKNS_10StringDataE ) <nl> . globl _ZN4HPHP10MixedArray8NvGetStrEPKNS_9ArrayDataEPKNS_10StringDataE <nl> <nl> - ETCH_TYPE ( ETCH_NAME ( _ZN4HPHP10MixedArray8NvGetStrEPKNS_9ArrayDataEPKNS_10StringDataE ) , @ function ) <nl> - <nl> + ETCH_TYPE ( ETCH_NAME ( hashHelper_NvGetStr ) , @ function ) <nl> ETCH_NAME ( hashHelper_NvGetStr ) : <nl> - ETCH_LABEL ( hashHelper_NvGetStr ) : <nl> + CFI ( startproc ) <nl> + <nl> mov 0x10 ( % rsi ) , % ecx / / key - > size ( ) <nl> mov ( % rsi ) , % r9 / / key - > data ( ) <nl> not % edx / / initialize to - 1 ( assert : it was 0 ) <nl> ETCH_LABEL ( hend ) : <nl> or % edx , 0x14 ( % rsi ) <nl> jmp ETCH_LABEL ( hasHash ) <nl> <nl> + CFI ( endproc ) <nl> + ETCH_SIZE ( hashHelper_NvGetStr ) <nl> + <nl> / * <nl> * HPHP : : MixedArray : : NvGetStr ( const ArrayData * ad , const StringData * k ) ; <nl> * / <nl> + <nl> ETCH_ALIGN16 <nl> + ETCH_TYPE ( ETCH_NAME ( _ZN4HPHP10MixedArray8NvGetStrEPKNS_9ArrayDataEPKNS_10StringDataE ) , @ function ) <nl> ETCH_NAME ( _ZN4HPHP10MixedArray8NvGetStrEPKNS_9ArrayDataEPKNS_10StringDataE ) : <nl> CFI ( startproc ) <nl> <nl> ETCH_NAME ( _ZN4HPHP10MixedArray8NvGetStrEPKNS_9ArrayDataEPKNS_10StringDataE ) : <nl> lea ( % rax , % rax , 8 ) , % rax <nl> lea ( % rdi , % rax , 8 ) , % r10 / / ad - > hashTab ( ) <nl> and $ 0x7fffffff , % edx <nl> - jz ETCH_LABEL ( hashHelper_NvGetStr ) <nl> + jz ETCH_NAME ( hashHelper_NvGetStr ) <nl> <nl> ETCH_LABEL ( hasHash ) : <nl> xor % r9 , % r9 / / probe count <nl> | Mark hashHelper_NvGetStr ( ) as a function and set its size . | facebook/hhvm | 37a5702cbcf5670051d01ed61170b19e36c3afb0 | 2016-02-05T23:30:41Z |
mmm a / xbmc / cores / VideoPlayer / VideoPlayer . cpp <nl> ppp b / xbmc / cores / VideoPlayer / VideoPlayer . cpp <nl> void CVideoPlayer : : Process ( ) <nl> while ( ! m_bAbortRequest ) <nl> { <nl> # ifdef TARGET_RASPBERRY_PI <nl> - if ( m_omxplayer_mode & & OMXDoProcessing ( m_OmxPlayerState , m_playSpeed , m_VideoPlayerVideo , m_VideoPlayerAudio , m_CurrentAudio , m_CurrentVideo , m_HasVideo , m_HasAudio , m_renderManager ) ) <nl> + if ( m_omxplayer_mode & & OMXDoProcessing ( m_OmxPlayerState , m_playSpeed , m_VideoPlayerVideo , m_VideoPlayerAudio , m_CurrentAudio , m_CurrentVideo , m_HasVideo , m_HasAudio , * m_processInfo ) ) <nl> { <nl> CloseStream ( m_CurrentVideo , false ) ; <nl> OpenStream ( m_CurrentVideo , m_CurrentVideo . demuxerId , m_CurrentVideo . id , m_CurrentVideo . source ) ; <nl> mmm a / xbmc / cores / VideoPlayer / VideoRenderers / HwDecRender / MMALRenderer . cpp <nl> ppp b / xbmc / cores / VideoPlayer / VideoRenderers / HwDecRender / MMALRenderer . cpp <nl> void CMMALRenderer : : Run ( ) <nl> if ( buffer - > length > 0 ) <nl> { <nl> EINTERLACEMETHOD last_interlace_method = m_interlace_method ; <nl> - EINTERLACEMETHOD interlace_method = CMediaSettings : : GetInstance ( ) . GetCurrentVideoSettings ( ) . m_InterlaceMethod ; <nl> + EINTERLACEMETHOD interlace_method = m_videoSettings . m_InterlaceMethod ; <nl> if ( interlace_method = = VS_INTERLACEMETHOD_AUTO ) <nl> { <nl> interlace_method = VS_INTERLACEMETHOD_MMAL_ADVANCED ; <nl> bool CMMALRenderer : : Configure ( const VideoPicture & picture , float fps , unsigned f <nl> <nl> / / calculate the input frame aspect ratio <nl> CalculateFrameAspectRatio ( picture . iDisplayWidth , picture . iDisplayHeight ) ; <nl> - SetViewMode ( CMediaSettings : : GetInstance ( ) . GetCurrentVideoSettings ( ) . m_ViewMode ) ; <nl> + SetViewMode ( m_videoSettings . m_ViewMode ) ; <nl> ManageRenderArea ( ) ; <nl> <nl> m_bConfigured = true ; <nl> mmm a / xbmc / cores / omxplayer / OMXAudio . cpp <nl> ppp b / xbmc / cores / omxplayer / OMXAudio . cpp <nl> static const GUID KSDATAFORMAT_SUBTYPE_PCM = { <nl> / / Construction / Destruction <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> - COMXAudio : : COMXAudio ( ) : <nl> + COMXAudio : : COMXAudio ( CProcessInfo & processInfo ) : <nl> m_Initialized ( false ) , <nl> m_CurrentVolume ( 0 ) , <nl> m_Mute ( false ) , <nl> COMXAudio : : COMXAudio ( ) : <nl> m_last_pts ( DVD_NOPTS_VALUE ) , <nl> m_submitted_eos ( false ) , <nl> m_failed_eos ( false ) , <nl> - m_output ( AESINKPI_UNKNOWN ) <nl> + m_output ( AESINKPI_UNKNOWN ) , <nl> + m_processInfo ( processInfo ) <nl> { <nl> / / magic value used when omxplayer is playing - want sink to be disabled <nl> AEAudioFormat m_format ; <nl> bool COMXAudio : : PortSettingsChanged ( ) <nl> return false ; <nl> } <nl> <nl> - SetDynamicRangeCompression ( ( long ) ( CMediaSettings : : GetInstance ( ) . GetCurrentVideoSettings ( ) . m_VolumeAmplification * 100 ) ) ; <nl> + SetDynamicRangeCompression ( ( long ) ( m_processInfo . GetVideoSettings ( ) . m_VolumeAmplification * 100 ) ) ; <nl> UpdateAttenuation ( ) ; <nl> <nl> if ( m_omx_mixer . IsInitialized ( ) ) <nl> mmm a / xbmc / cores / omxplayer / OMXAudio . h <nl> ppp b / xbmc / cores / omxplayer / OMXAudio . h <nl> <nl> # include " cores / AudioEngine / Utils / AEAudioFormat . h " <nl> # include " cores / AudioEngine / Utils / AEUtil . h " <nl> # include " cores / AudioEngine / Interfaces / AEStream . h " <nl> + # include " cores / VideoPlayer / Process / ProcessInfo . h " <nl> # include " linux / PlatformDefs . h " <nl> # include " DVDStreamInfo . h " <nl> <nl> class COMXAudio <nl> float GetDelay ( ) ; <nl> float GetCacheTime ( ) ; <nl> float GetCacheTotal ( ) ; <nl> - COMXAudio ( ) ; <nl> + COMXAudio ( CProcessInfo & processInfo ) ; <nl> bool Initialize ( AEAudioFormat format , OMXClock * clock , CDVDStreamInfo & hints , CAEChannelInfo channelMap , bool bUsePassthrough ) ; <nl> bool PortSettingsChanged ( ) ; <nl> ~ COMXAudio ( ) ; <nl> class COMXAudio <nl> OMX_AUDIO_PARAM_DTSTYPE m_dtsParam ; <nl> WAVEFORMATEXTENSIBLE m_wave_header ; <nl> IAEStream * m_pAudioStream ; <nl> + CProcessInfo & m_processInfo ; <nl> protected : <nl> COMXCoreComponent m_omx_render_analog ; <nl> COMXCoreComponent m_omx_render_hdmi ; <nl> mmm a / xbmc / cores / omxplayer / OMXHelper . cpp <nl> ppp b / xbmc / cores / omxplayer / OMXHelper . cpp <nl> bool OMXPlayerUnsuitable ( bool m_HasVideo , bool m_HasAudio , CDVDDemux * m_pDemuxer <nl> } <nl> <nl> bool OMXDoProcessing ( struct SOmxPlayerState & m_OmxPlayerState , int m_playSpeed , IDVDStreamPlayerVideo * m_VideoPlayerVideo , IDVDStreamPlayerAudio * m_VideoPlayerAudio , <nl> - CCurrentStream m_CurrentAudio , CCurrentStream m_CurrentVideo , bool m_HasVideo , bool m_HasAudio , CRenderManager & m_renderManager ) <nl> + CCurrentStream m_CurrentAudio , CCurrentStream m_CurrentVideo , bool m_HasVideo , bool m_HasAudio , CProcessInfo & processInfo ) <nl> { <nl> bool reopen_stream = false ; <nl> unsigned int now = XbmcThreads : : SystemClockMillis ( ) ; <nl> bool OMXDoProcessing ( struct SOmxPlayerState & m_OmxPlayerState , int m_playSpeed , <nl> bool audio_fifo_low = false , video_fifo_low = false , audio_fifo_high = false , video_fifo_high = false ; <nl> <nl> if ( m_OmxPlayerState . interlace_method = = VS_INTERLACEMETHOD_MAX ) <nl> - m_OmxPlayerState . interlace_method = CMediaSettings : : GetInstance ( ) . GetCurrentVideoSettings ( ) . m_InterlaceMethod ; <nl> + m_OmxPlayerState . interlace_method = processInfo . GetVideoSettings ( ) . m_InterlaceMethod ; <nl> <nl> / / if deinterlace setting has changed , we should close and open video <nl> - if ( m_OmxPlayerState . interlace_method ! = CMediaSettings : : GetInstance ( ) . GetCurrentVideoSettings ( ) . m_InterlaceMethod ) <nl> + if ( m_OmxPlayerState . interlace_method ! = processInfo . GetVideoSettings ( ) . m_InterlaceMethod ) <nl> { <nl> CLog : : Log ( LOGNOTICE , " % s - Reopen stream due to interlace change ( % d , % d ) " , __FUNCTION__ , <nl> - m_OmxPlayerState . interlace_method , CMediaSettings : : GetInstance ( ) . GetCurrentVideoSettings ( ) . m_InterlaceMethod ) ; <nl> + m_OmxPlayerState . interlace_method , processInfo . GetVideoSettings ( ) . m_InterlaceMethod ) ; <nl> <nl> - m_OmxPlayerState . interlace_method = CMediaSettings : : GetInstance ( ) . GetCurrentVideoSettings ( ) . m_InterlaceMethod ; <nl> + m_OmxPlayerState . interlace_method = processInfo . GetVideoSettings ( ) . m_InterlaceMethod ; <nl> reopen_stream = true ; <nl> } <nl> <nl> mmm a / xbmc / cores / omxplayer / OMXHelper . h <nl> ppp b / xbmc / cores / omxplayer / OMXHelper . h <nl> <nl> <nl> bool OMXPlayerUnsuitable ( bool m_HasVideo , bool m_HasAudio , CDVDDemux * m_pDemuxer , CDVDInputStream * m_pInputStream , CSelectionStreams & m_SelectionStreams ) ; <nl> bool OMXDoProcessing ( struct SOmxPlayerState & m_OmxPlayerState , int m_playSpeed , IDVDStreamPlayerVideo * m_VideoPlayerVideo , IDVDStreamPlayerAudio * m_VideoPlayerAudio , <nl> - CCurrentStream m_CurrentAudio , CCurrentStream m_CurrentVideo , bool m_HasVideo , bool m_HasAudio , CRenderManager & renderManager ) ; <nl> + CCurrentStream m_CurrentAudio , CCurrentStream m_CurrentVideo , bool m_HasVideo , bool m_HasAudio , CProcessInfo & processInfo ) ; <nl> bool OMXStillPlaying ( bool waitVideo , bool waitAudio , bool eosVideo , bool eosAudio ) ; <nl> mmm a / xbmc / cores / omxplayer / OMXPlayerAudio . cpp <nl> ppp b / xbmc / cores / omxplayer / OMXPlayerAudio . cpp <nl> OMXPlayerAudio : : OMXPlayerAudio ( OMXClock * av_clock , CDVDMessageQueue & parent , CPr <nl> : CThread ( " OMXPlayerAudio " ) , IDVDStreamPlayerAudio ( processInfo ) <nl> , m_messageQueue ( " audio " ) <nl> , m_messageParent ( parent ) <nl> + , m_omxAudio ( processInfo ) <nl> { <nl> m_av_clock = av_clock ; <nl> m_pAudioCodec = NULL ; <nl> mmm a / xbmc / cores / omxplayer / OMXPlayerVideo . cpp <nl> ppp b / xbmc / cores / omxplayer / OMXPlayerVideo . cpp <nl> std : : string OMXPlayerVideo : : GetStereoMode ( ) <nl> { <nl> std : : string stereoMode ; <nl> <nl> - switch ( CMediaSettings : : GetInstance ( ) . GetCurrentVideoSettings ( ) . m_StereoMode ) <nl> + switch ( m_processInfo . GetVideoSettings ( ) . m_StereoMode ) <nl> { <nl> case RENDER_STEREO_MODE_SPLIT_VERTICAL : <nl> stereoMode = " left_right " ; <nl> std : : string OMXPlayerVideo : : GetStereoMode ( ) <nl> break ; <nl> } <nl> <nl> - if ( CMediaSettings : : GetInstance ( ) . GetCurrentVideoSettings ( ) . m_StereoInvert ) <nl> + if ( m_processInfo . GetVideoSettings ( ) . m_StereoInvert ) <nl> stereoMode = GetStereoModeInvert ( stereoMode ) ; <nl> <nl> return stereoMode ; <nl> void OMXPlayerVideo : : SetVideoRect ( const CRect & InSrcRect , const CRect & InDestRec <nl> CLog : : Log ( LOGDEBUG , " OMXPlayerVideo : : % s % d , % d , % d , % d - > % d , % d , % d , % d ( % d , % d , % d , % d , % s ) " , __func__ , <nl> ( int ) SrcRect . x1 , ( int ) SrcRect . y1 , ( int ) SrcRect . x2 , ( int ) SrcRect . y2 , <nl> ( int ) DestRect . x1 , ( int ) DestRect . y1 , ( int ) DestRect . x2 , ( int ) DestRect . y2 , <nl> - video_stereo_mode , display_stereo_mode , CMediaSettings : : GetInstance ( ) . GetCurrentVideoSettings ( ) . m_StereoInvert , g_graphicsContext . GetStereoView ( ) , OMXPlayerVideo : : GetStereoMode ( ) . c_str ( ) ) ; <nl> + video_stereo_mode , display_stereo_mode , m_processInfo . GetVideoSettings ( ) . m_StereoInvert , g_graphicsContext . GetStereoView ( ) , OMXPlayerVideo : : GetStereoMode ( ) . c_str ( ) ) ; <nl> <nl> m_src_rect = SrcRect ; <nl> m_dst_rect = DestRect ; <nl> mmm a / xbmc / cores / omxplayer / OMXVideo . cpp <nl> ppp b / xbmc / cores / omxplayer / OMXVideo . cpp <nl> bool COMXVideo : : PortSettingsChanged ( ResolutionUpdateInfo & resinfo ) <nl> } <nl> } <nl> <nl> - EINTERLACEMETHOD interlace_method = CMediaSettings : : GetInstance ( ) . GetCurrentVideoSettings ( ) . m_InterlaceMethod ; <nl> + EINTERLACEMETHOD interlace_method = m_processInfo . GetVideoSettings ( ) . m_InterlaceMethod ; <nl> if ( interlace_method = = VS_INTERLACEMETHOD_AUTO ) <nl> interlace_method = VS_INTERLACEMETHOD_MMAL_ADVANCED ; <nl> <nl> | mmal : Fixup after move VideoSettings to cores | xbmc/xbmc | 858b6557aceb764009acd8ef952b3b6558da1747 | 2017-10-25T19:00:37Z |
mmm a / 3rdParty / velocypack / include / velocypack / Options . h <nl> ppp b / 3rdParty / velocypack / include / velocypack / Options . h <nl> <nl> # include < cstdint > <nl> <nl> # include " velocypack / velocypack - common . h " <nl> + # include " velocypack / Exception . h " <nl> <nl> namespace arangodb { <nl> namespace velocypack { <nl> struct AttributeExcludeHandler { <nl> struct CustomTypeHandler { <nl> virtual ~ CustomTypeHandler ( ) { } <nl> <nl> - virtual void dump ( Slice const & value , Dumper * dumper , <nl> - Slice const & base ) = 0 ; <nl> + virtual void dump ( Slice const & , Dumper * , Slice const & ) { <nl> + throw Exception ( Exception : : NotImplemented ) ; <nl> + } <nl> <nl> - virtual std : : string toString ( Slice const & value , Options const * options , <nl> - Slice const & base ) = 0 ; <nl> + virtual std : : string toString ( Slice const & , Options const * , Slice const & ) { <nl> + throw Exception ( Exception : : NotImplemented ) ; <nl> + } <nl> <nl> } ; <nl> <nl> mmm a / 3rdParty / velocypack / include / velocypack / Slice . h <nl> ppp b / 3rdParty / velocypack / include / velocypack / Slice . h <nl> class Slice { <nl> case 0xf4 : <nl> case 0xf5 : <nl> case 0xf6 : { <nl> - return 1 + readInteger < ValueLength > ( _start + 1 , 1 ) ; <nl> + return 2 + readInteger < ValueLength > ( _start + 1 , 1 ) ; <nl> } <nl> <nl> case 0xf7 : <nl> case 0xf8 : <nl> case 0xf9 : { <nl> - return 1 + readInteger < ValueLength > ( _start + 1 , 2 ) ; <nl> + return 3 + readInteger < ValueLength > ( _start + 1 , 2 ) ; <nl> } <nl> <nl> case 0xfa : <nl> case 0xfb : <nl> case 0xfc : { <nl> - return 1 + readInteger < ValueLength > ( _start + 1 , 4 ) ; <nl> + return 5 + readInteger < ValueLength > ( _start + 1 , 4 ) ; <nl> } <nl> <nl> case 0xfd : <nl> case 0xfe : <nl> case 0xff : { <nl> - return 1 + readInteger < ValueLength > ( _start + 1 , 8 ) ; <nl> + return 9 + readInteger < ValueLength > ( _start + 1 , 8 ) ; <nl> } <nl> <nl> default : { <nl> mmm a / 3rdParty / velocypack / src / Dumper . cpp <nl> ppp b / 3rdParty / velocypack / src / Dumper . cpp <nl> void Dumper : : dumpValue ( Slice const * slice , Slice const * base ) { <nl> <nl> case ValueType : : Custom : { <nl> if ( options - > customTypeHandler = = nullptr ) { <nl> - handleUnsupportedType ( slice ) ; <nl> + throw Exception ( Exception : : NeedCustomTypeHandler ) ; <nl> } else { <nl> options - > customTypeHandler - > dump ( * slice , this , * base ) ; <nl> } <nl> | Add new velocypack version for custom type handling . | arangodb/arangodb | 9e0c04dda401a3bce296be1497f9c862fb53315e | 2016-02-22T10:41:51Z |
mmm a / src / caffe / layers / cudnn_conv_layer . cu <nl> ppp b / src / caffe / layers / cudnn_conv_layer . cu <nl> void CuDNNConvolutionLayer < Dtype > : : Forward_gpu ( <nl> for ( int g = 0 ; g < this - > group_ ; g + + ) { <nl> cudnnConvolutionFwdAlgo_t algo ; <nl> <nl> - / / get the desired convolution algorithm <nl> + / / pick the convolution algorithm <nl> + / / TODO ( shelhamer ) this should be done during reshape <nl> + / / TODO ( shelhamer ) the choice of automatic or manual algorithm picking <nl> + / / should be exposed in proto <nl> CUDNN_CHECK ( cudnnGetConvolutionForwardAlgorithm ( handle_ [ g ] , <nl> bottom_descs_ [ i ] , <nl> filter_desc_ , <nl> | note cuDNN v2 convolutional TODOs | BVLC/caffe | 3cc9b73a011b7ba8964d1bccc97b944814cbeb38 | 2015-03-24T21:17:57Z |
mmm a / js / client / modules / org / arangodb / foxx - manager . js <nl> ppp b / js / client / modules / org / arangodb / foxx - manager . js <nl> function updateFishbowlFromZip ( filename ) { <nl> <nl> var i ; <nl> var tempPath = fs . getTempPath ( ) ; <nl> - var fishbowl = getFishbowlStorage ( ) ; <nl> + var toSave = [ ] ; <nl> <nl> try { <nl> fs . makeDirectoryRecursive ( tempPath ) ; <nl> function updateFishbowlFromZip ( filename ) { <nl> desc . name = match [ 1 ] ; <nl> } <nl> <nl> - try { <nl> - try { <nl> - fishbowl . save ( desc ) ; <nl> - } <nl> - catch ( err3 ) { <nl> - fishbowl . replace ( desc . _key , desc ) ; <nl> + toSave . push ( desc ) ; <nl> + } <nl> + <nl> + if ( toSave . length > 0 ) { <nl> + var fishbowl = getFishbowlStorage ( ) ; <nl> + <nl> + internal . _executeTransaction ( { <nl> + collections : { <nl> + write : fishbowl . name ( ) <nl> + } , <nl> + action : function ( params ) { <nl> + var c = require ( " internal " ) . db . _collection ( params . collection ) ; <nl> + c . truncate ( ) ; <nl> + <nl> + params . apps . forEach ( function ( app ) { <nl> + c . save ( app ) ; <nl> + } ) ; <nl> + } , <nl> + params : { <nl> + apps : toSave , <nl> + collection : fishbowl . name ( ) <nl> } <nl> - } <nl> - catch ( err2 ) { <nl> - arangodb . printf ( " cannot save description for app ' " + f + " ' : % s \ n " , String ( err2 ) ) ; <nl> - continue ; <nl> - } <nl> + } ) ; <nl> } <nl> } <nl> catch ( err ) { <nl> mmm a / js / server / modules / org / arangodb / foxx - manager . js <nl> ppp b / js / server / modules / org / arangodb / foxx - manager . js <nl> exports . scanAppDirectory = function ( ) { <nl> <nl> if ( fs . exists ( m ) ) { <nl> try { <nl> - var thumbnail = undefined ; <nl> + var thumbnail ; <nl> + <nl> + thumbnail = undefined ; <nl> var mf = JSON . parse ( fs . read ( m ) ) ; <nl> <nl> / / add some default attributes <nl> - [ " author " , " description " ] . forEach ( function ( a ) { <nl> - if ( ! mf . hasOwnProperty ( a ) ) { <nl> - mf [ a ] = " " ; <nl> - } <nl> - } ) ; <nl> + if ( ! mf . hasOwnProperty ( " author " ) ) { <nl> + mf . author = " " ; <nl> + } <nl> + if ( ! mf . hasOwnProperty ( " description " ) ) { <nl> + mf . description = " " ; <nl> + } <nl> <nl> if ( mf . hasOwnProperty ( ' thumbnail ' ) & & mf . thumbnail ! = = null & & mf . thumbnail ! = = ' ' ) { <nl> var p = fs . join ( path , files [ j ] , mf . thumbnail ) ; <nl> | make jslint happy | arangodb/arangodb | 5fa759a1e511561c9988be1590266deb53a34091 | 2013-07-26T13:10:55Z |
mmm a / include / v8 . h <nl> ppp b / include / v8 . h <nl> class V8_EXPORT ScriptCompiler { <nl> Handle < Integer > resource_column_offset ; <nl> Handle < Boolean > resource_is_shared_cross_origin ; <nl> <nl> - / / Cached data from previous compilation ( if any ) , or generated during <nl> - / / compilation ( if the generate_cached_data flag is passed to <nl> - / / ScriptCompiler ) . <nl> + / / Cached data from previous compilation ( if a kConsume * Cache flag is <nl> + / / set ) , or hold newly generated cache data ( kProduce * Cache flags ) are <nl> + / / set when calling a compile method . <nl> CachedData * cached_data ; <nl> } ; <nl> <nl> enum CompileOptions { <nl> - kNoCompileOptions , <nl> - kProduceDataToCache = 1 < < 0 <nl> + kNoCompileOptions = 0 , <nl> + kProduceParserCache , <nl> + kConsumeParserCache , <nl> + kProduceCodeCache , <nl> + kConsumeCodeCache , <nl> + <nl> + / / Support the previous API for a transition period . <nl> + kProduceDataToCache <nl> } ; <nl> <nl> / * * <nl> mmm a / src / api . cc <nl> ppp b / src / api . cc <nl> Local < UnboundScript > ScriptCompiler : : CompileUnbound ( <nl> Isolate * v8_isolate , <nl> Source * source , <nl> CompileOptions options ) { <nl> - i : : ScriptData * script_data = NULL ; <nl> - i : : CachedDataMode cached_data_mode = i : : NO_CACHED_DATA ; <nl> i : : Isolate * isolate = reinterpret_cast < i : : Isolate * > ( v8_isolate ) ; <nl> ON_BAILOUT ( isolate , " v8 : : ScriptCompiler : : CompileUnbound ( ) " , <nl> return Local < UnboundScript > ( ) ) ; <nl> - if ( options & kProduceDataToCache ) { <nl> - cached_data_mode = i : : PRODUCE_CACHED_DATA ; <nl> - CHECK ( source - > cached_data = = NULL ) ; <nl> - } else if ( source - > cached_data ) { <nl> - cached_data_mode = i : : CONSUME_CACHED_DATA ; <nl> + <nl> + / / Support the old API for a transition period : <nl> + / / - kProduceToCache - > kProduceParserCache <nl> + / / - kNoCompileOptions + cached_data ! = NULL - > kConsumeParserCache <nl> + if ( options = = kProduceDataToCache ) { <nl> + options = kProduceParserCache ; <nl> + } else if ( options = = kNoCompileOptions & & source - > cached_data ) { <nl> + options = kConsumeParserCache ; <nl> + } <nl> + <nl> + i : : ScriptData * script_data = NULL ; <nl> + if ( options = = kConsumeParserCache | | options = = kConsumeCodeCache ) { <nl> + ASSERT ( source - > cached_data ) ; <nl> / / ScriptData takes care of pointer - aligning the data . <nl> script_data = new i : : ScriptData ( source - > cached_data - > data , <nl> source - > cached_data - > length ) ; <nl> Local < UnboundScript > ScriptCompiler : : CompileUnbound ( <nl> EXCEPTION_PREAMBLE ( isolate ) ; <nl> i : : Handle < i : : SharedFunctionInfo > result = i : : Compiler : : CompileScript ( <nl> str , name_obj , line_offset , column_offset , is_shared_cross_origin , <nl> - isolate - > global_context ( ) , NULL , & script_data , cached_data_mode , <nl> + isolate - > global_context ( ) , NULL , & script_data , options , <nl> i : : NOT_NATIVES_CODE ) ; <nl> has_pending_exception = result . is_null ( ) ; <nl> - if ( has_pending_exception & & cached_data_mode = = i : : CONSUME_CACHED_DATA ) { <nl> + if ( has_pending_exception & & script_data ! = NULL ) { <nl> / / This case won ' t happen during normal operation ; we have compiled <nl> / / successfully and produced cached data , and but the second compilation <nl> / / of the same source code fails . <nl> Local < UnboundScript > ScriptCompiler : : CompileUnbound ( <nl> } <nl> EXCEPTION_BAILOUT_CHECK ( isolate , Local < UnboundScript > ( ) ) ; <nl> raw_result = * result ; <nl> - if ( ( options & kProduceDataToCache ) & & script_data ! = NULL ) { <nl> - / / script_data_impl now contains the data that was generated . source will <nl> + <nl> + if ( ( options = = kProduceParserCache | | options = = kProduceCodeCache ) & & <nl> + script_data ! = NULL ) { <nl> + / / script_data now contains the data that was generated . source will <nl> / / take the ownership . <nl> source - > cached_data = new CachedData ( <nl> script_data - > data ( ) , script_data - > length ( ) , CachedData : : BufferOwned ) ; <nl> mmm a / src / bootstrapper . cc <nl> ppp b / src / bootstrapper . cc <nl> bool Genesis : : CompileScriptCached ( Isolate * isolate , <nl> Handle < String > script_name = <nl> factory - > NewStringFromUtf8 ( name ) . ToHandleChecked ( ) ; <nl> function_info = Compiler : : CompileScript ( <nl> - source , <nl> - script_name , <nl> - 0 , <nl> - 0 , <nl> - false , <nl> - top_context , <nl> - extension , <nl> - NULL , <nl> - NO_CACHED_DATA , <nl> + source , script_name , 0 , 0 , false , top_context , extension , NULL , <nl> + ScriptCompiler : : kNoCompileOptions , <nl> use_runtime_context ? NATIVES_CODE : NOT_NATIVES_CODE ) ; <nl> if ( function_info . is_null ( ) ) return false ; <nl> if ( cache ! = NULL ) cache - > Add ( name , function_info ) ; <nl> mmm a / src / compiler . cc <nl> ppp b / src / compiler . cc <nl> void CompilationInfo : : Initialize ( Isolate * isolate , <nl> global_scope_ = NULL ; <nl> extension_ = NULL ; <nl> cached_data_ = NULL ; <nl> - cached_data_mode_ = NO_CACHED_DATA ; <nl> + compile_options_ = ScriptCompiler : : kNoCompileOptions ; <nl> zone_ = zone ; <nl> deferred_handles_ = NULL ; <nl> code_stub_ = NULL ; <nl> static Handle < SharedFunctionInfo > CompileToplevel ( CompilationInfo * info ) { <nl> ASSERT ( info - > is_eval ( ) | | info - > is_global ( ) ) ; <nl> <nl> bool parse_allow_lazy = <nl> - ( info - > cached_data_mode ( ) = = CONSUME_CACHED_DATA | | <nl> + ( info - > compile_options ( ) = = ScriptCompiler : : kConsumeParserCache | | <nl> String : : cast ( script - > source ( ) ) - > length ( ) > FLAG_min_preparse_length ) & & <nl> ! DebuggerWantsEagerCompilation ( info ) ; <nl> <nl> - if ( ! parse_allow_lazy & & info - > cached_data_mode ( ) ! = NO_CACHED_DATA ) { <nl> + if ( ! parse_allow_lazy & & <nl> + ( info - > compile_options ( ) = = ScriptCompiler : : kProduceParserCache | | <nl> + info - > compile_options ( ) = = ScriptCompiler : : kConsumeParserCache ) ) { <nl> / / We are going to parse eagerly , but we either 1 ) have cached data produced <nl> / / by lazy parsing or 2 ) are asked to generate cached data . We cannot use <nl> / / the existing data , since it won ' t contain all the symbols we need for <nl> / / eager parsing . In addition , it doesn ' t make sense to produce the data <nl> / / when parsing eagerly . That data would contain all symbols , but no <nl> / / functions , so it cannot be used to aid lazy parsing later . <nl> - info - > SetCachedData ( NULL , NO_CACHED_DATA ) ; <nl> + info - > SetCachedData ( NULL , ScriptCompiler : : kNoCompileOptions ) ; <nl> } <nl> <nl> Handle < SharedFunctionInfo > result ; <nl> MaybeHandle < JSFunction > Compiler : : GetFunctionFromEval ( <nl> <nl> <nl> Handle < SharedFunctionInfo > Compiler : : CompileScript ( <nl> - Handle < String > source , <nl> - Handle < Object > script_name , <nl> - int line_offset , <nl> - int column_offset , <nl> - bool is_shared_cross_origin , <nl> - Handle < Context > context , <nl> - v8 : : Extension * extension , <nl> - ScriptData * * cached_data , <nl> - CachedDataMode cached_data_mode , <nl> - NativesFlag natives ) { <nl> - if ( cached_data_mode = = NO_CACHED_DATA ) { <nl> + Handle < String > source , Handle < Object > script_name , int line_offset , <nl> + int column_offset , bool is_shared_cross_origin , Handle < Context > context , <nl> + v8 : : Extension * extension , ScriptData * * cached_data , <nl> + ScriptCompiler : : CompileOptions compile_options , NativesFlag natives ) { <nl> + if ( compile_options = = ScriptCompiler : : kNoCompileOptions ) { <nl> cached_data = NULL ; <nl> - } else if ( cached_data_mode = = PRODUCE_CACHED_DATA ) { <nl> + } else if ( compile_options = = ScriptCompiler : : kProduceParserCache | | <nl> + compile_options = = ScriptCompiler : : kProduceCodeCache ) { <nl> ASSERT ( cached_data & & ! * cached_data ) ; <nl> ASSERT ( extension = = NULL ) ; <nl> } else { <nl> - ASSERT ( cached_data_mode = = CONSUME_CACHED_DATA ) ; <nl> + ASSERT ( compile_options = = ScriptCompiler : : kConsumeParserCache | | <nl> + compile_options = = ScriptCompiler : : kConsumeCodeCache ) ; <nl> ASSERT ( cached_data & & * cached_data ) ; <nl> ASSERT ( extension = = NULL ) ; <nl> } <nl> Handle < SharedFunctionInfo > Compiler : : CompileScript ( <nl> source , script_name , line_offset , column_offset , <nl> is_shared_cross_origin , context ) ; <nl> if ( maybe_result . is_null ( ) & & FLAG_serialize_toplevel & & <nl> - cached_data_mode = = CONSUME_CACHED_DATA ) { <nl> + compile_options = = ScriptCompiler : : kConsumeCodeCache ) { <nl> return CodeSerializer : : Deserialize ( isolate , * cached_data , source ) ; <nl> } <nl> } <nl> Handle < SharedFunctionInfo > Compiler : : CompileScript ( <nl> / / Compile the function and add it to the cache . <nl> CompilationInfoWithZone info ( script ) ; <nl> info . MarkAsGlobal ( ) ; <nl> - info . SetCachedData ( cached_data , cached_data_mode ) ; <nl> + info . SetCachedData ( cached_data , compile_options ) ; <nl> info . SetExtension ( extension ) ; <nl> info . SetContext ( context ) ; <nl> - if ( FLAG_serialize_toplevel & & cached_data_mode = = PRODUCE_CACHED_DATA ) { <nl> + if ( FLAG_serialize_toplevel & & <nl> + compile_options = = ScriptCompiler : : kProduceCodeCache ) { <nl> info . PrepareForSerializing ( ) ; <nl> } <nl> if ( FLAG_use_strict ) info . SetStrictMode ( STRICT ) ; <nl> Handle < SharedFunctionInfo > Compiler : : CompileScript ( <nl> result = CompileToplevel ( & info ) ; <nl> if ( extension = = NULL & & ! result . is_null ( ) & & ! result - > dont_cache ( ) ) { <nl> compilation_cache - > PutScript ( source , context , result ) ; <nl> - if ( FLAG_serialize_toplevel & & cached_data_mode = = PRODUCE_CACHED_DATA ) { <nl> + if ( FLAG_serialize_toplevel & & <nl> + compile_options = = ScriptCompiler : : kProduceCodeCache ) { <nl> * cached_data = CodeSerializer : : Serialize ( isolate , result , source ) ; <nl> } <nl> } <nl> + <nl> if ( result . is_null ( ) ) isolate - > ReportPendingMessages ( ) ; <nl> } else if ( result - > ic_age ( ) ! = isolate - > heap ( ) - > global_ic_age ( ) ) { <nl> result - > ResetForNewContext ( isolate - > heap ( ) - > global_ic_age ( ) ) ; <nl> mmm a / src / compiler . h <nl> ppp b / src / compiler . h <nl> enum ParseRestriction { <nl> ONLY_SINGLE_FUNCTION_LITERAL / / Only a single FunctionLiteral expression . <nl> } ; <nl> <nl> - enum CachedDataMode { <nl> - NO_CACHED_DATA , <nl> - CONSUME_CACHED_DATA , <nl> - PRODUCE_CACHED_DATA <nl> - } ; <nl> - <nl> struct OffsetRange { <nl> OffsetRange ( int from , int to ) : from ( from ) , to ( to ) { } <nl> int from ; <nl> class CompilationInfo { <nl> HydrogenCodeStub * code_stub ( ) const { return code_stub_ ; } <nl> v8 : : Extension * extension ( ) const { return extension_ ; } <nl> ScriptData * * cached_data ( ) const { return cached_data_ ; } <nl> - CachedDataMode cached_data_mode ( ) const { <nl> - return cached_data_mode_ ; <nl> + ScriptCompiler : : CompileOptions compile_options ( ) const { <nl> + return compile_options_ ; <nl> } <nl> Handle < Context > context ( ) const { return context_ ; } <nl> BailoutId osr_ast_id ( ) const { return osr_ast_id_ ; } <nl> class CompilationInfo { <nl> extension_ = extension ; <nl> } <nl> void SetCachedData ( ScriptData * * cached_data , <nl> - CachedDataMode cached_data_mode ) { <nl> - cached_data_mode_ = cached_data_mode ; <nl> - if ( cached_data_mode = = NO_CACHED_DATA ) { <nl> + ScriptCompiler : : CompileOptions compile_options ) { <nl> + compile_options_ = compile_options ; <nl> + if ( compile_options = = ScriptCompiler : : kNoCompileOptions ) { <nl> cached_data_ = NULL ; <nl> } else { <nl> ASSERT ( ! is_lazy ( ) ) ; <nl> class CompilationInfo { <nl> / / Fields possibly needed for eager compilation , NULL by default . <nl> v8 : : Extension * extension_ ; <nl> ScriptData * * cached_data_ ; <nl> - CachedDataMode cached_data_mode_ ; <nl> + ScriptCompiler : : CompileOptions compile_options_ ; <nl> <nl> / / The context of the caller for eval code , and the global context for a <nl> / / global script . Will be a null handle otherwise . <nl> class Compiler : public AllStatic { <nl> <nl> / / Compile a String source within a context . <nl> static Handle < SharedFunctionInfo > CompileScript ( <nl> - Handle < String > source , <nl> - Handle < Object > script_name , <nl> - int line_offset , <nl> - int column_offset , <nl> - bool is_shared_cross_origin , <nl> - Handle < Context > context , <nl> - v8 : : Extension * extension , <nl> - ScriptData * * cached_data , <nl> - CachedDataMode cached_data_mode , <nl> + Handle < String > source , Handle < Object > script_name , int line_offset , <nl> + int column_offset , bool is_shared_cross_origin , Handle < Context > context , <nl> + v8 : : Extension * extension , ScriptData * * cached_data , <nl> + ScriptCompiler : : CompileOptions compile_options , <nl> NativesFlag is_natives_code ) ; <nl> <nl> / / Create a shared function info object ( the code may be lazily compiled ) . <nl> mmm a / src / d8 . cc <nl> ppp b / src / d8 . cc <nl> const char * Shell : : ToCString ( const v8 : : String : : Utf8Value & value ) { <nl> } <nl> <nl> <nl> + / / Compile a string within the current v8 context . <nl> + Local < UnboundScript > Shell : : CompileString ( <nl> + Isolate * isolate , Local < String > source , Local < Value > name , <nl> + v8 : : ScriptCompiler : : CompileOptions compile_options ) { <nl> + ScriptOrigin origin ( name ) ; <nl> + ScriptCompiler : : Source script_source ( source , origin ) ; <nl> + Local < UnboundScript > script = <nl> + ScriptCompiler : : CompileUnbound ( isolate , & script_source , compile_options ) ; <nl> + <nl> + / / Was caching requested & successful ? Then compile again , now with cache . <nl> + if ( script_source . GetCachedData ( ) ) { <nl> + if ( compile_options = = ScriptCompiler : : kProduceCodeCache ) { <nl> + compile_options = ScriptCompiler : : kConsumeCodeCache ; <nl> + } else if ( compile_options = = ScriptCompiler : : kProduceParserCache ) { <nl> + compile_options = ScriptCompiler : : kConsumeParserCache ; <nl> + } else { <nl> + ASSERT ( false ) ; / / A new compile option ? <nl> + } <nl> + ScriptCompiler : : Source cached_source ( <nl> + source , origin , new v8 : : ScriptCompiler : : CachedData ( <nl> + script_source . GetCachedData ( ) - > data , <nl> + script_source . GetCachedData ( ) - > length , <nl> + v8 : : ScriptCompiler : : CachedData : : BufferNotOwned ) ) ; <nl> + script = ScriptCompiler : : CompileUnbound ( isolate , & cached_source , <nl> + compile_options ) ; <nl> + } <nl> + return script ; <nl> + } <nl> + <nl> + <nl> / / Executes a string within the current v8 context . <nl> bool Shell : : ExecuteString ( Isolate * isolate , <nl> Handle < String > source , <nl> bool Shell : : ExecuteString ( Isolate * isolate , <nl> / / When debugging make exceptions appear to be uncaught . <nl> try_catch . SetVerbose ( true ) ; <nl> } <nl> - ScriptOrigin origin ( name ) ; <nl> - ScriptCompiler : : Source script_source ( source , origin ) ; <nl> + <nl> Handle < UnboundScript > script = <nl> - ScriptCompiler : : CompileUnbound ( isolate , & script_source ) ; <nl> + Shell : : CompileString ( isolate , source , name , options . compile_options ) ; <nl> if ( script . IsEmpty ( ) ) { <nl> / / Print errors that happened during compilation . <nl> if ( report_exceptions & & ! FLAG_debugger ) <nl> bool Shell : : SetOptions ( int argc , char * argv [ ] ) { <nl> options . snapshot_blob = argv [ i ] + 16 ; <nl> argv [ i ] = NULL ; <nl> # endif / / V8_USE_EXTERNAL_STARTUP_DATA <nl> + } else if ( strcmp ( argv [ i ] , " - - cache " ) = = 0 | | <nl> + strncmp ( argv [ i ] , " - - cache = " , 8 ) = = 0 ) { <nl> + const char * value = argv [ i ] + 7 ; <nl> + if ( ! * value | | strncmp ( value , " = code " , 6 ) = = 0 ) { <nl> + options . compile_options = v8 : : ScriptCompiler : : kProduceCodeCache ; <nl> + } else if ( strncmp ( value , " = parse " , 7 ) = = 0 ) { <nl> + options . compile_options = v8 : : ScriptCompiler : : kProduceParserCache ; <nl> + } else if ( strncmp ( value , " = none " , 6 ) = = 0 ) { <nl> + options . compile_options = v8 : : ScriptCompiler : : kNoCompileOptions ; <nl> + } else { <nl> + printf ( " Unknown option to - - cache . \ n " ) ; <nl> + return false ; <nl> + } <nl> + argv [ i ] = NULL ; <nl> } <nl> } <nl> <nl> mmm a / src / d8 . h <nl> ppp b / src / d8 . h <nl> class BinaryResource : public v8 : : String : : ExternalAsciiStringResource { <nl> <nl> class ShellOptions { <nl> public : <nl> - ShellOptions ( ) : <nl> - script_executed ( false ) , <nl> - last_run ( true ) , <nl> - send_idle_notification ( false ) , <nl> - invoke_weak_callbacks ( false ) , <nl> - stress_opt ( false ) , <nl> - stress_deopt ( false ) , <nl> - interactive_shell ( false ) , <nl> - test_shell ( false ) , <nl> - dump_heap_constants ( false ) , <nl> - expected_to_throw ( false ) , <nl> - mock_arraybuffer_allocator ( false ) , <nl> - num_isolates ( 1 ) , <nl> - isolate_sources ( NULL ) , <nl> - icu_data_file ( NULL ) , <nl> - natives_blob ( NULL ) , <nl> - snapshot_blob ( NULL ) { } <nl> + ShellOptions ( ) <nl> + : script_executed ( false ) , <nl> + last_run ( true ) , <nl> + send_idle_notification ( false ) , <nl> + invoke_weak_callbacks ( false ) , <nl> + stress_opt ( false ) , <nl> + stress_deopt ( false ) , <nl> + interactive_shell ( false ) , <nl> + test_shell ( false ) , <nl> + dump_heap_constants ( false ) , <nl> + expected_to_throw ( false ) , <nl> + mock_arraybuffer_allocator ( false ) , <nl> + num_isolates ( 1 ) , <nl> + compile_options ( v8 : : ScriptCompiler : : kNoCompileOptions ) , <nl> + isolate_sources ( NULL ) , <nl> + icu_data_file ( NULL ) , <nl> + natives_blob ( NULL ) , <nl> + snapshot_blob ( NULL ) { } <nl> <nl> ~ ShellOptions ( ) { <nl> delete [ ] isolate_sources ; <nl> class ShellOptions { <nl> bool expected_to_throw ; <nl> bool mock_arraybuffer_allocator ; <nl> int num_isolates ; <nl> + v8 : : ScriptCompiler : : CompileOptions compile_options ; <nl> SourceGroup * isolate_sources ; <nl> const char * icu_data_file ; <nl> const char * natives_blob ; <nl> class Shell : public i : : AllStatic { <nl> # endif / / V8_SHARED <nl> <nl> public : <nl> + static Local < UnboundScript > CompileString ( <nl> + Isolate * isolate , Local < String > source , Local < Value > name , <nl> + v8 : : ScriptCompiler : : CompileOptions compile_options ) ; <nl> static bool ExecuteString ( Isolate * isolate , <nl> Handle < String > source , <nl> Handle < Value > name , <nl> mmm a / src / debug . cc <nl> ppp b / src / debug . cc <nl> bool Debug : : CompileDebuggerScript ( Isolate * isolate , int index ) { <nl> <nl> / / Compile the script . <nl> Handle < SharedFunctionInfo > function_info ; <nl> - function_info = Compiler : : CompileScript ( source_code , <nl> - script_name , 0 , 0 , <nl> - false , <nl> - context , <nl> - NULL , NULL , NO_CACHED_DATA , <nl> - NATIVES_CODE ) ; <nl> + function_info = Compiler : : CompileScript ( <nl> + source_code , script_name , 0 , 0 , false , context , NULL , NULL , <nl> + ScriptCompiler : : kNoCompileOptions , NATIVES_CODE ) ; <nl> <nl> / / Silently ignore stack overflows during compilation . <nl> if ( function_info . is_null ( ) ) { <nl> mmm a / src / parser . cc <nl> ppp b / src / parser . cc <nl> int ParseData : : FunctionsSize ( ) { <nl> <nl> <nl> void Parser : : SetCachedData ( ) { <nl> - if ( cached_data_mode ( ) = = NO_CACHED_DATA ) { <nl> + if ( compile_options ( ) = = ScriptCompiler : : kNoCompileOptions ) { <nl> cached_parse_data_ = NULL ; <nl> } else { <nl> ASSERT ( info_ - > cached_data ( ) ! = NULL ) ; <nl> - if ( cached_data_mode ( ) = = CONSUME_CACHED_DATA ) { <nl> + if ( compile_options ( ) = = ScriptCompiler : : kConsumeParserCache ) { <nl> cached_parse_data_ = new ParseData ( * info_ - > cached_data ( ) ) ; <nl> } <nl> } <nl> FunctionLiteral * Parser : : ParseProgram ( ) { <nl> <nl> / / Initialize parser state . <nl> CompleteParserRecorder recorder ; <nl> - if ( cached_data_mode ( ) = = PRODUCE_CACHED_DATA ) { <nl> + <nl> + if ( compile_options ( ) = = ScriptCompiler : : kProduceParserCache ) { <nl> log_ = & recorder ; <nl> - } else if ( cached_data_mode ( ) = = CONSUME_CACHED_DATA ) { <nl> + } else if ( compile_options ( ) = = ScriptCompiler : : kConsumeParserCache ) { <nl> cached_parse_data_ - > Initialize ( ) ; <nl> } <nl> <nl> FunctionLiteral * Parser : : ParseProgram ( ) { <nl> } <nl> PrintF ( " - took % 0 . 3f ms ] \ n " , ms ) ; <nl> } <nl> - if ( cached_data_mode ( ) = = PRODUCE_CACHED_DATA ) { <nl> + if ( compile_options ( ) = = ScriptCompiler : : kProduceParserCache ) { <nl> if ( result ! = NULL ) * info_ - > cached_data ( ) = recorder . GetScriptData ( ) ; <nl> log_ = NULL ; <nl> } <nl> void Parser : : SkipLazyFunctionBody ( const AstRawString * function_name , <nl> int * expected_property_count , <nl> bool * ok ) { <nl> int function_block_pos = position ( ) ; <nl> - if ( cached_data_mode ( ) = = CONSUME_CACHED_DATA ) { <nl> + if ( compile_options ( ) = = ScriptCompiler : : kConsumeParserCache ) { <nl> / / If we have cached data , we use it to skip parsing the function body . The <nl> / / data contains the information we need to construct the lazy function . <nl> FunctionEntry entry = <nl> void Parser : : SkipLazyFunctionBody ( const AstRawString * function_name , <nl> * materialized_literal_count = logger . literals ( ) ; <nl> * expected_property_count = logger . properties ( ) ; <nl> scope_ - > SetStrictMode ( logger . strict_mode ( ) ) ; <nl> - if ( cached_data_mode ( ) = = PRODUCE_CACHED_DATA ) { <nl> + if ( compile_options ( ) = = ScriptCompiler : : kProduceParserCache ) { <nl> ASSERT ( log_ ) ; <nl> / / Position right after terminal ' } ' . <nl> int body_end = scanner ( ) - > location ( ) . end_pos ; <nl> mmm a / src / parser . h <nl> ppp b / src / parser . h <nl> class Parser : public ParserBase < ParserTraits > { <nl> void SetCachedData ( ) ; <nl> <nl> bool inside_with ( ) const { return scope_ - > inside_with ( ) ; } <nl> - CachedDataMode cached_data_mode ( ) const { return info_ - > cached_data_mode ( ) ; } <nl> + ScriptCompiler : : CompileOptions compile_options ( ) const { <nl> + return info_ - > compile_options ( ) ; <nl> + } <nl> Scope * DeclarationScope ( VariableMode mode ) { <nl> return IsLexicalVariableMode ( mode ) <nl> ? scope_ : scope_ - > DeclarationScope ( ) ; <nl> class Parser : public ParserBase < ParserTraits > { <nl> Scope * original_scope_ ; / / for ES5 function declarations in sloppy eval <nl> Target * target_stack_ ; / / for break , continue statements <nl> ParseData * cached_parse_data_ ; <nl> - CachedDataMode cached_data_mode_ ; <nl> AstValueFactory * ast_value_factory_ ; <nl> <nl> CompilationInfo * info_ ; <nl> mmm a / test / cctest / cctest . h <nl> ppp b / test / cctest / cctest . h <nl> static inline v8 : : Local < v8 : : Value > CompileRun ( v8 : : Local < v8 : : String > source ) { <nl> } <nl> <nl> <nl> - static inline v8 : : Local < v8 : : Value > PreCompileCompileRun ( const char * source ) { <nl> + static inline v8 : : Local < v8 : : Value > ParserCacheCompileRun ( const char * source ) { <nl> / / Compile once just to get the preparse data , then compile the second time <nl> / / using the data . <nl> v8 : : Isolate * isolate = v8 : : Isolate : : GetCurrent ( ) ; <nl> v8 : : ScriptCompiler : : Source script_source ( v8_str ( source ) ) ; <nl> v8 : : ScriptCompiler : : Compile ( isolate , & script_source , <nl> - v8 : : ScriptCompiler : : kProduceDataToCache ) ; <nl> - return v8 : : ScriptCompiler : : Compile ( isolate , & script_source ) - > Run ( ) ; <nl> + v8 : : ScriptCompiler : : kProduceParserCache ) ; <nl> + <nl> + / / Check whether we received cached data , and if so use it . <nl> + v8 : : ScriptCompiler : : CompileOptions options = <nl> + script_source . GetCachedData ( ) ? v8 : : ScriptCompiler : : kConsumeParserCache <nl> + : v8 : : ScriptCompiler : : kNoCompileOptions ; <nl> + <nl> + return v8 : : ScriptCompiler : : Compile ( isolate , & script_source , options ) - > Run ( ) ; <nl> } <nl> <nl> <nl> mmm a / test / cctest / test - api . cc <nl> ppp b / test / cctest / test - api . cc <nl> TEST ( PreCompileSerialization ) { <nl> const char * script = " function foo ( a ) { return a + 1 ; } " ; <nl> v8 : : ScriptCompiler : : Source source ( v8_str ( script ) ) ; <nl> v8 : : ScriptCompiler : : Compile ( isolate , & source , <nl> - v8 : : ScriptCompiler : : kProduceDataToCache ) ; <nl> + v8 : : ScriptCompiler : : kProduceParserCache ) ; <nl> / / Serialize . <nl> const v8 : : ScriptCompiler : : CachedData * cd = source . GetCachedData ( ) ; <nl> i : : byte * serialized_data = i : : NewArray < i : : byte > ( cd - > length ) ; <nl> mmm a / test / cctest / test - compiler . cc <nl> ppp b / test / cctest / test - compiler . cc <nl> static Handle < JSFunction > Compile ( const char * source ) { <nl> Isolate * isolate = CcTest : : i_isolate ( ) ; <nl> Handle < String > source_code = isolate - > factory ( ) - > NewStringFromUtf8 ( <nl> CStrVector ( source ) ) . ToHandleChecked ( ) ; <nl> - Handle < SharedFunctionInfo > shared_function = <nl> - Compiler : : CompileScript ( source_code , <nl> - Handle < String > ( ) , <nl> - 0 , <nl> - 0 , <nl> - false , <nl> - Handle < Context > ( isolate - > native_context ( ) ) , <nl> - NULL , NULL , NO_CACHED_DATA , <nl> - NOT_NATIVES_CODE ) ; <nl> + Handle < SharedFunctionInfo > shared_function = Compiler : : CompileScript ( <nl> + source_code , Handle < String > ( ) , 0 , 0 , false , <nl> + Handle < Context > ( isolate - > native_context ( ) ) , NULL , NULL , <nl> + v8 : : ScriptCompiler : : kNoCompileOptions , NOT_NATIVES_CODE ) ; <nl> return isolate - > factory ( ) - > NewFunctionFromSharedFunctionInfo ( <nl> shared_function , isolate - > native_context ( ) ) ; <nl> } <nl> mmm a / test / cctest / test - debug . cc <nl> ppp b / test / cctest / test - debug . cc <nl> TEST ( PrecompiledFunction ) { <nl> " } ; \ n " <nl> " a = b = c = 2 ; \ n " <nl> " bar ( ) ; \ n " ; <nl> - v8 : : Local < v8 : : Value > result = PreCompileCompileRun ( source ) ; <nl> + v8 : : Local < v8 : : Value > result = ParserCacheCompileRun ( source ) ; <nl> CHECK ( result - > IsString ( ) ) ; <nl> v8 : : String : : Utf8Value utf8 ( result ) ; <nl> CHECK_EQ ( " bar " , * utf8 ) ; <nl> mmm a / test / cctest / test - parsing . cc <nl> ppp b / test / cctest / test - parsing . cc <nl> TEST ( UsingCachedData ) { <nl> isolate , new ScriptResource ( source , source_length ) ) ) ; <nl> i : : FLAG_min_preparse_length = 0 ; <nl> v8 : : ScriptCompiler : : Compile ( isolate , & script_source , <nl> - v8 : : ScriptCompiler : : kProduceDataToCache ) ; <nl> + v8 : : ScriptCompiler : : kProduceParserCache ) ; <nl> CHECK ( script_source . GetCachedData ( ) ) ; <nl> <nl> / / Compile the script again , using the cached data . <nl> bool lazy_flag = i : : FLAG_lazy ; <nl> i : : FLAG_lazy = true ; <nl> - v8 : : ScriptCompiler : : Compile ( isolate , & script_source ) ; <nl> + v8 : : ScriptCompiler : : Compile ( isolate , & script_source , <nl> + v8 : : ScriptCompiler : : kConsumeParserCache ) ; <nl> i : : FLAG_lazy = false ; <nl> - v8 : : ScriptCompiler : : CompileUnbound ( isolate , & script_source ) ; <nl> + v8 : : ScriptCompiler : : CompileUnbound ( isolate , & script_source , <nl> + v8 : : ScriptCompiler : : kConsumeParserCache ) ; <nl> i : : FLAG_lazy = lazy_flag ; <nl> } <nl> <nl> TEST ( PreparseFunctionDataIsUsed ) { <nl> <nl> v8 : : ScriptCompiler : : Source good_source ( v8_str ( good_code ) ) ; <nl> v8 : : ScriptCompiler : : Compile ( isolate , & good_source , <nl> - v8 : : ScriptCompiler : : kProduceDataToCache ) ; <nl> + v8 : : ScriptCompiler : : kProduceParserCache ) ; <nl> <nl> const v8 : : ScriptCompiler : : CachedData * cached_data = <nl> good_source . GetCachedData ( ) ; <nl> TEST ( PreparseFunctionDataIsUsed ) { <nl> v8_str ( bad_code ) , new v8 : : ScriptCompiler : : CachedData ( <nl> cached_data - > data , cached_data - > length ) ) ; <nl> v8 : : Local < v8 : : Value > result = <nl> - v8 : : ScriptCompiler : : Compile ( isolate , & bad_source ) - > Run ( ) ; <nl> + v8 : : ScriptCompiler : : Compile ( <nl> + isolate , & bad_source , v8 : : ScriptCompiler : : kConsumeParserCache ) - > Run ( ) ; <nl> CHECK ( result - > IsInt32 ( ) ) ; <nl> CHECK_EQ ( 25 , result - > Int32Value ( ) ) ; <nl> } <nl> TEST ( PreparsingObjectLiterals ) { <nl> <nl> { <nl> const char * source = " var myo = { if : \ " foo \ " } ; myo . if ; " ; <nl> - v8 : : Local < v8 : : Value > result = PreCompileCompileRun ( source ) ; <nl> + v8 : : Local < v8 : : Value > result = ParserCacheCompileRun ( source ) ; <nl> CHECK ( result - > IsString ( ) ) ; <nl> v8 : : String : : Utf8Value utf8 ( result ) ; <nl> CHECK_EQ ( " foo " , * utf8 ) ; <nl> TEST ( PreparsingObjectLiterals ) { <nl> <nl> { <nl> const char * source = " var myo = { \ " bar \ " : \ " foo \ " } ; myo [ \ " bar \ " ] ; " ; <nl> - v8 : : Local < v8 : : Value > result = PreCompileCompileRun ( source ) ; <nl> + v8 : : Local < v8 : : Value > result = ParserCacheCompileRun ( source ) ; <nl> CHECK ( result - > IsString ( ) ) ; <nl> v8 : : String : : Utf8Value utf8 ( result ) ; <nl> CHECK_EQ ( " foo " , * utf8 ) ; <nl> TEST ( PreparsingObjectLiterals ) { <nl> <nl> { <nl> const char * source = " var myo = { 1 : \ " foo \ " } ; myo [ 1 ] ; " ; <nl> - v8 : : Local < v8 : : Value > result = PreCompileCompileRun ( source ) ; <nl> + v8 : : Local < v8 : : Value > result = ParserCacheCompileRun ( source ) ; <nl> CHECK ( result - > IsString ( ) ) ; <nl> v8 : : String : : Utf8Value utf8 ( result ) ; <nl> CHECK_EQ ( " foo " , * utf8 ) ; <nl> TEST ( DontRegressPreParserDataSizes ) { <nl> i : : Handle < i : : Script > script = factory - > NewScript ( source ) ; <nl> i : : CompilationInfoWithZone info ( script ) ; <nl> i : : ScriptData * sd = NULL ; <nl> - info . SetCachedData ( & sd , i : : PRODUCE_CACHED_DATA ) ; <nl> + info . SetCachedData ( & sd , v8 : : ScriptCompiler : : kProduceParserCache ) ; <nl> i : : Parser : : Parse ( & info , true ) ; <nl> i : : ParseData pd ( sd ) ; <nl> <nl> mmm a / test / cctest / test - serialize . cc <nl> ppp b / test / cctest / test - serialize . cc <nl> TEST ( SerializeToplevelOnePlusOne ) { <nl> <nl> ScriptData * cache = NULL ; <nl> <nl> - Handle < SharedFunctionInfo > orig = <nl> - Compiler : : CompileScript ( orig_source , Handle < String > ( ) , 0 , 0 , false , <nl> - Handle < Context > ( isolate - > native_context ( ) ) , NULL , <nl> - & cache , PRODUCE_CACHED_DATA , NOT_NATIVES_CODE ) ; <nl> + Handle < SharedFunctionInfo > orig = Compiler : : CompileScript ( <nl> + orig_source , Handle < String > ( ) , 0 , 0 , false , <nl> + Handle < Context > ( isolate - > native_context ( ) ) , NULL , & cache , <nl> + v8 : : ScriptCompiler : : kProduceCodeCache , NOT_NATIVES_CODE ) ; <nl> <nl> int builtins_count = CountBuiltins ( ) ; <nl> <nl> Handle < SharedFunctionInfo > copy ; <nl> { <nl> DisallowCompilation no_compile_expected ( isolate ) ; <nl> - copy = Compiler : : CompileScript ( copy_source , Handle < String > ( ) , 0 , 0 , false , <nl> - Handle < Context > ( isolate - > native_context ( ) ) , <nl> - NULL , & cache , CONSUME_CACHED_DATA , <nl> - NOT_NATIVES_CODE ) ; <nl> + copy = Compiler : : CompileScript ( <nl> + copy_source , Handle < String > ( ) , 0 , 0 , false , <nl> + Handle < Context > ( isolate - > native_context ( ) ) , NULL , & cache , <nl> + v8 : : ScriptCompiler : : kConsumeCodeCache , NOT_NATIVES_CODE ) ; <nl> } <nl> + <nl> CHECK_NE ( * orig , * copy ) ; <nl> CHECK ( Script : : cast ( copy - > script ( ) ) - > source ( ) = = * copy_source ) ; <nl> <nl> TEST ( SerializeToplevelInternalizedString ) { <nl> Handle < JSObject > global ( isolate - > context ( ) - > global_object ( ) ) ; <nl> ScriptData * cache = NULL ; <nl> <nl> - Handle < SharedFunctionInfo > orig = <nl> - Compiler : : CompileScript ( orig_source , Handle < String > ( ) , 0 , 0 , false , <nl> - Handle < Context > ( isolate - > native_context ( ) ) , NULL , <nl> - & cache , PRODUCE_CACHED_DATA , NOT_NATIVES_CODE ) ; <nl> + Handle < SharedFunctionInfo > orig = Compiler : : CompileScript ( <nl> + orig_source , Handle < String > ( ) , 0 , 0 , false , <nl> + Handle < Context > ( isolate - > native_context ( ) ) , NULL , & cache , <nl> + v8 : : ScriptCompiler : : kProduceCodeCache , NOT_NATIVES_CODE ) ; <nl> Handle < JSFunction > orig_fun = <nl> isolate - > factory ( ) - > NewFunctionFromSharedFunctionInfo ( <nl> orig , isolate - > native_context ( ) ) ; <nl> TEST ( SerializeToplevelInternalizedString ) { <nl> Handle < SharedFunctionInfo > copy ; <nl> { <nl> DisallowCompilation no_compile_expected ( isolate ) ; <nl> - copy = Compiler : : CompileScript ( copy_source , Handle < String > ( ) , 0 , 0 , false , <nl> - Handle < Context > ( isolate - > native_context ( ) ) , <nl> - NULL , & cache , CONSUME_CACHED_DATA , <nl> - NOT_NATIVES_CODE ) ; <nl> + copy = Compiler : : CompileScript ( <nl> + copy_source , Handle < String > ( ) , 0 , 0 , false , <nl> + Handle < Context > ( isolate - > native_context ( ) ) , NULL , & cache , <nl> + v8 : : ScriptCompiler : : kConsumeCodeCache , NOT_NATIVES_CODE ) ; <nl> } <nl> CHECK_NE ( * orig , * copy ) ; <nl> CHECK ( Script : : cast ( copy - > script ( ) ) - > source ( ) = = * copy_source ) ; <nl> mmm a / tools / parser - shell . cc <nl> ppp b / tools / parser - shell . cc <nl> std : : pair < v8 : : base : : TimeDelta , v8 : : base : : TimeDelta > RunBaselineParser ( <nl> { <nl> CompilationInfoWithZone info ( script ) ; <nl> info . MarkAsGlobal ( ) ; <nl> - info . SetCachedData ( & cached_data_impl , i : : PRODUCE_CACHED_DATA ) ; <nl> + info . SetCachedData ( & cached_data_impl , <nl> + v8 : : ScriptCompiler : : kProduceParserCache ) ; <nl> v8 : : base : : ElapsedTimer timer ; <nl> timer . Start ( ) ; <nl> / / Allow lazy parsing ; otherwise we won ' t produce cached data . <nl> std : : pair < v8 : : base : : TimeDelta , v8 : : base : : TimeDelta > RunBaselineParser ( <nl> { <nl> CompilationInfoWithZone info ( script ) ; <nl> info . MarkAsGlobal ( ) ; <nl> - info . SetCachedData ( & cached_data_impl , i : : CONSUME_CACHED_DATA ) ; <nl> + info . SetCachedData ( & cached_data_impl , <nl> + v8 : : ScriptCompiler : : kConsumeParserCache ) ; <nl> v8 : : base : : ElapsedTimer timer ; <nl> timer . Start ( ) ; <nl> / / Allow lazy parsing ; otherwise cached data won ' t help . <nl> | Change ScriptCompiler : : CompileOptions to allow for two ' cache ' modes | v8/v8 | a42612b4a788841f8043bf4d4ec1440c337bae25 | 2014-07-16T12:18:33Z |
mmm a / tensorflow / python / framework / gen_docs_combined . py <nl> ppp b / tensorflow / python / framework / gen_docs_combined . py <nl> def library ( name , title , module = None , * * args ) : <nl> library ( " unsupported " , " Unsupported " , tf . unsupported ) , <nl> ] <nl> <nl> - _hidden_symbols = [ " Event " , " Summary " , " xrange " , <nl> + _hidden_symbols = [ " Event " , " LogMessage " , " Summary " , " xrange " , <nl> " HistogramProto " , " ConfigProto " , " NodeDef " , " GraphDef " , <nl> " GPUOptions " , " GraphOptions " , " SessionInterface " , <nl> " BaseSession " , " NameAttrList " , " AttrValue " , <nl> | Fix for broken OSS build | tensorflow/tensorflow | d6ede40403b6ec63972afd71b5c340f8625f5458 | 2016-01-27T22:02:29Z |
new file mode 100644 <nl> index 00000000000 . . ab073d6f08d <nl> mmm / dev / null <nl> ppp b / Marlin / src / HAL / shared / esp_wifi . cpp <nl> <nl> + / * * <nl> + * Marlin 3D Printer Firmware <nl> + * Copyright ( c ) 2020 MarlinFirmware [ https : / / github . com / MarlinFirmware / Marlin ] <nl> + * <nl> + * Based on Sprinter and grbl . <nl> + * Copyright ( c ) 2011 Camiel Gubbels / Erik van der Zalm <nl> + * <nl> + * This program is free software : you can redistribute it and / or modify <nl> + * it under the terms of the GNU General Public License as published by <nl> + * the Free Software Foundation , either version 3 of the License , or <nl> + * ( at your option ) any later version . <nl> + * <nl> + * This program is distributed in the hope that it will be useful , <nl> + * but WITHOUT ANY WARRANTY ; without even the implied warranty of <nl> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE . See the <nl> + * GNU General Public License for more details . <nl> + * <nl> + * You should have received a copy of the GNU General Public License <nl> + * along with this program . If not , see < http : / / www . gnu . org / licenses / > . <nl> + * <nl> + * / <nl> + <nl> + # include " . . / . . / inc / MarlinConfig . h " <nl> + # include " Delay . h " <nl> + <nl> + void esp_wifi_init ( void ) { <nl> + # if PIN_EXISTS ( ESP_WIFI_MODULE_RESET ) <nl> + OUT_WRITE ( ESP_WIFI_MODULE_RESET_PIN , LOW ) ; <nl> + delay ( 1 ) ; <nl> + OUT_WRITE ( ESP_WIFI_MODULE_RESET_PIN , HIGH ) ; <nl> + # endif <nl> + # if PIN_EXISTS ( ESP_WIFI_MODULE_ENABLE ) <nl> + OUT_WRITE ( ESP_WIFI_MODULE_ENABLE_PIN , HIGH ) ; <nl> + # endif <nl> + } <nl> new file mode 100644 <nl> index 00000000000 . . e8aa50446bf <nl> mmm / dev / null <nl> ppp b / Marlin / src / HAL / shared / esp_wifi . h <nl> <nl> + / * * <nl> + * Marlin 3D Printer Firmware <nl> + * Copyright ( c ) 2020 MarlinFirmware [ https : / / github . com / MarlinFirmware / Marlin ] <nl> + * <nl> + * Based on Sprinter and grbl . <nl> + * Copyright ( c ) 2011 Camiel Gubbels / Erik van der Zalm <nl> + * <nl> + * This program is free software : you can redistribute it and / or modify <nl> + * it under the terms of the GNU General Public License as published by <nl> + * the Free Software Foundation , either version 3 of the License , or <nl> + * ( at your option ) any later version . <nl> + * <nl> + * This program is distributed in the hope that it will be useful , <nl> + * but WITHOUT ANY WARRANTY ; without even the implied warranty of <nl> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE . See the <nl> + * GNU General Public License for more details . <nl> + * <nl> + * You should have received a copy of the GNU General Public License <nl> + * along with this program . If not , see < http : / / www . gnu . org / licenses / > . <nl> + * <nl> + * / <nl> + # pragma once <nl> + <nl> + void esp_wifi_init ( ) ; <nl> mmm a / Marlin / src / MarlinCore . cpp <nl> ppp b / Marlin / src / MarlinCore . cpp <nl> <nl> # include " feature / closedloop . h " <nl> <nl> # include " HAL / shared / Delay . h " <nl> + # include " HAL / shared / esp_wifi . h " <nl> <nl> # include " module / stepper / indirection . h " <nl> <nl> void setup ( ) { <nl> BOARD_INIT ( ) ; <nl> # endif <nl> <nl> + SETUP_RUN ( esp_wifi_init ( ) ) ; <nl> + <nl> / / Check startup - does nothing if bootloader sets MCUSR to 0 <nl> byte mcu = HAL_get_reset_source ( ) ; <nl> if ( mcu & 1 ) SERIAL_ECHOLNPGM ( STR_POWERUP ) ; <nl> mmm a / Marlin / src / pins / pinsDebug_list . h <nl> ppp b / Marlin / src / pins / pinsDebug_list . h <nl> <nl> # if PIN_EXISTS ( CLOSED_LOOP_MOVE_COMPLETE ) <nl> REPORT_NAME_DIGITAL ( __LINE__ , CLOSED_LOOP_MOVE_COMPLETE_PIN ) <nl> # endif <nl> + # if PIN_EXISTS ( ESP_WIFI_MODULE_RESET ) <nl> + REPORT_NAME_DIGITAL ( __LINE__ , ESP_WIFI_MODULE_RESET_PIN ) <nl> + # endif <nl> + # if PIN_EXISTS ( ESP_WIFI_MODULE_ENABLE ) <nl> + REPORT_NAME_DIGITAL ( __LINE__ , ESP_WIFI_MODULE_ENABLE_PIN ) <nl> + # endif <nl> mmm a / Marlin / src / pins / stm32f4 / pins_BLACK_STM32F407VE . h <nl> ppp b / Marlin / src / pins / stm32f4 / pins_BLACK_STM32F407VE . h <nl> <nl> # define SDIO_CK_PIN PC12 <nl> # define SDIO_CMD_PIN PD2 <nl> <nl> - # if ! defined ( SDCARD_CONNECTION ) | | SD_CONNECTION_IS ( ONBOARD ) <nl> + # ifndef SDCARD_CONNECTION <nl> + # define SDCARD_CONNECTION ONBOARD <nl> + # endif <nl> + <nl> + # if SD_CONNECTION_IS ( ONBOARD ) <nl> # define SDIO_SUPPORT / / Use SDIO for onboard SD <nl> <nl> # ifndef SDIO_SUPPORT <nl> mmm a / Marlin / src / pins / stm32f4 / pins_BTT_SKR_PRO_V1_1 . h <nl> ppp b / Marlin / src / pins / stm32f4 / pins_BTT_SKR_PRO_V1_1 . h <nl> <nl> <nl> / / Use one of these or SDCard - based Emulation will be used <nl> / / # define SRAM_EEPROM_EMULATION / / Use BackSRAM - based EEPROM emulation <nl> - / / # define FLASH_EEPROM_EMULATION / / Use Flash - based EEPROM emulation <nl> + # define FLASH_EEPROM_EMULATION / / Use Flash - based EEPROM emulation <nl> <nl> / / <nl> / / Servos <nl> <nl> # define HEATER_BED_PIN PD12 / / Hotbed <nl> # define FAN_PIN PC8 / / Fan0 <nl> # define FAN1_PIN PE5 / / Fan1 <nl> - # define FAN2_PIN PE6 / / Fan2 <nl> + # define FAN2_PIN PE6 <nl> + <nl> + # ifndef E0_AUTO_FAN_PIN <nl> + # define E0_AUTO_FAN_PIN PC9 <nl> + # endif <nl> <nl> / / <nl> / / Misc . Functions <nl> <nl> <nl> / / <nl> / / Onboard SD card <nl> - / / NOT compatible with LCD <nl> + / / Must use soft SPI because Marlin ' s default hardware SPI is tied to LCD ' s EXP2 <nl> / / <nl> - # if SDCARD_CONNECTION = = ONBOARD & & ! HAS_SPI_LCD <nl> + # if SD_CONNECTION_IS ( ONBOARD ) <nl> # define SOFTWARE_SPI / / Use soft SPI for onboard SD <nl> # define SDSS PA4 <nl> # define SCK_PIN PA5 <nl> # define MISO_PIN PA6 <nl> # define MOSI_PIN PB5 <nl> - # else <nl> - # define SDSS PB12 <nl> # endif <nl> <nl> / * * <nl> <nl> # if HAS_SPI_LCD <nl> # define BEEPER_PIN PG4 <nl> # define BTN_ENC PA8 <nl> + # if SD_CONNECTION_IS ( LCD ) <nl> + # define SDSS PB12 / / Uses default hardware SPI for LCD ' s SD <nl> + # endif <nl> <nl> # if ENABLED ( CR10_STOCKDISPLAY ) <nl> # define LCD_PINS_RS PG6 <nl> <nl> # undef ST7920_DELAY_2 <nl> # undef ST7920_DELAY_3 <nl> <nl> + # elif ENABLED ( MKS_MINI_12864 ) <nl> + # define DOGLCD_A0 PG6 <nl> + # define DOGLCD_CS PG3 <nl> + <nl> # else <nl> <nl> # define LCD_PINS_RS PD10 <nl> <nl> # endif <nl> <nl> # endif / / HAS_SPI_LCD <nl> + <nl> + / / <nl> + / / WIFI <nl> + / / <nl> + <nl> + / * * <nl> + * _____ <nl> + * TX | 1 2 | GND Enable PG1 / / Must be high for module to run <nl> + * Enable | 3 4 | GPIO2 Reset PG0 / / Leave as unused ( OK to leave floating ) <nl> + * Reset | 5 6 | GPIO0 GPIO2 PF15 / / Leave as unused ( best to leave floating ) <nl> + * 3 . 3V | 7 8 | RX GPIO0 PF14 / / Leave as unused ( best to leave floating ) <nl> + * ￣ ￣ <nl> + * W1 <nl> + * / <nl> + # define ESP_WIFI_MODULE_COM 6 / / must also set SERIAL_PORT or SERIAL_PORT_2 to this <nl> + # define ESP_WIFI_MODULE_BAUDRATE BAUDRATE / / 115200 / / use BAUDRATE ? would guarantee same baud rate as SERIAL_PORT & SERIAL_PORT_2 <nl> + # define ESP_WIFI_MODULE_RESET_PIN - 1 <nl> + # define ESP_WIFI_MODULE_ENABLE_PIN PG1 <nl> mmm a / Marlin / src / pins / stm32f4 / pins_FLYF407ZG . h <nl> ppp b / Marlin / src / pins / stm32f4 / pins_FLYF407ZG . h <nl> <nl> # define SDIO_CK_PIN PC12 <nl> # define SDIO_CMD_PIN PD2 <nl> <nl> - # if ! defined ( SDCARD_CONNECTION ) | | SD_CONNECTION_IS ( ONBOARD ) <nl> + # ifndef SDCARD_CONNECTION <nl> + # define SDCARD_CONNECTION ONBOARD <nl> + # endif <nl> + <nl> + # if SD_CONNECTION_IS ( ONBOARD ) <nl> # define SDIO_SUPPORT / / Use SDIO for onboard SD <nl> <nl> # ifndef SDIO_SUPPORT <nl> | SKR Pro 1 . 1 WiFi and LCD SD card support ( ) | MarlinFirmware/Marlin | f5d809f3667846e962c86d1d4f4b8ac97e8a3e5f | 2020-04-16T08:55:33Z |
mmm a / test / integration / append_stress . py <nl> ppp b / test / integration / append_stress . py <nl> <nl> from test_common import * <nl> import time <nl> <nl> - # n_appends = 100000 <nl> - n_appends = 5000 <nl> + n_appends_valgrind = 3000 <nl> + n_appends_no_valgrind = 20000 <nl> <nl> # A hacky function that reads a response from a socket of an expected size . <nl> def read_response_of_expected_size ( s , n ) : <nl> def test_function ( opts , port ) : <nl> s = socket . socket ( socket . AF_INET , socket . SOCK_STREAM ) <nl> s . connect ( ( " localhost " , port ) ) <nl> <nl> + n_appends = n_appends_valgrind if opts [ " valgrind " ] else n_appends_no_valgrind <nl> + <nl> def send ( str ) : <nl> # print str <nl> s . sendall ( str ) <nl> <nl> key = ' fizz ' <nl> - val_chunks = [ ' buzz ' , ' baaz ' , ' bozo ' ] <nl> + val_chunks = [ ' buzzBUZZZ ' , ' baazBAAZ ' , ' bozoBOZO ' ] <nl> <nl> send ( " set % s 0 0 % d noreply \ r \ n % s \ r \ n " % ( key , len ( val_chunks [ 0 ] ) , val_chunks [ 0 ] ) ) <nl> <nl> | Made append_stress change workload depending on valgrind flag . | rethinkdb/rethinkdb | b92b5bff6f771c470506960317dc9869cd974a33 | 2010-12-17T01:09:43Z |
mmm a / atom / browser / lib / rpc - server . coffee <nl> ppp b / atom / browser / lib / rpc - server . coffee <nl> objectsRegistry = require ' . / objects - registry . js ' <nl> v8Util = process . atomBinding ' v8_util ' <nl> IDWeakMap = process . atomBinding ( ' id_weak_map ' ) . IDWeakMap <nl> <nl> - # Weak reference to callback with their registry ID . <nl> - rendererCallbacks = new IDWeakMap ( ) <nl> + # Object mapping from webcontents id to their renderer callbacks weakmap . <nl> + rendererRegistry = { } <nl> <nl> # Convert a real value into meta data . <nl> valueToMeta = ( sender , value , optimizeSimpleObject = false ) - > <nl> unwrapArgs = ( sender , args ) - > <nl> returnValue = metaToValue meta . value <nl> - > returnValue <nl> when ' function ' <nl> + webContentsId = sender . getId ( ) <nl> + rendererCallbacks = rendererRegistry [ webContentsId ] <nl> + if not rendererCallbacks ? <nl> + # Weak reference to callbacks with their ID <nl> + rendererCallbacks = new IDWeakMap ( ) <nl> + rendererRegistry [ webContentsId ] = rendererCallbacks <nl> + <nl> if rendererCallbacks . has ( meta . id ) <nl> return rendererCallbacks . get ( meta . id ) <nl> <nl> rendererReleased = false <nl> - objectsRegistry . once " clear - # { sender . getId ( ) } " , - > <nl> + objectsRegistry . once " clear - # { webContentsId } " , - > <nl> rendererReleased = true <nl> <nl> ret = - > <nl> callFunction = ( event , func , caller , args ) - > <nl> <nl> # Send by BrowserWindow when its render view is deleted . <nl> process . on ' ATOM_BROWSER_RELEASE_RENDER_VIEW ' , ( id ) - > <nl> + if rendererRegistry . id ? <nl> + delete rendererRegistry . id <nl> objectsRegistry . clear id <nl> <nl> ipc . on ' ATOM_BROWSER_REQUIRE ' , ( event , module ) - > <nl> mmm a / atom / common / api / atom_api_id_weak_map . cc <nl> ppp b / atom / common / api / atom_api_id_weak_map . cc <nl> namespace atom { <nl> <nl> namespace api { <nl> <nl> - IDWeakMap : : IDWeakMap ( ) { <nl> - id_weak_map_ . reset ( new atom : : IDWeakMap ) ; <nl> + IDWeakMap : : IDWeakMap ( ) : id_weak_map_ ( new atom : : IDWeakMap ) { <nl> } <nl> <nl> IDWeakMap : : ~ IDWeakMap ( ) { <nl> + id_weak_map_ = nullptr ; <nl> } <nl> <nl> void IDWeakMap : : Set ( v8 : : Isolate * isolate , <nl> mmm a / atom / common / api / atom_api_id_weak_map . h <nl> ppp b / atom / common / api / atom_api_id_weak_map . h <nl> class IDWeakMap : public mate : : Wrappable { <nl> <nl> protected : <nl> IDWeakMap ( ) ; <nl> - virtual ~ IDWeakMap ( ) ; <nl> + ~ IDWeakMap ( ) ; <nl> <nl> / / mate : : Wrappable : <nl> bool IsDestroyed ( ) const override ; <nl> class IDWeakMap : public mate : : Wrappable { <nl> bool Has ( int32_t id ) ; <nl> void Remove ( int32_t id ) ; <nl> <nl> - scoped_ptr < atom : : IDWeakMap > id_weak_map_ ; <nl> + atom : : IDWeakMap * id_weak_map_ ; <nl> <nl> DISALLOW_COPY_AND_ASSIGN ( IDWeakMap ) ; <nl> } ; <nl> mmm a / atom / common / api / lib / callbacks - registry . coffee <nl> ppp b / atom / common / api / lib / callbacks - registry . coffee <nl> class CallbacksRegistry <nl> continue if location . indexOf ( ' ( native ) ' ) isnt - 1 <nl> continue if location . indexOf ( ' atom . asar ' ) isnt - 1 <nl> [ x , filenameAndLine ] = / ( [ ^ / ^ \ ) ] * ) \ ) ? $ / gi . exec ( location ) <nl> - [ x , line , column ] = / ( \ d + ) : ( \ d + ) / g . exec ( filenameAndLine ) <nl> - id + = parseInt ( line ) + parseInt ( column ) <nl> break <nl> <nl> @ callbacks [ id ] = callback <nl> mmm a / atom / common / id_weak_map . cc <nl> ppp b / atom / common / id_weak_map . cc <nl> IDWeakMap : : IDWeakMap ( ) : next_id_ ( 0 ) { <nl> IDWeakMap : : ~ IDWeakMap ( ) { <nl> } <nl> <nl> - int32_t IDWeakMap : : Add ( v8 : : Isolate * isolate , v8 : : Local < v8 : : Object > object ) { <nl> - int32_t id = GetNextID ( ) ; <nl> - auto global = make_linked_ptr ( new v8 : : Global < v8 : : Object > ( isolate , object ) ) ; <nl> - ObjectKey * key = new ObjectKey ( id , this ) ; <nl> - global - > SetWeak ( key , OnObjectGC , v8 : : WeakCallbackType : : kParameter ) ; <nl> - map_ [ id ] = global ; <nl> - return id ; <nl> - } <nl> - <nl> void IDWeakMap : : Set ( v8 : : Isolate * isolate , <nl> int32_t id , <nl> v8 : : Local < v8 : : Object > object ) { <nl> void IDWeakMap : : Set ( v8 : : Isolate * isolate , <nl> map_ [ id ] = global ; <nl> } <nl> <nl> + int32_t IDWeakMap : : Add ( v8 : : Isolate * isolate , v8 : : Local < v8 : : Object > object ) { <nl> + int32_t id = GetNextID ( ) ; <nl> + Set ( isolate , id , object ) ; <nl> + return id ; <nl> + } <nl> + <nl> v8 : : MaybeLocal < v8 : : Object > IDWeakMap : : Get ( v8 : : Isolate * isolate , int32_t id ) { <nl> auto iter = map_ . find ( id ) ; <nl> if ( iter = = map_ . end ( ) ) <nl> mmm a / atom / common / id_weak_map . h <nl> ppp b / atom / common / id_weak_map . h <nl> class IDWeakMap { <nl> IDWeakMap ( ) ; <nl> ~ IDWeakMap ( ) ; <nl> <nl> - / / Adds | object | to WeakMap and returns its allocated | id | . <nl> - int32_t Add ( v8 : : Isolate * isolate , v8 : : Local < v8 : : Object > object ) ; <nl> - <nl> / / Sets the object to WeakMap with the given | id | . <nl> void Set ( v8 : : Isolate * isolate , int32_t id , v8 : : Local < v8 : : Object > object ) ; <nl> <nl> + / / Adds | object | to WeakMap and returns its allocated | id | . <nl> + int32_t Add ( v8 : : Isolate * isolate , v8 : : Local < v8 : : Object > object ) ; <nl> + <nl> / / Gets the object from WeakMap by its | id | . <nl> v8 : : MaybeLocal < v8 : : Object > Get ( v8 : : Isolate * isolate , int32_t id ) ; <nl> <nl> | use webcontents id to identify callbacks | electron/electron | 2c59f4567e2e1b707b0e5493188f0106801837e4 | 2015-10-30T14:21:19Z |
mmm a / src / crankshaft / hydrogen . cc <nl> ppp b / src / crankshaft / hydrogen . cc <nl> void HOptimizedGraphBuilder : : GenerateStringCharFromCode ( CallRuntime * call ) { <nl> } <nl> <nl> <nl> - / / Fast support for string . charAt ( n ) and string [ n ] . <nl> - void HOptimizedGraphBuilder : : GenerateStringCharAt ( CallRuntime * call ) { <nl> - DCHECK ( call - > arguments ( ) - > length ( ) = = 2 ) ; <nl> - CHECK_ALIVE ( VisitForValue ( call - > arguments ( ) - > at ( 0 ) ) ) ; <nl> - CHECK_ALIVE ( VisitForValue ( call - > arguments ( ) - > at ( 1 ) ) ) ; <nl> - HValue * index = Pop ( ) ; <nl> - HValue * string = Pop ( ) ; <nl> - HInstruction * char_code = BuildStringCharCodeAt ( string , index ) ; <nl> - AddInstruction ( char_code ) ; <nl> - HInstruction * result = NewUncasted < HStringCharFromCode > ( char_code ) ; <nl> - return ast_context ( ) - > ReturnInstruction ( result , call - > id ( ) ) ; <nl> - } <nl> - <nl> - <nl> / / Fast support for SubString . <nl> void HOptimizedGraphBuilder : : GenerateSubString ( CallRuntime * call ) { <nl> DCHECK_EQ ( 3 , call - > arguments ( ) - > length ( ) ) ; <nl> mmm a / src / crankshaft / hydrogen . h <nl> ppp b / src / crankshaft / hydrogen . h <nl> class HOptimizedGraphBuilder : public HGraphBuilder , public AstVisitor { <nl> F ( NewObject ) \ <nl> F ( ValueOf ) \ <nl> F ( StringCharFromCode ) \ <nl> - F ( StringCharAt ) \ <nl> F ( OneByteSeqStringSetChar ) \ <nl> F ( TwoByteSeqStringSetChar ) \ <nl> F ( ToInteger ) \ <nl> mmm a / src / full - codegen / arm / full - codegen - arm . cc <nl> ppp b / src / full - codegen / arm / full - codegen - arm . cc <nl> void FullCodeGenerator : : EmitStringCharCodeAt ( CallRuntime * expr ) { <nl> } <nl> <nl> <nl> - void FullCodeGenerator : : EmitStringCharAt ( CallRuntime * expr ) { <nl> - ZoneList < Expression * > * args = expr - > arguments ( ) ; <nl> - DCHECK ( args - > length ( ) = = 2 ) ; <nl> - VisitForStackValue ( args - > at ( 0 ) ) ; <nl> - VisitForAccumulatorValue ( args - > at ( 1 ) ) ; <nl> - <nl> - Register object = r1 ; <nl> - Register index = r0 ; <nl> - Register scratch = r3 ; <nl> - Register result = r0 ; <nl> - <nl> - PopOperand ( object ) ; <nl> - <nl> - Label need_conversion ; <nl> - Label index_out_of_range ; <nl> - Label done ; <nl> - StringCharAtGenerator generator ( object , <nl> - index , <nl> - scratch , <nl> - result , <nl> - & need_conversion , <nl> - & need_conversion , <nl> - & index_out_of_range , <nl> - STRING_INDEX_IS_NUMBER ) ; <nl> - generator . GenerateFast ( masm_ ) ; <nl> - __ jmp ( & done ) ; <nl> - <nl> - __ bind ( & index_out_of_range ) ; <nl> - / / When the index is out of range , the spec requires us to return <nl> - / / the empty string . <nl> - __ LoadRoot ( result , Heap : : kempty_stringRootIndex ) ; <nl> - __ jmp ( & done ) ; <nl> - <nl> - __ bind ( & need_conversion ) ; <nl> - / / Move smi zero into the result register , which will trigger <nl> - / / conversion . <nl> - __ mov ( result , Operand ( Smi : : FromInt ( 0 ) ) ) ; <nl> - __ jmp ( & done ) ; <nl> - <nl> - NopRuntimeCallHelper call_helper ; <nl> - generator . GenerateSlow ( masm_ , NOT_PART_OF_IC_HANDLER , call_helper ) ; <nl> - <nl> - __ bind ( & done ) ; <nl> - context ( ) - > Plug ( result ) ; <nl> - } <nl> - <nl> - <nl> void FullCodeGenerator : : EmitCall ( CallRuntime * expr ) { <nl> ZoneList < Expression * > * args = expr - > arguments ( ) ; <nl> DCHECK_LE ( 2 , args - > length ( ) ) ; <nl> mmm a / src / full - codegen / arm64 / full - codegen - arm64 . cc <nl> ppp b / src / full - codegen / arm64 / full - codegen - arm64 . cc <nl> void FullCodeGenerator : : EmitStringCharCodeAt ( CallRuntime * expr ) { <nl> } <nl> <nl> <nl> - void FullCodeGenerator : : EmitStringCharAt ( CallRuntime * expr ) { <nl> - ZoneList < Expression * > * args = expr - > arguments ( ) ; <nl> - DCHECK ( args - > length ( ) = = 2 ) ; <nl> - <nl> - VisitForStackValue ( args - > at ( 0 ) ) ; <nl> - VisitForAccumulatorValue ( args - > at ( 1 ) ) ; <nl> - <nl> - Register object = x1 ; <nl> - Register index = x0 ; <nl> - Register result = x0 ; <nl> - <nl> - PopOperand ( object ) ; <nl> - <nl> - Label need_conversion ; <nl> - Label index_out_of_range ; <nl> - Label done ; <nl> - StringCharAtGenerator generator ( object , <nl> - index , <nl> - x3 , <nl> - result , <nl> - & need_conversion , <nl> - & need_conversion , <nl> - & index_out_of_range , <nl> - STRING_INDEX_IS_NUMBER ) ; <nl> - generator . GenerateFast ( masm_ ) ; <nl> - __ B ( & done ) ; <nl> - <nl> - __ Bind ( & index_out_of_range ) ; <nl> - / / When the index is out of range , the spec requires us to return <nl> - / / the empty string . <nl> - __ LoadRoot ( result , Heap : : kempty_stringRootIndex ) ; <nl> - __ B ( & done ) ; <nl> - <nl> - __ Bind ( & need_conversion ) ; <nl> - / / Move smi zero into the result register , which will trigger conversion . <nl> - __ Mov ( result , Smi : : FromInt ( 0 ) ) ; <nl> - __ B ( & done ) ; <nl> - <nl> - NopRuntimeCallHelper call_helper ; <nl> - generator . GenerateSlow ( masm_ , NOT_PART_OF_IC_HANDLER , call_helper ) ; <nl> - <nl> - __ Bind ( & done ) ; <nl> - context ( ) - > Plug ( result ) ; <nl> - } <nl> - <nl> - <nl> void FullCodeGenerator : : EmitCall ( CallRuntime * expr ) { <nl> ASM_LOCATION ( " FullCodeGenerator : : EmitCall " ) ; <nl> ZoneList < Expression * > * args = expr - > arguments ( ) ; <nl> mmm a / src / full - codegen / full - codegen . h <nl> ppp b / src / full - codegen / full - codegen . h <nl> class FullCodeGenerator : public AstVisitor { <nl> F ( NewObject ) \ <nl> F ( ValueOf ) \ <nl> F ( StringCharFromCode ) \ <nl> - F ( StringCharAt ) \ <nl> F ( OneByteSeqStringSetChar ) \ <nl> F ( TwoByteSeqStringSetChar ) \ <nl> F ( IsJSReceiver ) \ <nl> mmm a / src / full - codegen / ia32 / full - codegen - ia32 . cc <nl> ppp b / src / full - codegen / ia32 / full - codegen - ia32 . cc <nl> void FullCodeGenerator : : EmitStringCharCodeAt ( CallRuntime * expr ) { <nl> } <nl> <nl> <nl> - void FullCodeGenerator : : EmitStringCharAt ( CallRuntime * expr ) { <nl> - ZoneList < Expression * > * args = expr - > arguments ( ) ; <nl> - DCHECK ( args - > length ( ) = = 2 ) ; <nl> - <nl> - VisitForStackValue ( args - > at ( 0 ) ) ; <nl> - VisitForAccumulatorValue ( args - > at ( 1 ) ) ; <nl> - <nl> - Register object = ebx ; <nl> - Register index = eax ; <nl> - Register scratch = edx ; <nl> - Register result = eax ; <nl> - <nl> - PopOperand ( object ) ; <nl> - <nl> - Label need_conversion ; <nl> - Label index_out_of_range ; <nl> - Label done ; <nl> - StringCharAtGenerator generator ( object , <nl> - index , <nl> - scratch , <nl> - result , <nl> - & need_conversion , <nl> - & need_conversion , <nl> - & index_out_of_range , <nl> - STRING_INDEX_IS_NUMBER ) ; <nl> - generator . GenerateFast ( masm_ ) ; <nl> - __ jmp ( & done ) ; <nl> - <nl> - __ bind ( & index_out_of_range ) ; <nl> - / / When the index is out of range , the spec requires us to return <nl> - / / the empty string . <nl> - __ Move ( result , Immediate ( isolate ( ) - > factory ( ) - > empty_string ( ) ) ) ; <nl> - __ jmp ( & done ) ; <nl> - <nl> - __ bind ( & need_conversion ) ; <nl> - / / Move smi zero into the result register , which will trigger <nl> - / / conversion . <nl> - __ Move ( result , Immediate ( Smi : : FromInt ( 0 ) ) ) ; <nl> - __ jmp ( & done ) ; <nl> - <nl> - NopRuntimeCallHelper call_helper ; <nl> - generator . GenerateSlow ( masm_ , NOT_PART_OF_IC_HANDLER , call_helper ) ; <nl> - <nl> - __ bind ( & done ) ; <nl> - context ( ) - > Plug ( result ) ; <nl> - } <nl> - <nl> - <nl> void FullCodeGenerator : : EmitCall ( CallRuntime * expr ) { <nl> ZoneList < Expression * > * args = expr - > arguments ( ) ; <nl> DCHECK_LE ( 2 , args - > length ( ) ) ; <nl> mmm a / src / full - codegen / mips / full - codegen - mips . cc <nl> ppp b / src / full - codegen / mips / full - codegen - mips . cc <nl> void FullCodeGenerator : : EmitStringCharCodeAt ( CallRuntime * expr ) { <nl> } <nl> <nl> <nl> - void FullCodeGenerator : : EmitStringCharAt ( CallRuntime * expr ) { <nl> - ZoneList < Expression * > * args = expr - > arguments ( ) ; <nl> - DCHECK ( args - > length ( ) = = 2 ) ; <nl> - <nl> - VisitForStackValue ( args - > at ( 0 ) ) ; <nl> - VisitForAccumulatorValue ( args - > at ( 1 ) ) ; <nl> - __ mov ( a0 , result_register ( ) ) ; <nl> - <nl> - Register object = a1 ; <nl> - Register index = a0 ; <nl> - Register scratch = a3 ; <nl> - Register result = v0 ; <nl> - <nl> - PopOperand ( object ) ; <nl> - <nl> - Label need_conversion ; <nl> - Label index_out_of_range ; <nl> - Label done ; <nl> - StringCharAtGenerator generator ( object , <nl> - index , <nl> - scratch , <nl> - result , <nl> - & need_conversion , <nl> - & need_conversion , <nl> - & index_out_of_range , <nl> - STRING_INDEX_IS_NUMBER ) ; <nl> - generator . GenerateFast ( masm_ ) ; <nl> - __ jmp ( & done ) ; <nl> - <nl> - __ bind ( & index_out_of_range ) ; <nl> - / / When the index is out of range , the spec requires us to return <nl> - / / the empty string . <nl> - __ LoadRoot ( result , Heap : : kempty_stringRootIndex ) ; <nl> - __ jmp ( & done ) ; <nl> - <nl> - __ bind ( & need_conversion ) ; <nl> - / / Move smi zero into the result register , which will trigger <nl> - / / conversion . <nl> - __ li ( result , Operand ( Smi : : FromInt ( 0 ) ) ) ; <nl> - __ jmp ( & done ) ; <nl> - <nl> - NopRuntimeCallHelper call_helper ; <nl> - generator . GenerateSlow ( masm_ , NOT_PART_OF_IC_HANDLER , call_helper ) ; <nl> - <nl> - __ bind ( & done ) ; <nl> - context ( ) - > Plug ( result ) ; <nl> - } <nl> - <nl> - <nl> void FullCodeGenerator : : EmitCall ( CallRuntime * expr ) { <nl> ZoneList < Expression * > * args = expr - > arguments ( ) ; <nl> DCHECK_LE ( 2 , args - > length ( ) ) ; <nl> mmm a / src / full - codegen / mips64 / full - codegen - mips64 . cc <nl> ppp b / src / full - codegen / mips64 / full - codegen - mips64 . cc <nl> void FullCodeGenerator : : EmitStringCharCodeAt ( CallRuntime * expr ) { <nl> } <nl> <nl> <nl> - void FullCodeGenerator : : EmitStringCharAt ( CallRuntime * expr ) { <nl> - ZoneList < Expression * > * args = expr - > arguments ( ) ; <nl> - DCHECK ( args - > length ( ) = = 2 ) ; <nl> - <nl> - VisitForStackValue ( args - > at ( 0 ) ) ; <nl> - VisitForAccumulatorValue ( args - > at ( 1 ) ) ; <nl> - __ mov ( a0 , result_register ( ) ) ; <nl> - <nl> - Register object = a1 ; <nl> - Register index = a0 ; <nl> - Register scratch = a3 ; <nl> - Register result = v0 ; <nl> - <nl> - PopOperand ( object ) ; <nl> - <nl> - Label need_conversion ; <nl> - Label index_out_of_range ; <nl> - Label done ; <nl> - StringCharAtGenerator generator ( object , <nl> - index , <nl> - scratch , <nl> - result , <nl> - & need_conversion , <nl> - & need_conversion , <nl> - & index_out_of_range , <nl> - STRING_INDEX_IS_NUMBER ) ; <nl> - generator . GenerateFast ( masm_ ) ; <nl> - __ jmp ( & done ) ; <nl> - <nl> - __ bind ( & index_out_of_range ) ; <nl> - / / When the index is out of range , the spec requires us to return <nl> - / / the empty string . <nl> - __ LoadRoot ( result , Heap : : kempty_stringRootIndex ) ; <nl> - __ jmp ( & done ) ; <nl> - <nl> - __ bind ( & need_conversion ) ; <nl> - / / Move smi zero into the result register , which will trigger <nl> - / / conversion . <nl> - __ li ( result , Operand ( Smi : : FromInt ( 0 ) ) ) ; <nl> - __ jmp ( & done ) ; <nl> - <nl> - NopRuntimeCallHelper call_helper ; <nl> - generator . GenerateSlow ( masm_ , NOT_PART_OF_IC_HANDLER , call_helper ) ; <nl> - <nl> - __ bind ( & done ) ; <nl> - context ( ) - > Plug ( result ) ; <nl> - } <nl> - <nl> - <nl> void FullCodeGenerator : : EmitCall ( CallRuntime * expr ) { <nl> ZoneList < Expression * > * args = expr - > arguments ( ) ; <nl> DCHECK_LE ( 2 , args - > length ( ) ) ; <nl> mmm a / src / full - codegen / ppc / full - codegen - ppc . cc <nl> ppp b / src / full - codegen / ppc / full - codegen - ppc . cc <nl> void FullCodeGenerator : : EmitStringCharCodeAt ( CallRuntime * expr ) { <nl> } <nl> <nl> <nl> - void FullCodeGenerator : : EmitStringCharAt ( CallRuntime * expr ) { <nl> - ZoneList < Expression * > * args = expr - > arguments ( ) ; <nl> - DCHECK ( args - > length ( ) = = 2 ) ; <nl> - VisitForStackValue ( args - > at ( 0 ) ) ; <nl> - VisitForAccumulatorValue ( args - > at ( 1 ) ) ; <nl> - <nl> - Register object = r4 ; <nl> - Register index = r3 ; <nl> - Register scratch = r6 ; <nl> - Register result = r3 ; <nl> - <nl> - PopOperand ( object ) ; <nl> - <nl> - Label need_conversion ; <nl> - Label index_out_of_range ; <nl> - Label done ; <nl> - StringCharAtGenerator generator ( object , index , scratch , result , <nl> - & need_conversion , & need_conversion , <nl> - & index_out_of_range , STRING_INDEX_IS_NUMBER ) ; <nl> - generator . GenerateFast ( masm_ ) ; <nl> - __ b ( & done ) ; <nl> - <nl> - __ bind ( & index_out_of_range ) ; <nl> - / / When the index is out of range , the spec requires us to return <nl> - / / the empty string . <nl> - __ LoadRoot ( result , Heap : : kempty_stringRootIndex ) ; <nl> - __ b ( & done ) ; <nl> - <nl> - __ bind ( & need_conversion ) ; <nl> - / / Move smi zero into the result register , which will trigger <nl> - / / conversion . <nl> - __ LoadSmiLiteral ( result , Smi : : FromInt ( 0 ) ) ; <nl> - __ b ( & done ) ; <nl> - <nl> - NopRuntimeCallHelper call_helper ; <nl> - generator . GenerateSlow ( masm_ , NOT_PART_OF_IC_HANDLER , call_helper ) ; <nl> - <nl> - __ bind ( & done ) ; <nl> - context ( ) - > Plug ( result ) ; <nl> - } <nl> - <nl> - <nl> void FullCodeGenerator : : EmitCall ( CallRuntime * expr ) { <nl> ZoneList < Expression * > * args = expr - > arguments ( ) ; <nl> DCHECK_LE ( 2 , args - > length ( ) ) ; <nl> mmm a / src / full - codegen / s390 / full - codegen - s390 . cc <nl> ppp b / src / full - codegen / s390 / full - codegen - s390 . cc <nl> void FullCodeGenerator : : EmitStringCharCodeAt ( CallRuntime * expr ) { <nl> context ( ) - > Plug ( result ) ; <nl> } <nl> <nl> - void FullCodeGenerator : : EmitStringCharAt ( CallRuntime * expr ) { <nl> - ZoneList < Expression * > * args = expr - > arguments ( ) ; <nl> - DCHECK ( args - > length ( ) = = 2 ) ; <nl> - VisitForStackValue ( args - > at ( 0 ) ) ; <nl> - VisitForAccumulatorValue ( args - > at ( 1 ) ) ; <nl> - <nl> - Register object = r3 ; <nl> - Register index = r2 ; <nl> - Register scratch = r5 ; <nl> - Register result = r2 ; <nl> - <nl> - PopOperand ( object ) ; <nl> - <nl> - Label need_conversion ; <nl> - Label index_out_of_range ; <nl> - Label done ; <nl> - StringCharAtGenerator generator ( object , index , scratch , result , <nl> - & need_conversion , & need_conversion , <nl> - & index_out_of_range , STRING_INDEX_IS_NUMBER ) ; <nl> - generator . GenerateFast ( masm_ ) ; <nl> - __ b ( & done ) ; <nl> - <nl> - __ bind ( & index_out_of_range ) ; <nl> - / / When the index is out of range , the spec requires us to return <nl> - / / the empty string . <nl> - __ LoadRoot ( result , Heap : : kempty_stringRootIndex ) ; <nl> - __ b ( & done ) ; <nl> - <nl> - __ bind ( & need_conversion ) ; <nl> - / / Move smi zero into the result register , which will trigger <nl> - / / conversion . <nl> - __ LoadSmiLiteral ( result , Smi : : FromInt ( 0 ) ) ; <nl> - __ b ( & done ) ; <nl> - <nl> - NopRuntimeCallHelper call_helper ; <nl> - generator . GenerateSlow ( masm_ , NOT_PART_OF_IC_HANDLER , call_helper ) ; <nl> - <nl> - __ bind ( & done ) ; <nl> - context ( ) - > Plug ( result ) ; <nl> - } <nl> - <nl> void FullCodeGenerator : : EmitCall ( CallRuntime * expr ) { <nl> ZoneList < Expression * > * args = expr - > arguments ( ) ; <nl> DCHECK_LE ( 2 , args - > length ( ) ) ; <nl> mmm a / src / full - codegen / x64 / full - codegen - x64 . cc <nl> ppp b / src / full - codegen / x64 / full - codegen - x64 . cc <nl> void FullCodeGenerator : : EmitStringCharCodeAt ( CallRuntime * expr ) { <nl> } <nl> <nl> <nl> - void FullCodeGenerator : : EmitStringCharAt ( CallRuntime * expr ) { <nl> - ZoneList < Expression * > * args = expr - > arguments ( ) ; <nl> - DCHECK ( args - > length ( ) = = 2 ) ; <nl> - <nl> - VisitForStackValue ( args - > at ( 0 ) ) ; <nl> - VisitForAccumulatorValue ( args - > at ( 1 ) ) ; <nl> - <nl> - Register object = rbx ; <nl> - Register index = rax ; <nl> - Register scratch = rdx ; <nl> - Register result = rax ; <nl> - <nl> - PopOperand ( object ) ; <nl> - <nl> - Label need_conversion ; <nl> - Label index_out_of_range ; <nl> - Label done ; <nl> - StringCharAtGenerator generator ( object , <nl> - index , <nl> - scratch , <nl> - result , <nl> - & need_conversion , <nl> - & need_conversion , <nl> - & index_out_of_range , <nl> - STRING_INDEX_IS_NUMBER ) ; <nl> - generator . GenerateFast ( masm_ ) ; <nl> - __ jmp ( & done ) ; <nl> - <nl> - __ bind ( & index_out_of_range ) ; <nl> - / / When the index is out of range , the spec requires us to return <nl> - / / the empty string . <nl> - __ LoadRoot ( result , Heap : : kempty_stringRootIndex ) ; <nl> - __ jmp ( & done ) ; <nl> - <nl> - __ bind ( & need_conversion ) ; <nl> - / / Move smi zero into the result register , which will trigger <nl> - / / conversion . <nl> - __ Move ( result , Smi : : FromInt ( 0 ) ) ; <nl> - __ jmp ( & done ) ; <nl> - <nl> - NopRuntimeCallHelper call_helper ; <nl> - generator . GenerateSlow ( masm_ , NOT_PART_OF_IC_HANDLER , call_helper ) ; <nl> - <nl> - __ bind ( & done ) ; <nl> - context ( ) - > Plug ( result ) ; <nl> - } <nl> - <nl> - <nl> void FullCodeGenerator : : EmitCall ( CallRuntime * expr ) { <nl> ZoneList < Expression * > * args = expr - > arguments ( ) ; <nl> DCHECK_LE ( 2 , args - > length ( ) ) ; <nl> mmm a / src / full - codegen / x87 / full - codegen - x87 . cc <nl> ppp b / src / full - codegen / x87 / full - codegen - x87 . cc <nl> void FullCodeGenerator : : EmitStringCharCodeAt ( CallRuntime * expr ) { <nl> } <nl> <nl> <nl> - void FullCodeGenerator : : EmitStringCharAt ( CallRuntime * expr ) { <nl> - ZoneList < Expression * > * args = expr - > arguments ( ) ; <nl> - DCHECK ( args - > length ( ) = = 2 ) ; <nl> - <nl> - VisitForStackValue ( args - > at ( 0 ) ) ; <nl> - VisitForAccumulatorValue ( args - > at ( 1 ) ) ; <nl> - <nl> - Register object = ebx ; <nl> - Register index = eax ; <nl> - Register scratch = edx ; <nl> - Register result = eax ; <nl> - <nl> - PopOperand ( object ) ; <nl> - <nl> - Label need_conversion ; <nl> - Label index_out_of_range ; <nl> - Label done ; <nl> - StringCharAtGenerator generator ( object , <nl> - index , <nl> - scratch , <nl> - result , <nl> - & need_conversion , <nl> - & need_conversion , <nl> - & index_out_of_range , <nl> - STRING_INDEX_IS_NUMBER ) ; <nl> - generator . GenerateFast ( masm_ ) ; <nl> - __ jmp ( & done ) ; <nl> - <nl> - __ bind ( & index_out_of_range ) ; <nl> - / / When the index is out of range , the spec requires us to return <nl> - / / the empty string . <nl> - __ Move ( result , Immediate ( isolate ( ) - > factory ( ) - > empty_string ( ) ) ) ; <nl> - __ jmp ( & done ) ; <nl> - <nl> - __ bind ( & need_conversion ) ; <nl> - / / Move smi zero into the result register , which will trigger <nl> - / / conversion . <nl> - __ Move ( result , Immediate ( Smi : : FromInt ( 0 ) ) ) ; <nl> - __ jmp ( & done ) ; <nl> - <nl> - NopRuntimeCallHelper call_helper ; <nl> - generator . GenerateSlow ( masm_ , NOT_PART_OF_IC_HANDLER , call_helper ) ; <nl> - <nl> - __ bind ( & done ) ; <nl> - context ( ) - > Plug ( result ) ; <nl> - } <nl> - <nl> - <nl> void FullCodeGenerator : : EmitCall ( CallRuntime * expr ) { <nl> ZoneList < Expression * > * args = expr - > arguments ( ) ; <nl> DCHECK_LE ( 2 , args - > length ( ) ) ; <nl> mmm a / src / runtime / runtime - strings . cc <nl> ppp b / src / runtime / runtime - strings . cc <nl> RUNTIME_FUNCTION ( Runtime_StringCharFromCode ) { <nl> return isolate - > heap ( ) - > empty_string ( ) ; <nl> } <nl> <nl> - <nl> - RUNTIME_FUNCTION ( Runtime_StringCharAt ) { <nl> - SealHandleScope shs ( isolate ) ; <nl> - DCHECK ( args . length ( ) = = 2 ) ; <nl> - if ( ! args [ 0 ] - > IsString ( ) ) return Smi : : FromInt ( 0 ) ; <nl> - if ( ! args [ 1 ] - > IsNumber ( ) ) return Smi : : FromInt ( 0 ) ; <nl> - if ( std : : isinf ( args . number_at ( 1 ) ) ) return isolate - > heap ( ) - > empty_string ( ) ; <nl> - Object * code = __RT_impl_Runtime_StringCharCodeAtRT ( args , isolate ) ; <nl> - if ( code - > IsNaN ( ) ) return isolate - > heap ( ) - > empty_string ( ) ; <nl> - return __RT_impl_Runtime_StringCharFromCode ( Arguments ( 1 , & code ) , isolate ) ; <nl> - } <nl> - <nl> RUNTIME_FUNCTION ( Runtime_ExternalStringGetChar ) { <nl> SealHandleScope shs ( isolate ) ; <nl> DCHECK_EQ ( 2 , args . length ( ) ) ; <nl> mmm a / src / runtime / runtime . h <nl> ppp b / src / runtime / runtime . h <nl> namespace internal { <nl> F ( StringNotEqual , 2 , 1 ) \ <nl> F ( FlattenString , 1 , 1 ) \ <nl> F ( StringCharFromCode , 1 , 1 ) \ <nl> - F ( StringCharAt , 2 , 1 ) \ <nl> F ( ExternalStringGetChar , 2 , 1 ) \ <nl> F ( OneByteSeqStringGetChar , 2 , 1 ) \ <nl> F ( OneByteSeqStringSetChar , 3 , 1 ) \ <nl> mmm a / test / cctest / compiler / test - run - intrinsics . cc <nl> ppp b / test / cctest / compiler / test - run - intrinsics . cc <nl> TEST ( StringAdd ) { <nl> } <nl> <nl> <nl> - TEST ( StringCharAt ) { <nl> - FunctionTester T ( " ( function ( a , b ) { return % _StringCharAt ( a , b ) ; } ) " , flags ) ; <nl> - <nl> - T . CheckCall ( T . Val ( " e " ) , T . Val ( " huge fan ! " ) , T . Val ( 3 ) ) ; <nl> - T . CheckCall ( T . Val ( " f " ) , T . Val ( " \ xE2 \ x9D \ x8A fan ! " ) , T . Val ( 2 ) ) ; <nl> - T . CheckCall ( T . Val ( " " ) , T . Val ( " not a fan ! " ) , T . Val ( 23 ) ) ; <nl> - } <nl> - <nl> - <nl> TEST ( StringCharCodeAt ) { <nl> FunctionTester T ( " ( function ( a , b ) { return % _StringCharCodeAt ( a , b ) ; } ) " , <nl> flags ) ; <nl> | [ runtime ] Remove the obsolete % _StringCharAt intrinsic . | v8/v8 | b2fd2ded16e9f648af468a7e9c70ff47b38d197f | 2016-05-27T08:52:32Z |
deleted file mode 100755 <nl> index 02e0b7a66d71 . . 000000000000 <nl> mmm a / tools / XBMCLive / SDK / buildLive / Files / chroot_local - hooks / 17 - wirelessUpgrade <nl> ppp / dev / null <nl> <nl> - # ! / bin / bash <nl> - <nl> - # Copyright ( C ) 2005 - 2010 Team XBMC <nl> - # http : / / www . xbmc . org <nl> - # <nl> - # This Program is free software ; you can redistribute it and / or modify <nl> - # it under the terms of the GNU General Public License as published by <nl> - # the Free Software Foundation ; either version 2 , or ( at your option ) <nl> - # any later version . <nl> - # <nl> - # This Program is distributed in the hope that it will be useful , <nl> - # but WITHOUT ANY WARRANTY ; without even the implied warranty of <nl> - # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE . See the <nl> - # GNU General Public License for more details . <nl> - # <nl> - # You should have received a copy of the GNU General Public License <nl> - # along with XBMC ; see the file COPYING . If not , write to <nl> - # the Free Software Foundation , 675 Mass Ave , Cambridge , MA 02139 , USA . <nl> - # http : / / www . gnu . org / copyleft / gpl . html <nl> - <nl> - echo <nl> - echo " Upgrading wireless drivers . . . " <nl> - echo <nl> - <nl> - # <nl> - # Rationale : <nl> - # as of writing , linux - backports - modules - wireless - lucid - generic brings in linux - backports - modules - compat - wireless - 2 . 6 . 34 - 2 . 6 . xx - yy - generic <nl> - # while we want the more updated linux - backports - modules - compat - wireless - 2 . 6 . 35 - 2 . 6 . xx - yy - generic <nl> - # <nl> - # This script can be removed when the more updated package will be fetched automatically <nl> - # <nl> - <nl> - kernelVersion = $ ( ls / lib / modules ) <nl> - <nl> - apt - get - y install " linux - backports - modules - compat - wireless - 2 . 6 . 35 - $ kernelVersion " <nl> - <nl> - exit <nl> mmm a / tools / XBMCLive / SDK / buildLive / Files / chroot_local - packageslists / packages . list . lucid - variant <nl> ppp b / tools / XBMCLive / SDK / buildLive / Files / chroot_local - packageslists / packages . list . lucid - variant <nl> plymouth - theme - xbmc - logo <nl> fglrx fglrx - amdcccle xorg - driver - fglrx <nl> nvidia - current libvdpau1 <nl> wpasupplicant wireless - tools <nl> - linux - backports - modules - alsa - lucid - generic linux - backports - modules - wireless - lucid - generic <nl> + linux - backports - modules - alsa - lucid - generic linux - backports - modules - wireless - 2 . 6 . 35 - lucid - generic <nl> | use the proper wireless driver backports package saves us from using a build hook | xbmc/xbmc | daffce6a6e78e3b9aa1741228b1e86fb63833e01 | 2010-10-05T15:22:09Z |
mmm a / test / test_torch . py <nl> ppp b / test / test_torch . py <nl> def _get_like ( t , * * kwargs ) : <nl> <nl> def _get_tensors ( * * kwargs ) : <nl> return [ <nl> - torch . tensor ( [ 10 , 11 ] , * * kwargs ) , <nl> + torch . tensor ( [ 10 , 11 ] , * * kwargs ) , <nl> torch . randn ( 3 , 5 , * * kwargs ) , <nl> torch . rand ( 3 , * * kwargs ) , <nl> # torch . randint ( 3 , 5 , * * kwargs ) , / / unsupported <nl> def _get_tensors ( * * kwargs ) : <nl> torch . empty ( 6 , * * kwargs ) , <nl> torch . ones ( 6 , * * kwargs ) , <nl> torch . eye ( 6 , * * kwargs ) , <nl> - torch . arange ( 3 , 5 , * * kwargs ) , ] <nl> + torch . arange ( 3 , 5 , * * kwargs ) , ] <nl> <nl> pinned_tensors = _get_tensors ( pin_memory = True ) + _get_like ( torch . empty ( 5 , dtype = torch . float64 ) , pin_memory = True ) <nl> for x in pinned_tensors : <nl> mmm a / torch / onnx / symbolic . py <nl> ppp b / torch / onnx / symbolic . py <nl> def full ( g , sizes , value , dtype , layout , device , pin_memory = False ) : <nl> value_t = torch . tensor ( [ const_value ] , dtype = scalar_type_to_pytorch_type [ dtype ] , pin_memory = pin_memory ) ) <nl> <nl> <nl> - @ parse_args ( ' v ' , ' f ' , ' i ' , ' v ' , ' v ' , ' b ' ) <nl> + @ parse_args ( ' v ' , ' f ' , ' i ' , ' v ' , ' v ' , ' b ' ) <nl> def full_like ( g , input , fill_value , dtype , layout , device , pin_memory = False ) : <nl> shape = g . op ( " Shape " , input ) <nl> return g . op ( " ConstantOfShape " , shape , <nl> | Fix flake8 issues | pytorch/pytorch | 3079d95b6c29e71262766f8acb5c24456d27706b | 2019-04-03T04:18:01Z |
mmm a / tensorflow / core / common_runtime / executor . cc <nl> ppp b / tensorflow / core / common_runtime / executor . cc <nl> class ExecutorState { <nl> int total_input_tensors = 0 ; <nl> std : : vector < const Node * > * nodes = nullptr ; <nl> <nl> - / / Lock ordering : ExecutorState . mu_ < mu . <nl> + / / Lock ordering : ExecutorState . mu_ < mu ; <nl> + / / during structured traversal : parent_frame - > mu < mu . <nl> mutex mu ; <nl> <nl> void InitializeFrameInfo ( const string & enter_name ) { <nl> void ExecutorState : : DeleteFrame ( FrameState * frame , TaggedNodeSeq * ready ) { <nl> FrameState * parent_frame = frame - > parent_frame ; <nl> const int64 parent_iter = frame - > parent_iter ; <nl> if ( parent_frame ! = nullptr ) { <nl> - mutex_lock paranet_frame_lock ( parent_frame - > mu ) ; <nl> + mutex_lock parent_frame_lock ( parent_frame - > mu ) ; <nl> / / Propagate all the dead exits to the parent frame . <nl> + mutex_lock this_frame_lock ( frame - > mu ) ; <nl> for ( const Node * node : frame - > dead_exits ) { <nl> auto parent_iter_state = parent_frame - > GetIteration ( parent_iter ) ; <nl> for ( const Edge * e : node - > out_edges ( ) ) { <nl> mmm a / tensorflow / core / common_runtime / process_function_library_runtime . h <nl> ppp b / tensorflow / core / common_runtime / process_function_library_runtime . h <nl> class ProcessFunctionLibraryRuntime { <nl> <nl> string target_device ( ) { return target_device_ ; } <nl> <nl> - FunctionLibraryRuntime : : LocalHandle local_handle ( ) { return local_handle_ ; } <nl> + FunctionLibraryRuntime : : LocalHandle local_handle ( ) { <nl> + mutex_lock l ( mu_ ) ; <nl> + return local_handle_ ; <nl> + } <nl> <nl> / / Initializes the FunctionData object by potentially making an Initialize <nl> / / call to the DistributedFunctionLibraryRuntime . <nl> mmm a / tensorflow / core / kernels / queue_op . h <nl> ppp b / tensorflow / core / kernels / queue_op . h <nl> class QueueOp : public ResourceOpKernel < QueueInterface > { <nl> <nl> void Compute ( OpKernelContext * context ) override { <nl> ResourceOpKernel < QueueInterface > : : Compute ( context ) ; <nl> + mutex_lock l ( mu_ ) ; <nl> if ( resource_ & & context - > track_allocations ( ) ) { <nl> context - > record_persistent_memory_allocation ( resource_ - > MemoryUsed ( ) ) ; <nl> } <nl> | Fix several data races by acquiring locks . | tensorflow/tensorflow | 3d9c27742693f9859e2fb75de57fe108520de712 | 2018-03-30T16:59:04Z |
mmm a / Telegram / SourceFiles / mainwidget . cpp <nl> ppp b / Telegram / SourceFiles / mainwidget . cpp <nl> void MainWidget : : updateReceived ( const mtpPrime * from , const mtpPrime * end ) { <nl> App : : wnd ( ) - > checkAutoLock ( ) ; <nl> <nl> if ( mtpTypeId ( * from ) = = mtpc_new_session_created ) { <nl> - MTPNewSession newSession ( from , end ) ; <nl> + try { <nl> + MTPNewSession newSession ; <nl> + newSession . read ( from , end ) ; <nl> + } catch ( mtpErrorUnexpected & ) { <nl> + } <nl> updSeq = 0 ; <nl> MTP_LOG ( 0 , ( " getDifference { after new_session_created } % 1 " ) . arg ( cTestMode ( ) ? " TESTMODE " : " " ) ) ; <nl> return getDifference ( ) ; <nl> } else { <nl> try { <nl> - MTPUpdates updates ( from , end ) ; <nl> + MTPUpdates updates ; <nl> + updates . read ( from , end ) ; <nl> <nl> _lastUpdateTime = getms ( true ) ; <nl> noUpdatesTimer . start ( NoUpdatesTimeout ) ; <nl> mmm a / Telegram / SourceFiles / mtproto / connection . cpp <nl> ppp b / Telegram / SourceFiles / mtproto / connection . cpp <nl> ConnectionPrivate : : HandleResult ConnectionPrivate : : handleOneReceived ( const mtpPr <nl> if ( from + 4 > = end ) throw mtpErrorInsufficient ( ) ; <nl> otherEnd = from + 4 ; <nl> <nl> - MTPlong inMsgId ( from , otherEnd ) ; <nl> + MTPlong inMsgId ; <nl> + inMsgId . read ( from , otherEnd ) ; <nl> bool isReply = ( ( inMsgId . v & 0x03 ) = = 1 ) ; <nl> if ( ! isReply & & ( ( inMsgId . v & 0x03 ) ! = 3 ) ) { <nl> LOG ( ( " Message Error : bad msg_id % 1 in contained message received " ) . arg ( inMsgId . v ) ) ; <nl> return HandleResult : : RestartConnection ; <nl> } <nl> <nl> - MTPint inSeqNo ( from , otherEnd ) ; <nl> - MTPint bytes ( from , otherEnd ) ; <nl> + MTPint inSeqNo ; <nl> + inSeqNo . read ( from , otherEnd ) ; <nl> + MTPint bytes ; <nl> + bytes . read ( from , otherEnd ) ; <nl> if ( ( bytes . v & 0x03 ) | | bytes . v < 4 ) { <nl> LOG ( ( " Message Error : bad length % 1 of contained message received " ) . arg ( bytes . v ) ) ; <nl> return HandleResult : : RestartConnection ; <nl> ConnectionPrivate : : HandleResult ConnectionPrivate : : handleOneReceived ( const mtpPr <nl> } return HandleResult : : Success ; <nl> <nl> case mtpc_msgs_ack : { <nl> - MTPMsgsAck msg ( from , end ) ; <nl> + MTPMsgsAck msg ; <nl> + msg . read ( from , end ) ; <nl> const auto & ids ( msg . c_msgs_ack ( ) . vmsg_ids . c_vector ( ) . v ) ; <nl> uint32 idsCount = ids . size ( ) ; <nl> <nl> ConnectionPrivate : : HandleResult ConnectionPrivate : : handleOneReceived ( const mtpPr <nl> } return HandleResult : : Success ; <nl> <nl> case mtpc_bad_msg_notification : { <nl> - MTPBadMsgNotification msg ( from , end ) ; <nl> + MTPBadMsgNotification msg ; <nl> + msg . read ( from , end ) ; <nl> const auto & data ( msg . c_bad_msg_notification ( ) ) ; <nl> LOG ( ( " Message Info : bad message notification received ( error_code % 3 ) for msg_id = % 1 , seq_no = % 2 " ) . arg ( data . vbad_msg_id . v ) . arg ( data . vbad_msg_seqno . v ) . arg ( data . verror_code . v ) ) ; <nl> <nl> ConnectionPrivate : : HandleResult ConnectionPrivate : : handleOneReceived ( const mtpPr <nl> } return HandleResult : : Success ; <nl> <nl> case mtpc_bad_server_salt : { <nl> - MTPBadMsgNotification msg ( from , end ) ; <nl> + MTPBadMsgNotification msg ; <nl> + msg . read ( from , end ) ; <nl> const auto & data ( msg . c_bad_server_salt ( ) ) ; <nl> DEBUG_LOG ( ( " Message Info : bad server salt received ( error_code % 4 ) for msg_id = % 1 , seq_no = % 2 , new salt : % 3 " ) . arg ( data . vbad_msg_id . v ) . arg ( data . vbad_msg_seqno . v ) . arg ( data . vnew_server_salt . v ) . arg ( data . verror_code . v ) ) ; <nl> <nl> ConnectionPrivate : : HandleResult ConnectionPrivate : : handleOneReceived ( const mtpPr <nl> DEBUG_LOG ( ( " Message Info : skipping with bad time . . . " ) ) ; <nl> return HandleResult : : Ignored ; <nl> } <nl> - MTPMsgsStateReq msg ( from , end ) ; <nl> + MTPMsgsStateReq msg ; <nl> + msg . read ( from , end ) ; <nl> const auto & ids ( msg . c_msgs_state_req ( ) . vmsg_ids . c_vector ( ) . v ) ; <nl> uint32 idsCount = ids . size ( ) ; <nl> DEBUG_LOG ( ( " Message Info : msgs_state_req received , ids : % 1 " ) . arg ( Logs : : vector ( ids ) ) ) ; <nl> ConnectionPrivate : : HandleResult ConnectionPrivate : : handleOneReceived ( const mtpPr <nl> } return HandleResult : : Success ; <nl> <nl> case mtpc_msgs_state_info : { <nl> - MTPMsgsStateInfo msg ( from , end ) ; <nl> + MTPMsgsStateInfo msg ; <nl> + msg . read ( from , end ) ; <nl> const auto & data ( msg . c_msgs_state_info ( ) ) ; <nl> <nl> uint64 reqMsgId = data . vreq_msg_id . v ; <nl> ConnectionPrivate : : HandleResult ConnectionPrivate : : handleOneReceived ( const mtpPr <nl> try { <nl> const mtpPrime * rFrom = requestBuffer - > constData ( ) + 8 , * rEnd = requestBuffer - > constData ( ) + requestBuffer - > size ( ) ; <nl> if ( mtpTypeId ( * rFrom ) = = mtpc_msgs_state_req ) { <nl> - MTPMsgsStateReq request ( rFrom , rEnd ) ; <nl> + MTPMsgsStateReq request ; <nl> + request . read ( rFrom , rEnd ) ; <nl> handleMsgsStates ( request . c_msgs_state_req ( ) . vmsg_ids . c_vector ( ) . v , states , toAck ) ; <nl> } else { <nl> - MTPMsgResendReq request ( rFrom , rEnd ) ; <nl> + MTPMsgResendReq request ; <nl> + request . read ( rFrom , rEnd ) ; <nl> handleMsgsStates ( request . c_msg_resend_req ( ) . vmsg_ids . c_vector ( ) . v , states , toAck ) ; <nl> } <nl> } catch ( Exception & ) { <nl> ConnectionPrivate : : HandleResult ConnectionPrivate : : handleOneReceived ( const mtpPr <nl> return HandleResult : : Ignored ; <nl> } <nl> <nl> - MTPMsgsAllInfo msg ( from , end ) ; <nl> + MTPMsgsAllInfo msg ; <nl> + msg . read ( from , end ) ; <nl> const auto & data ( msg . c_msgs_all_info ( ) ) ; <nl> const auto & ids ( data . vmsg_ids . c_vector ( ) . v ) ; <nl> const auto & states ( data . vinfo . c_string ( ) . v ) ; <nl> ConnectionPrivate : : HandleResult ConnectionPrivate : : handleOneReceived ( const mtpPr <nl> } return HandleResult : : Success ; <nl> <nl> case mtpc_msg_detailed_info : { <nl> - MTPMsgDetailedInfo msg ( from , end ) ; <nl> + MTPMsgDetailedInfo msg ; <nl> + msg . read ( from , end ) ; <nl> const auto & data ( msg . c_msg_detailed_info ( ) ) ; <nl> <nl> DEBUG_LOG ( ( " Message Info : msg detailed info , sent msgId % 1 , answerId % 2 , status % 3 , bytes % 4 " ) . arg ( data . vmsg_id . v ) . arg ( data . vanswer_msg_id . v ) . arg ( data . vstatus . v ) . arg ( data . vbytes . v ) ) ; <nl> ConnectionPrivate : : HandleResult ConnectionPrivate : : handleOneReceived ( const mtpPr <nl> DEBUG_LOG ( ( " Message Info : skipping msg_new_detailed_info with bad time . . . " ) ) ; <nl> return HandleResult : : Ignored ; <nl> } <nl> - MTPMsgDetailedInfo msg ( from , end ) ; <nl> + MTPMsgDetailedInfo msg ; <nl> + msg . read ( from , end ) ; <nl> const auto & data ( msg . c_msg_new_detailed_info ( ) ) ; <nl> <nl> DEBUG_LOG ( ( " Message Info : msg new detailed info , answerId % 2 , status % 3 , bytes % 4 " ) . arg ( data . vanswer_msg_id . v ) . arg ( data . vstatus . v ) . arg ( data . vbytes . v ) ) ; <nl> ConnectionPrivate : : HandleResult ConnectionPrivate : : handleOneReceived ( const mtpPr <nl> } return HandleResult : : Success ; <nl> <nl> case mtpc_msg_resend_req : { <nl> - MTPMsgResendReq msg ( from , end ) ; <nl> + MTPMsgResendReq msg ; <nl> + msg . read ( from , end ) ; <nl> const auto & ids ( msg . c_msg_resend_req ( ) . vmsg_ids . c_vector ( ) . v ) ; <nl> <nl> uint32 idsCount = ids . size ( ) ; <nl> ConnectionPrivate : : HandleResult ConnectionPrivate : : handleOneReceived ( const mtpPr <nl> if ( from + 3 > end ) throw mtpErrorInsufficient ( ) ; <nl> mtpResponse response ; <nl> <nl> - MTPlong reqMsgId ( + + from , end ) ; <nl> + MTPlong reqMsgId ; <nl> + reqMsgId . read ( + + from , end ) ; <nl> mtpTypeId typeId = from [ 0 ] ; <nl> <nl> DEBUG_LOG ( ( " RPC Info : response received for % 1 , queueing . . . " ) . arg ( reqMsgId . v ) ) ; <nl> ConnectionPrivate : : HandleResult ConnectionPrivate : : handleOneReceived ( const mtpPr <nl> <nl> case mtpc_new_session_created : { <nl> const mtpPrime * start = from ; <nl> - MTPNewSession msg ( from , end ) ; <nl> + MTPNewSession msg ; <nl> + msg . read ( from , end ) ; <nl> const auto & data ( msg . c_new_session_created ( ) ) ; <nl> <nl> if ( badTime ) { <nl> ConnectionPrivate : : HandleResult ConnectionPrivate : : handleOneReceived ( const mtpPr <nl> case mtpc_ping : { <nl> if ( badTime ) return HandleResult : : Ignored ; <nl> <nl> - MTPPing msg ( from , end ) ; <nl> + MTPPing msg ; <nl> + msg . read ( from , end ) ; <nl> DEBUG_LOG ( ( " Message Info : ping received , ping_id : % 1 , sending pong . . . " ) . arg ( msg . vping_id . v ) ) ; <nl> <nl> emit sendPongAsync ( msgId , msg . vping_id . v ) ; <nl> } return HandleResult : : Success ; <nl> <nl> case mtpc_pong : { <nl> - MTPPong msg ( from , end ) ; <nl> + MTPPong msg ; <nl> + msg . read ( from , end ) ; <nl> const auto & data ( msg . c_pong ( ) ) ; <nl> DEBUG_LOG ( ( " Message Info : pong received , msg_id : % 1 , ping_id : % 2 " ) . arg ( data . vmsg_id . v ) . arg ( data . vping_id . v ) ) ; <nl> <nl> ConnectionPrivate : : HandleResult ConnectionPrivate : : handleOneReceived ( const mtpPr <nl> } <nl> <nl> mtpBuffer ConnectionPrivate : : ungzip ( const mtpPrime * from , const mtpPrime * end ) const { <nl> - MTPstring packed ( from , end ) ; / / read packed string as serialized mtp string type <nl> + MTPstring packed ; <nl> + packed . read ( from , end ) ; / / read packed string as serialized mtp string type <nl> uint32 packedLen = packed . c_string ( ) . v . size ( ) , unpackedChunk = packedLen , unpackedLen = 0 ; <nl> <nl> mtpBuffer result ; / / * 4 because of mtpPrime type <nl> void ConnectionPrivate : : dhParamsAnswered ( ) { <nl> aesIgeDecrypt ( & encDHStr [ 0 ] , & decBuffer [ 0 ] , encDHLen , _authKeyData - > aesKey , _authKeyData - > aesIV ) ; <nl> <nl> const mtpPrime * from ( & decBuffer [ 5 ] ) , * to ( from ) , * end ( from + ( encDHBufLen - 5 ) ) ; <nl> - MTPServer_DH_inner_data dh_inner ( to , end ) ; <nl> + MTPServer_DH_inner_data dh_inner ; <nl> + dh_inner . read ( to , end ) ; <nl> const auto & dh_inner_data ( dh_inner . c_server_DH_inner_data ( ) ) ; <nl> if ( dh_inner_data . vnonce ! = _authKeyData - > nonce ) { <nl> LOG ( ( " AuthKey Error : received nonce < > sent nonce ( in server_DH_inner_data ) ! " ) ) ; <nl> mmm a / Telegram / SourceFiles / mtproto / core_types . cpp <nl> ppp b / Telegram / SourceFiles / mtproto / core_types . cpp <nl> QString mtpWrapNumber ( float64 number ) { <nl> void mtpTextSerializeCore ( MTPStringLogger & to , const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons , uint32 level , mtpPrime vcons ) { <nl> switch ( mtpTypeId ( cons ) ) { <nl> case mtpc_int : { <nl> - MTPint value ( from , end , cons ) ; <nl> + MTPint value ; <nl> + value . read ( from , end , cons ) ; <nl> to . add ( mtpWrapNumber ( value . v ) ) . add ( " [ INT ] " ) ; <nl> } break ; <nl> <nl> case mtpc_long : { <nl> - MTPlong value ( from , end , cons ) ; <nl> + MTPlong value ; <nl> + value . read ( from , end , cons ) ; <nl> to . add ( mtpWrapNumber ( value . v ) ) . add ( " [ LONG ] " ) ; <nl> } break ; <nl> <nl> case mtpc_int128 : { <nl> - MTPint128 value ( from , end , cons ) ; <nl> + MTPint128 value ; <nl> + value . read ( from , end , cons ) ; <nl> to . add ( mtpWrapNumber ( value . h ) ) . add ( " * 2 ^ 64 + " ) . add ( mtpWrapNumber ( value . l ) ) . add ( " [ INT128 ] " ) ; <nl> } break ; <nl> <nl> case mtpc_int256 : { <nl> - MTPint256 value ( from , end , cons ) ; <nl> + MTPint256 value ; <nl> + value . read ( from , end , cons ) ; <nl> to . add ( mtpWrapNumber ( value . h . h ) ) . add ( " * 2 ^ 192 + " ) . add ( mtpWrapNumber ( value . h . l ) ) . add ( " * 2 ^ 128 + " ) . add ( mtpWrapNumber ( value . l . h ) ) . add ( " * 2 ^ 64 + " ) . add ( mtpWrapNumber ( value . l . l ) ) . add ( " [ INT256 ] " ) ; <nl> } break ; <nl> <nl> case mtpc_double : { <nl> - MTPdouble value ( from , end , cons ) ; <nl> + MTPdouble value ; <nl> + value . read ( from , end , cons ) ; <nl> to . add ( mtpWrapNumber ( value . v ) ) . add ( " [ DOUBLE ] " ) ; <nl> } break ; <nl> <nl> case mtpc_string : { <nl> - MTPstring value ( from , end , cons ) ; <nl> + MTPstring value ; <nl> + value . read ( from , end , cons ) ; <nl> QByteArray strUtf8 ( value . c_string ( ) . v . c_str ( ) , value . c_string ( ) . v . length ( ) ) ; <nl> QString str = QString : : fromUtf8 ( strUtf8 ) ; <nl> if ( str . toUtf8 ( ) = = strUtf8 ) { <nl> void mtpTextSerializeCore ( MTPStringLogger & to , const mtpPrime * & from , const mtpP <nl> } break ; <nl> <nl> case mtpc_gzip_packed : { <nl> - MTPstring packed ( from , end ) ; / / read packed string as serialized mtp string type <nl> + MTPstring packed ; <nl> + packed . read ( from , end ) ; / / read packed string as serialized mtp string type <nl> uint32 packedLen = packed . c_string ( ) . v . size ( ) , unpackedChunk = packedLen ; <nl> mtpBuffer result ; / / * 4 because of mtpPrime type <nl> result . resize ( 0 ) ; <nl> mmm a / Telegram / SourceFiles / mtproto / core_types . h <nl> ppp b / Telegram / SourceFiles / mtproto / core_types . h <nl> class mtpDataOwner { <nl> mtpDataOwner & operator = ( const mtpDataOwner & other ) = default ; <nl> <nl> protected : <nl> + mtpDataOwner ( ) = default ; <nl> explicit mtpDataOwner ( std : : shared_ptr < const mtpData > & & data ) : data ( data ) { <nl> } <nl> std : : shared_ptr < const mtpData > data ; <nl> static const uint32 mtpLayerMaxSingle = sizeof ( mtpLayers ) / sizeof ( mtpLayers [ 0 ] ) <nl> template < typename bareT > <nl> class MTPBoxed : public bareT { <nl> public : <nl> - MTPBoxed ( ) { <nl> - } <nl> + MTPBoxed ( ) = default ; <nl> MTPBoxed ( const bareT & v ) : bareT ( v ) { <nl> } <nl> MTPBoxed ( const MTPBoxed < bareT > & v ) : bareT ( v ) { <nl> } <nl> - MTPBoxed ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> <nl> MTPBoxed < bareT > & operator = ( const bareT & v ) { <nl> * ( ( bareT * ) this ) = v ; <nl> class MTPBoxed < MTPBoxed < T > > { <nl> <nl> class MTPint { <nl> public : <nl> - int32 v ; <nl> + int32 v = 0 ; <nl> <nl> - MTPint ( ) { <nl> - } <nl> - MTPint ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_int ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPint ( ) = default ; <nl> <nl> uint32 innerLength ( ) const { <nl> return sizeof ( int32 ) ; <nl> using MTPInt = MTPBoxed < MTPint > ; <nl> template < typename Flags > <nl> class MTPflags { <nl> public : <nl> - Flags v ; <nl> + Flags v = Flags ( 0 ) ; <nl> static_assert ( sizeof ( Flags ) = = sizeof ( int32 ) , " MTPflags are allowed only wrapping int32 flag types ! " ) ; <nl> <nl> - MTPflags ( ) { <nl> - } <nl> - MTPflags ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_flags ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPflags ( ) = default ; <nl> <nl> uint32 innerLength ( ) const { <nl> return sizeof ( Flags ) ; <nl> inline bool operator ! = ( const MTPint & a , const MTPint & b ) { <nl> <nl> class MTPlong { <nl> public : <nl> - uint64 v ; <nl> + uint64 v = 0 ; <nl> <nl> - MTPlong ( ) { <nl> - } <nl> - MTPlong ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_long ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPlong ( ) = default ; <nl> <nl> uint32 innerLength ( ) const { <nl> return sizeof ( uint64 ) ; <nl> inline bool operator ! = ( const MTPlong & a , const MTPlong & b ) { <nl> <nl> class MTPint128 { <nl> public : <nl> - uint64 l ; <nl> - uint64 h ; <nl> + uint64 l = 0 ; <nl> + uint64 h = 0 ; <nl> <nl> - MTPint128 ( ) { <nl> - } <nl> - MTPint128 ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_int128 ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPint128 ( ) = default ; <nl> <nl> uint32 innerLength ( ) const { <nl> return sizeof ( uint64 ) + sizeof ( uint64 ) ; <nl> class MTPint256 { <nl> MTPint128 l ; <nl> MTPint128 h ; <nl> <nl> - MTPint256 ( ) { <nl> - } <nl> - MTPint256 ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_int256 ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPint256 ( ) = default ; <nl> <nl> uint32 innerLength ( ) const { <nl> return l . innerLength ( ) + h . innerLength ( ) ; <nl> inline bool operator ! = ( const MTPint256 & a , const MTPint256 & b ) { <nl> <nl> class MTPdouble { <nl> public : <nl> - float64 v ; <nl> + float64 v = 0 . ; <nl> <nl> - MTPdouble ( ) { <nl> - } <nl> - MTPdouble ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_double ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPdouble ( ) = default ; <nl> <nl> uint32 innerLength ( ) const { <nl> return sizeof ( float64 ) ; <nl> class MTPDstring : public mtpData { <nl> <nl> class MTPstring : private mtpDataOwner { <nl> public : <nl> - MTPstring ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPstring ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_string ) : mtpDataOwner ( 0 ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPstring ( ) = default ; <nl> <nl> const MTPDstring & c_string ( ) const { <nl> t_assert ( data ! = nullptr ) ; <nl> class MTPDvector : public mtpData { <nl> template < typename T > <nl> class MTPvector : private mtpDataOwner { <nl> public : <nl> - MTPvector ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPvector ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_vector ) : mtpDataOwner ( 0 ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPvector ( ) = default ; <nl> <nl> const MTPDvector < T > & c_vector ( ) const { <nl> t_assert ( data ! = nullptr ) ; <nl> class MTPvector : private mtpDataOwner { <nl> void read ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_vector ) { <nl> if ( from + 1 > end ) throw mtpErrorInsufficient ( ) ; <nl> if ( cons ! = mtpc_vector ) throw mtpErrorUnexpected ( cons , " MTPvector " ) ; <nl> - uint32 count = ( uint32 ) * ( from + + ) ; <nl> + auto count = static_cast < uint32 > ( * ( from + + ) ) ; <nl> <nl> - auto vector = QVector < T > ( ) ; <nl> - vector . reserve ( count ) ; <nl> - for ( auto i = 0 ; i ! = count ; + + i ) { <nl> - vector . push_back ( T ( from , end ) ) ; <nl> + auto vector = QVector < T > ( count , T ( ) ) ; <nl> + for ( auto & item : vector ) { <nl> + item . read ( from , end ) ; <nl> } <nl> data = std : : make_shared < MTPDvector < T > > ( std : : move ( vector ) ) ; <nl> } <nl> mmm a / Telegram / SourceFiles / mtproto / generate . py <nl> ppp b / Telegram / SourceFiles / mtproto / generate . py <nl> def addChildParentFlags ( child , parent ) : <nl> prmsStr . append ( ' const ' + ptypeFull + ' & _ ' + paramName ) ; <nl> funcsText + = ' \ n ' ; <nl> <nl> - funcsText + = ' \ tMTP ' + name + ' ( ) { \ n \ t } \ n ' ; # constructor <nl> - funcsText + = ' \ tMTP ' + name + ' ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_ ' + name + ' ) { \ n \ t \ tread ( from , end , cons ) ; \ n \ t } \ n ' ; # stream constructor <nl> + funcsText + = ' \ tMTP ' + name + ' ( ) = default ; \ n ' ; # constructor <nl> if ( len ( prms ) > len ( trivialConditions ) ) : <nl> funcsText + = ' \ tMTP ' + name + ' ( ' + ' , ' . join ( prmsStr ) + ' ) : ' + ' , ' . join ( prmsInit ) + ' { \ n \ t } \ n ' ; <nl> <nl> def addChildParentFlags ( child , parent ) : <nl> funcsText + = ' template < typename TQueryType > \ n ' ; <nl> funcsText + = ' class MTP ' + Name + ' : public MTPBoxed < MTP ' + name + ' < TQueryType > > { \ n ' ; <nl> funcsText + = ' public : \ n ' ; <nl> - funcsText + = ' \ tMTP ' + Name + ' ( ) { \ n \ t } \ n ' ; <nl> + funcsText + = ' \ tMTP ' + Name + ' ( ) = default ; \ n ' ; <nl> funcsText + = ' \ tMTP ' + Name + ' ( const MTP ' + name + ' < TQueryType > & v ) : MTPBoxed < MTP ' + name + ' < TQueryType > > ( v ) { \ n \ t } \ n ' ; <nl> if ( len ( prms ) > len ( trivialConditions ) ) : <nl> funcsText + = ' \ tMTP ' + Name + ' ( ' + ' , ' . join ( prmsStr ) + ' ) : MTPBoxed < MTP ' + name + ' < TQueryType > > ( MTP ' + name + ' < TQueryType > ( ' + ' , ' . join ( prmsNames ) + ' ) ) { \ n \ t } \ n ' ; <nl> def addChildParentFlags ( child , parent ) : <nl> else : <nl> funcsText + = ' class MTP ' + Name + ' : public MTPBoxed < MTP ' + name + ' > { \ n ' ; <nl> funcsText + = ' public : \ n ' ; <nl> - funcsText + = ' \ tMTP ' + Name + ' ( ) { \ n \ t } \ n ' ; <nl> + funcsText + = ' \ tMTP ' + Name + ' ( ) = default ; \ n ' ; <nl> funcsText + = ' \ tMTP ' + Name + ' ( const MTP ' + name + ' & v ) : MTPBoxed < MTP ' + name + ' > ( v ) { \ n \ t } \ n ' ; <nl> - funcsText + = ' \ tMTP ' + Name + ' ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTP ' + name + ' > ( from , end , cons ) { \ n \ t } \ n ' ; <nl> if ( len ( prms ) > len ( trivialConditions ) ) : <nl> funcsText + = ' \ tMTP ' + Name + ' ( ' + ' , ' . join ( prmsStr ) + ' ) : MTPBoxed < MTP ' + name + ' > ( MTP ' + name + ' ( ' + ' , ' . join ( prmsNames ) + ' ) ) { \ n \ t } \ n ' ; <nl> funcsText + = ' } ; \ n ' ; <nl> def addTextSerializeInit ( lst , dct ) : <nl> dataText + = ' \ tbool has_ ' + paramName + ' ( ) const { return v ' + hasFlags + ' . v & Flag : : f_ ' + paramName + ' ; } \ n ' ; <nl> dataText + = ' \ n ' ; <nl> <nl> - dataText + = ' \ tMTPD ' + name + ' ( ) { \ n \ t } \ n ' ; # default constructor <nl> + dataText + = ' \ tMTPD ' + name + ' ( ) = default ; \ n ' ; # default constructor <nl> switchLines + = ' \ t \ tcase mtpc_ ' + name + ' : ' ; # for by - type - id type constructor <nl> if ( len ( prms ) > len ( trivialConditions ) ) : <nl> switchLines + = ' data = std : : make_shared < MTPD ' + name + ' > ( ) ; ' ; <nl> def addTextSerializeInit ( lst , dct ) : <nl> typesText + = ' public : \ n ' ; <nl> typesText + = ' \ tMTP ' + restype + ' ( ) ' ; # default constructor <nl> inits = [ ] ; <nl> - if ( withType ) : <nl> - if ( withData ) : <nl> - inits . append ( ' mtpDataOwner ( nullptr ) ' ) ; <nl> - else : <nl> + if not ( withType ) : <nl> if ( withData ) : <nl> inits . append ( ' mtpDataOwner ( ' + newFast + ' ) ' ) ; <nl> if ( withData and not withType ) : <nl> def addTextSerializeInit ( lst , dct ) : <nl> typesText + = ' : ' + ' , ' . join ( inits ) ; <nl> typesText + = ' { \ n \ t } \ n ' ; <nl> <nl> - inits = [ ] ; <nl> - if ( withData ) : <nl> - inits . append ( ' mtpDataOwner ( nullptr ) ' ) ; <nl> - typesText + = ' \ tMTP ' + restype + ' ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ' ; <nl> - if ( not withType ) : <nl> - typesText + = ' = mtpc_ ' + name ; <nl> - typesText + = ' ) ' ; # read constructor <nl> - if ( inits ) : <nl> - typesText + = ' : ' + ' , ' . join ( inits ) ; <nl> - typesText + = ' { \ n \ t \ tread ( from , end , cons ) ; \ n \ t } \ n ' ; <nl> - <nl> if ( withData ) : <nl> typesText + = getters ; <nl> <nl> def addTextSerializeInit ( lst , dct ) : <nl> if ( withType ) : # by - type - id constructor <nl> typesText + = ' \ texplicit MTP ' + restype + ' ( mtpTypeId type ) ; \ n ' ; <nl> inlineMethods + = ' inline MTP ' + restype + ' : : MTP ' + restype + ' ( mtpTypeId type ) : ' ; <nl> - if ( withData ) : <nl> - inlineMethods + = ' mtpDataOwner ( nullptr ) , ' ; <nl> inlineMethods + = ' _type ( type ) ' ; <nl> inlineMethods + = ' { \ n ' ; <nl> inlineMethods + = ' \ tswitch ( type ) { \ n ' ; # type id check <nl> mmm a / Telegram / SourceFiles / mtproto / mtp_instance . cpp <nl> ppp b / Telegram / SourceFiles / mtproto / mtp_instance . cpp <nl> void Instance : : Private : : execCallback ( mtpRequestId requestId , const mtpPrime * fro <nl> if ( from > = end ) throw mtpErrorInsufficient ( ) ; <nl> <nl> if ( * from = = mtpc_rpc_error ) { <nl> - RPCError err ( MTPRpcError ( from , end ) ) ; <nl> - DEBUG_LOG ( ( " RPC Info : error received , code % 1 , type % 2 , description : % 3 " ) . arg ( err . code ( ) ) . arg ( err . type ( ) ) . arg ( err . description ( ) ) ) ; <nl> - if ( ! rpcErrorOccured ( requestId , h , err ) ) { <nl> + auto mtpError = MTPRpcError ( ) ; <nl> + mtpError . read ( from , end ) ; <nl> + auto error = RPCError ( mtpError ) ; <nl> + DEBUG_LOG ( ( " RPC Info : error received , code % 1 , type % 2 , description : % 3 " ) . arg ( error . code ( ) ) . arg ( error . type ( ) ) . arg ( error . description ( ) ) ) ; <nl> + if ( ! rpcErrorOccured ( requestId , h , error ) ) { <nl> QMutexLocker locker ( & _parserMapLock ) ; <nl> _parserMap . emplace ( requestId , h ) ; <nl> return ; <nl> mmm a / Telegram / SourceFiles / mtproto / rpc_sender . h <nl> ppp b / Telegram / SourceFiles / mtproto / rpc_sender . h <nl> class RPCAbstractDoneHandler { / / abstract done <nl> virtual void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const = 0 ; <nl> virtual ~ RPCAbstractDoneHandler ( ) { <nl> } <nl> + <nl> } ; <nl> - typedef QSharedPointer < RPCAbstractDoneHandler > RPCDoneHandlerPtr ; <nl> + using RPCDoneHandlerPtr = QSharedPointer < RPCAbstractDoneHandler > ; <nl> <nl> class RPCAbstractFailHandler { / / abstract fail <nl> public : <nl> class RPCAbstractFailHandler { / / abstract fail <nl> virtual ~ RPCAbstractFailHandler ( ) { <nl> } <nl> } ; <nl> - typedef QSharedPointer < RPCAbstractFailHandler > RPCFailHandlerPtr ; <nl> + using RPCFailHandlerPtr = QSharedPointer < RPCAbstractFailHandler > ; <nl> <nl> struct RPCResponseHandler { <nl> RPCResponseHandler ( ) { <nl> struct RPCResponseHandler { <nl> <nl> RPCDoneHandlerPtr onDone ; <nl> RPCFailHandlerPtr onFail ; <nl> + <nl> } ; <nl> + <nl> inline RPCResponseHandler rpcCb ( const RPCDoneHandlerPtr & onDone = RPCDoneHandlerPtr ( ) , const RPCFailHandlerPtr & onFail = RPCFailHandlerPtr ( ) ) { <nl> return RPCResponseHandler ( onDone , onFail ) ; <nl> } <nl> <nl> template < typename TReturn > <nl> class RPCDoneHandlerBare : public RPCAbstractDoneHandler { / / done ( from , end ) <nl> - typedef TReturn ( * CallbackType ) ( const mtpPrime * , const mtpPrime * ) ; <nl> + using CallbackType = TReturn ( * ) ( const mtpPrime * , const mtpPrime * ) ; <nl> <nl> public : <nl> RPCDoneHandlerBare ( CallbackType onDone ) : _onDone ( onDone ) { <nl> } <nl> - virtual void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const { <nl> + void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const override { <nl> ( * _onDone ) ( from , end ) ; <nl> } <nl> <nl> class RPCDoneHandlerBare : public RPCAbstractDoneHandler { / / done ( from , end ) <nl> <nl> template < typename TReturn > <nl> class RPCDoneHandlerBareReq : public RPCAbstractDoneHandler { / / done ( from , end , req_id ) <nl> - typedef TReturn ( * CallbackType ) ( const mtpPrime * , const mtpPrime * , mtpRequestId ) ; <nl> + using CallbackType = TReturn ( * ) ( const mtpPrime * , const mtpPrime * , mtpRequestId ) ; <nl> <nl> public : <nl> RPCDoneHandlerBareReq ( CallbackType onDone ) : _onDone ( onDone ) { <nl> } <nl> - virtual void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const { <nl> + void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const override { <nl> ( * _onDone ) ( from , end , requestId ) ; <nl> } <nl> <nl> class RPCDoneHandlerBareReq : public RPCAbstractDoneHandler { / / done ( from , end , <nl> <nl> template < typename TReturn , typename TResponse > <nl> class RPCDoneHandlerPlain : public RPCAbstractDoneHandler { / / done ( result ) <nl> - typedef TReturn ( * CallbackType ) ( const TResponse & ) ; <nl> + using CallbackType = TReturn ( * ) ( const TResponse & ) ; <nl> <nl> public : <nl> RPCDoneHandlerPlain ( CallbackType onDone ) : _onDone ( onDone ) { <nl> } <nl> - virtual void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const { <nl> - ( * _onDone ) ( TResponse ( from , end ) ) ; <nl> + void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const override { <nl> + auto response = TResponse ( ) ; <nl> + response . read ( from , end ) ; <nl> + ( * _onDone ) ( std : : move ( responce ) ) ; <nl> } <nl> <nl> private : <nl> class RPCDoneHandlerPlain : public RPCAbstractDoneHandler { / / done ( result ) <nl> <nl> template < typename TReturn , typename TResponse > <nl> class RPCDoneHandlerReq : public RPCAbstractDoneHandler { / / done ( result , req_id ) <nl> - typedef TReturn ( * CallbackType ) ( const TResponse & , mtpRequestId ) ; <nl> + using CallbackType = TReturn ( * ) ( const TResponse & , mtpRequestId ) ; <nl> <nl> public : <nl> RPCDoneHandlerReq ( CallbackType onDone ) : _onDone ( onDone ) { <nl> } <nl> - virtual void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const { <nl> - ( * _onDone ) ( TResponse ( from , end ) , requestId ) ; <nl> + void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const override { <nl> + auto response = TResponse ( ) ; <nl> + response . read ( from , end ) ; <nl> + ( * _onDone ) ( std : : move ( response ) , requestId ) ; <nl> } <nl> <nl> private : <nl> class RPCDoneHandlerReq : public RPCAbstractDoneHandler { / / done ( result , req_id <nl> <nl> template < typename TReturn > <nl> class RPCDoneHandlerNo : public RPCAbstractDoneHandler { / / done ( ) <nl> - typedef TReturn ( * CallbackType ) ( ) ; <nl> + using CallbackType = TReturn ( * ) ( ) ; <nl> <nl> public : <nl> RPCDoneHandlerNo ( CallbackType onDone ) : _onDone ( onDone ) { <nl> } <nl> - virtual void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const { <nl> + void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const override { <nl> ( * _onDone ) ( ) ; <nl> } <nl> <nl> class RPCDoneHandlerNo : public RPCAbstractDoneHandler { / / done ( ) <nl> <nl> template < typename TReturn > <nl> class RPCDoneHandlerNoReq : public RPCAbstractDoneHandler { / / done ( req_id ) <nl> - typedef TReturn ( * CallbackType ) ( mtpRequestId ) ; <nl> + using CallbackType = TReturn ( * ) ( mtpRequestId ) ; <nl> <nl> public : <nl> RPCDoneHandlerNoReq ( CallbackType onDone ) : _onDone ( onDone ) { <nl> class RPCDoneHandlerNoReq : public RPCAbstractDoneHandler { / / done ( req_id ) <nl> } ; <nl> <nl> class RPCFailHandlerPlain : public RPCAbstractFailHandler { / / fail ( error ) <nl> - typedef bool ( * CallbackType ) ( const RPCError & ) ; <nl> + using CallbackType = bool ( * ) ( const RPCError & ) ; <nl> <nl> public : <nl> RPCFailHandlerPlain ( CallbackType onFail ) : _onFail ( onFail ) { <nl> } <nl> - virtual bool operator ( ) ( mtpRequestId requestId , const RPCError & e ) const { <nl> + bool operator ( ) ( mtpRequestId requestId , const RPCError & e ) const override { <nl> return ( * _onFail ) ( e ) ; <nl> } <nl> <nl> class RPCFailHandlerPlain : public RPCAbstractFailHandler { / / fail ( error ) <nl> } ; <nl> <nl> class RPCFailHandlerReq : public RPCAbstractFailHandler { / / fail ( error , req_id ) <nl> - typedef bool ( * CallbackType ) ( const RPCError & , mtpRequestId ) ; <nl> + using CallbackType = bool ( * ) ( const RPCError & , mtpRequestId ) ; <nl> <nl> public : <nl> RPCFailHandlerReq ( CallbackType onFail ) : _onFail ( onFail ) { <nl> } <nl> - virtual bool operator ( ) ( mtpRequestId requestId , const RPCError & e ) const { <nl> + bool operator ( ) ( mtpRequestId requestId , const RPCError & e ) const override { <nl> return ( * _onFail ) ( e , requestId ) ; <nl> } <nl> <nl> class RPCFailHandlerReq : public RPCAbstractFailHandler { / / fail ( error , req_id ) <nl> } ; <nl> <nl> class RPCFailHandlerNo : public RPCAbstractFailHandler { / / fail ( ) <nl> - typedef bool ( * CallbackType ) ( ) ; <nl> + using CallbackType = bool ( * ) ( ) ; <nl> <nl> public : <nl> RPCFailHandlerNo ( CallbackType onFail ) : _onFail ( onFail ) { <nl> } <nl> - virtual bool operator ( ) ( mtpRequestId requestId , const RPCError & e ) const { <nl> + bool operator ( ) ( mtpRequestId requestId , const RPCError & e ) const override { <nl> return ( * _onFail ) ( ) ; <nl> } <nl> <nl> class RPCFailHandlerNo : public RPCAbstractFailHandler { / / fail ( ) <nl> } ; <nl> <nl> class RPCFailHandlerNoReq : public RPCAbstractFailHandler { / / fail ( req_id ) <nl> - typedef bool ( * CallbackType ) ( mtpRequestId ) ; <nl> + using CallbackType = bool ( * ) ( mtpRequestId ) ; <nl> <nl> public : <nl> RPCFailHandlerNoReq ( CallbackType onFail ) : _onFail ( onFail ) { <nl> } <nl> - virtual bool operator ( ) ( mtpRequestId requestId , const RPCError & e ) const { <nl> + bool operator ( ) ( mtpRequestId requestId , const RPCError & e ) const override { <nl> return ( * _onFail ) ( requestId ) ; <nl> } <nl> <nl> struct RPCCallbackClear { <nl> <nl> mtpRequestId requestId ; <nl> int32 errorCode ; <nl> + <nl> } ; <nl> - typedef QVector < RPCCallbackClear > RPCCallbackClears ; <nl> + <nl> + using RPCCallbackClears = QVector < RPCCallbackClear > ; <nl> <nl> template < typename TReturn > <nl> inline RPCDoneHandlerPtr rpcDone ( TReturn ( * onDone ) ( const mtpPrime * , const mtpPrime * ) ) { / / done ( from , end ) <nl> class RPCOwnedDoneHandler : public RPCAbstractDoneHandler { / / abstract done <nl> public : <nl> RPCOwnedDoneHandler ( RPCSender * owner ) ; <nl> void invalidate ( ) { <nl> - _owner = 0 ; <nl> + _owner = nullptr ; <nl> } <nl> ~ RPCOwnedDoneHandler ( ) ; <nl> <nl> protected : <nl> - RPCSender * _owner ; <nl> + RPCSender * _owner = nullptr ; <nl> + <nl> } ; <nl> <nl> class RPCOwnedFailHandler : public RPCAbstractFailHandler { / / abstract fail <nl> public : <nl> RPCOwnedFailHandler ( RPCSender * owner ) ; <nl> void invalidate ( ) { <nl> - _owner = 0 ; <nl> + _owner = nullptr ; <nl> } <nl> ~ RPCOwnedFailHandler ( ) ; <nl> <nl> protected : <nl> - RPCSender * _owner ; <nl> + RPCSender * _owner = nullptr ; <nl> + <nl> } ; <nl> <nl> template < typename TReturn , typename TReceiver > <nl> class RPCDoneHandlerBareOwned : public RPCOwnedDoneHandler { / / done ( from , end ) <nl> - typedef TReturn ( TReceiver : : * CallbackType ) ( const mtpPrime * , const mtpPrime * ) ; <nl> + using CallbackType = TReturn ( TReceiver : : * ) ( const mtpPrime * , const mtpPrime * ) ; <nl> <nl> public : <nl> RPCDoneHandlerBareOwned ( TReceiver * receiver , CallbackType onDone ) : RPCOwnedDoneHandler ( receiver ) , _onDone ( onDone ) { <nl> } <nl> - virtual void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const { <nl> + void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const override { <nl> if ( _owner ) ( static_cast < TReceiver * > ( _owner ) - > * _onDone ) ( from , end ) ; <nl> } <nl> <nl> class RPCDoneHandlerBareOwned : public RPCOwnedDoneHandler { / / done ( from , end ) <nl> <nl> template < typename TReturn , typename TReceiver > <nl> class RPCDoneHandlerBareOwnedReq : public RPCOwnedDoneHandler { / / done ( from , end , req_id ) <nl> - typedef TReturn ( TReceiver : : * CallbackType ) ( const mtpPrime * , const mtpPrime * , mtpRequestId ) ; <nl> + using CallbackType = TReturn ( TReceiver : : * ) ( const mtpPrime * , const mtpPrime * , mtpRequestId ) ; <nl> <nl> public : <nl> RPCDoneHandlerBareOwnedReq ( TReceiver * receiver , CallbackType onDone ) : RPCOwnedDoneHandler ( receiver ) , _onDone ( onDone ) { <nl> } <nl> - virtual void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const { <nl> + void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const override { <nl> if ( _owner ) ( static_cast < TReceiver * > ( _owner ) - > * _onDone ) ( from , end , requestId ) ; <nl> } <nl> <nl> class RPCDoneHandlerBareOwnedReq : public RPCOwnedDoneHandler { / / done ( from , en <nl> <nl> template < typename TReturn , typename TReceiver , typename TResponse > <nl> class RPCDoneHandlerOwned : public RPCOwnedDoneHandler { / / done ( result ) <nl> - typedef TReturn ( TReceiver : : * CallbackType ) ( const TResponse & ) ; <nl> + using CallbackType = TReturn ( TReceiver : : * ) ( const TResponse & ) ; <nl> <nl> public : <nl> RPCDoneHandlerOwned ( TReceiver * receiver , CallbackType onDone ) : RPCOwnedDoneHandler ( receiver ) , _onDone ( onDone ) { <nl> } <nl> - virtual void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const { <nl> - if ( _owner ) ( static_cast < TReceiver * > ( _owner ) - > * _onDone ) ( TResponse ( from , end ) ) ; <nl> + void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const override { <nl> + if ( _owner ) { <nl> + auto response = TResponse ( ) ; <nl> + response . read ( from , end ) ; <nl> + ( static_cast < TReceiver * > ( _owner ) - > * _onDone ) ( std : : move ( response ) ) ; <nl> + } <nl> } <nl> <nl> private : <nl> class RPCDoneHandlerOwned : public RPCOwnedDoneHandler { / / done ( result ) <nl> <nl> template < typename TReturn , typename TReceiver , typename TResponse > <nl> class RPCDoneHandlerOwnedReq : public RPCOwnedDoneHandler { / / done ( result , req_id ) <nl> - typedef TReturn ( TReceiver : : * CallbackType ) ( const TResponse & , mtpRequestId ) ; <nl> + using CallbackType = TReturn ( TReceiver : : * ) ( const TResponse & , mtpRequestId ) ; <nl> <nl> public : <nl> RPCDoneHandlerOwnedReq ( TReceiver * receiver , CallbackType onDone ) : RPCOwnedDoneHandler ( receiver ) , _onDone ( onDone ) { <nl> } <nl> - virtual void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const { <nl> - if ( _owner ) ( static_cast < TReceiver * > ( _owner ) - > * _onDone ) ( TResponse ( from , end ) , requestId ) ; <nl> + void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const override { <nl> + if ( _owner ) { <nl> + auto response = TResponse ( ) ; <nl> + response . read ( from , end ) ; <nl> + ( static_cast < TReceiver * > ( _owner ) - > * _onDone ) ( std : : move ( response ) , requestId ) ; <nl> + } <nl> } <nl> <nl> private : <nl> class RPCDoneHandlerOwnedReq : public RPCOwnedDoneHandler { / / done ( result , req_ <nl> <nl> template < typename TReturn , typename TReceiver > <nl> class RPCDoneHandlerOwnedNo : public RPCOwnedDoneHandler { / / done ( ) <nl> - typedef TReturn ( TReceiver : : * CallbackType ) ( ) ; <nl> + using CallbackType = TReturn ( TReceiver : : * ) ( ) ; <nl> <nl> public : <nl> RPCDoneHandlerOwnedNo ( TReceiver * receiver , CallbackType onDone ) : RPCOwnedDoneHandler ( receiver ) , _onDone ( onDone ) { <nl> } <nl> - virtual void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const { <nl> + void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const override { <nl> if ( _owner ) ( static_cast < TReceiver * > ( _owner ) - > * _onDone ) ( ) ; <nl> } <nl> <nl> class RPCDoneHandlerOwnedNo : public RPCOwnedDoneHandler { / / done ( ) <nl> <nl> template < typename TReturn , typename TReceiver > <nl> class RPCDoneHandlerOwnedNoReq : public RPCOwnedDoneHandler { / / done ( req_id ) <nl> - typedef TReturn ( TReceiver : : * CallbackType ) ( mtpRequestId ) ; <nl> + using CallbackType = TReturn ( TReceiver : : * ) ( mtpRequestId ) ; <nl> <nl> public : <nl> RPCDoneHandlerOwnedNoReq ( TReceiver * receiver , CallbackType onDone ) : RPCOwnedDoneHandler ( receiver ) , _onDone ( onDone ) { <nl> } <nl> - virtual void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const { <nl> + void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const override { <nl> if ( _owner ) ( static_cast < TReceiver * > ( _owner ) - > * _onDone ) ( requestId ) ; <nl> } <nl> <nl> class RPCDoneHandlerOwnedNoReq : public RPCOwnedDoneHandler { / / done ( req_id ) <nl> <nl> template < typename T , typename TReturn , typename TReceiver > <nl> class RPCBindedDoneHandlerBareOwned : public RPCOwnedDoneHandler { / / done ( b , from , end ) <nl> - typedef TReturn ( TReceiver : : * CallbackType ) ( T , const mtpPrime * , const mtpPrime * ) ; <nl> + using CallbackType = TReturn ( TReceiver : : * ) ( T , const mtpPrime * , const mtpPrime * ) ; <nl> <nl> public : <nl> RPCBindedDoneHandlerBareOwned ( T b , TReceiver * receiver , CallbackType onDone ) : RPCOwnedDoneHandler ( receiver ) , _b ( b ) , _onDone ( onDone ) { <nl> } <nl> - virtual void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const { <nl> + void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const override { <nl> if ( _owner ) ( static_cast < TReceiver * > ( _owner ) - > * _onDone ) ( _b , from , end ) ; <nl> } <nl> <nl> class RPCBindedDoneHandlerBareOwned : public RPCOwnedDoneHandler { / / done ( b , fr <nl> <nl> template < typename T , typename TReturn , typename TReceiver > <nl> class RPCBindedDoneHandlerBareOwnedReq : public RPCOwnedDoneHandler { / / done ( b , from , end , req_id ) <nl> - typedef TReturn ( TReceiver : : * CallbackType ) ( T , const mtpPrime * , const mtpPrime * , mtpRequestId ) ; <nl> + using CallbackType = TReturn ( TReceiver : : * ) ( T , const mtpPrime * , const mtpPrime * , mtpRequestId ) ; <nl> <nl> public : <nl> RPCBindedDoneHandlerBareOwnedReq ( T b , TReceiver * receiver , CallbackType onDone ) : RPCOwnedDoneHandler ( receiver ) , _b ( b ) , _onDone ( onDone ) { <nl> } <nl> - virtual void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const { <nl> + void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const override { <nl> if ( _owner ) ( static_cast < TReceiver * > ( _owner ) - > * _onDone ) ( _b , from , end , requestId ) ; <nl> } <nl> <nl> class RPCBindedDoneHandlerBareOwnedReq : public RPCOwnedDoneHandler { / / done ( b , <nl> <nl> template < typename T , typename TReturn , typename TReceiver , typename TResponse > <nl> class RPCBindedDoneHandlerOwned : public RPCOwnedDoneHandler { / / done ( b , result ) <nl> - typedef TReturn ( TReceiver : : * CallbackType ) ( T , const TResponse & ) ; <nl> + using CallbackType = TReturn ( TReceiver : : * ) ( T , const TResponse & ) ; <nl> <nl> public : <nl> RPCBindedDoneHandlerOwned ( T b , TReceiver * receiver , CallbackType onDone ) : RPCOwnedDoneHandler ( receiver ) , _onDone ( onDone ) , _b ( b ) { <nl> } <nl> - virtual void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const { <nl> - if ( _owner ) ( static_cast < TReceiver * > ( _owner ) - > * _onDone ) ( _b , TResponse ( from , end ) ) ; <nl> + void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const override { <nl> + if ( _owner ) { <nl> + auto response = TResponse ( ) ; <nl> + response . read ( from , end ) ; <nl> + ( static_cast < TReceiver * > ( _owner ) - > * _onDone ) ( _b , std : : move ( response ) ) ; <nl> + } <nl> } <nl> <nl> private : <nl> class RPCBindedDoneHandlerOwned : public RPCOwnedDoneHandler { / / done ( b , result <nl> <nl> template < typename T , typename TReturn , typename TReceiver , typename TResponse > <nl> class RPCBindedDoneHandlerOwnedReq : public RPCOwnedDoneHandler { / / done ( b , result , req_id ) <nl> - typedef TReturn ( TReceiver : : * CallbackType ) ( T , const TResponse & , mtpRequestId ) ; <nl> + using CallbackType = TReturn ( TReceiver : : * ) ( T , const TResponse & , mtpRequestId ) ; <nl> <nl> public : <nl> RPCBindedDoneHandlerOwnedReq ( T b , TReceiver * receiver , CallbackType onDone ) : RPCOwnedDoneHandler ( receiver ) , _onDone ( onDone ) , _b ( b ) { <nl> } <nl> - virtual void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const { <nl> - if ( _owner ) ( static_cast < TReceiver * > ( _owner ) - > * _onDone ) ( _b , TResponse ( from , end ) , requestId ) ; <nl> + void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const override { <nl> + if ( _owner ) { <nl> + auto response = TResponse ( ) ; <nl> + response . read ( from , end ) ; <nl> + ( static_cast < TReceiver * > ( _owner ) - > * _onDone ) ( _b , std : : move ( response ) , requestId ) ; <nl> + } <nl> } <nl> <nl> private : <nl> class RPCBindedDoneHandlerOwnedReq : public RPCOwnedDoneHandler { / / done ( b , res <nl> <nl> template < typename T , typename TReturn , typename TReceiver > <nl> class RPCBindedDoneHandlerOwnedNo : public RPCOwnedDoneHandler { / / done ( b ) <nl> - typedef TReturn ( TReceiver : : * CallbackType ) ( T ) ; <nl> + using CallbackType = TReturn ( TReceiver : : * ) ( T ) ; <nl> <nl> public : <nl> RPCBindedDoneHandlerOwnedNo ( T b , TReceiver * receiver , CallbackType onDone ) : RPCOwnedDoneHandler ( receiver ) , _b ( b ) , _onDone ( onDone ) { <nl> } <nl> - virtual void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const { <nl> + void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const override { <nl> if ( _owner ) ( static_cast < TReceiver * > ( _owner ) - > * _onDone ) ( _b ) ; <nl> } <nl> <nl> class RPCBindedDoneHandlerOwnedNo : public RPCOwnedDoneHandler { / / done ( b ) <nl> <nl> template < typename T , typename TReturn , typename TReceiver > <nl> class RPCBindedDoneHandlerOwnedNoReq : public RPCOwnedDoneHandler { / / done ( b , req_id ) <nl> - typedef TReturn ( TReceiver : : * CallbackType ) ( T , mtpRequestId ) ; <nl> + using CallbackType = TReturn ( TReceiver : : * ) ( T , mtpRequestId ) ; <nl> <nl> public : <nl> RPCBindedDoneHandlerOwnedNoReq ( T b , TReceiver * receiver , CallbackType onDone ) : RPCOwnedDoneHandler ( receiver ) , _b ( b ) , _onDone ( onDone ) { <nl> } <nl> - virtual void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const { <nl> + void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const override { <nl> if ( _owner ) ( static_cast < TReceiver * > ( _owner ) - > * _onDone ) ( _b , requestId ) ; <nl> } <nl> <nl> class RPCBindedDoneHandlerOwnedNoReq : public RPCOwnedDoneHandler { / / done ( b , r <nl> <nl> template < typename TReceiver > <nl> class RPCFailHandlerOwned : public RPCOwnedFailHandler { / / fail ( error ) <nl> - typedef bool ( TReceiver : : * CallbackType ) ( const RPCError & ) ; <nl> + using CallbackType = bool ( TReceiver : : * ) ( const RPCError & ) ; <nl> <nl> public : <nl> RPCFailHandlerOwned ( TReceiver * receiver , CallbackType onFail ) : RPCOwnedFailHandler ( receiver ) , _onFail ( onFail ) { <nl> } <nl> - virtual bool operator ( ) ( mtpRequestId requestId , const RPCError & e ) const { <nl> + bool operator ( ) ( mtpRequestId requestId , const RPCError & e ) const override { <nl> return _owner ? ( static_cast < TReceiver * > ( _owner ) - > * _onFail ) ( e ) : true ; <nl> } <nl> <nl> class RPCFailHandlerOwned : public RPCOwnedFailHandler { / / fail ( error ) <nl> <nl> template < typename TReceiver > <nl> class RPCFailHandlerOwnedReq : public RPCOwnedFailHandler { / / fail ( error , req_id ) <nl> - typedef bool ( TReceiver : : * CallbackType ) ( const RPCError & , mtpRequestId ) ; <nl> + using CallbackType = bool ( TReceiver : : * ) ( const RPCError & , mtpRequestId ) ; <nl> <nl> public : <nl> RPCFailHandlerOwnedReq ( TReceiver * receiver , CallbackType onFail ) : RPCOwnedFailHandler ( receiver ) , _onFail ( onFail ) { <nl> } <nl> - virtual bool operator ( ) ( mtpRequestId requestId , const RPCError & e ) const { <nl> + bool operator ( ) ( mtpRequestId requestId , const RPCError & e ) const override { <nl> return _owner ? ( static_cast < TReceiver * > ( _owner ) - > * _onFail ) ( e , requestId ) : true ; <nl> } <nl> <nl> class RPCFailHandlerOwnedReq : public RPCOwnedFailHandler { / / fail ( error , req_i <nl> <nl> template < typename TReceiver > <nl> class RPCFailHandlerOwnedNo : public RPCOwnedFailHandler { / / fail ( ) <nl> - typedef bool ( TReceiver : : * CallbackType ) ( ) ; <nl> + using CallbackType = bool ( TReceiver : : * ) ( ) ; <nl> <nl> public : <nl> RPCFailHandlerOwnedNo ( TReceiver * receiver , CallbackType onFail ) : RPCOwnedFailHandler ( receiver ) , _onFail ( onFail ) { <nl> } <nl> - virtual bool operator ( ) ( mtpRequestId requestId , const RPCError & e ) const { <nl> + bool operator ( ) ( mtpRequestId requestId , const RPCError & e ) const override { <nl> return _owner ? ( static_cast < TReceiver * > ( _owner ) - > * _onFail ) ( ) : true ; <nl> } <nl> <nl> class RPCFailHandlerOwnedNo : public RPCOwnedFailHandler { / / fail ( ) <nl> <nl> template < typename TReceiver > <nl> class RPCFailHandlerOwnedNoReq : public RPCOwnedFailHandler { / / fail ( req_id ) <nl> - typedef bool ( TReceiver : : * CallbackType ) ( mtpRequestId ) ; <nl> + using CallbackType = bool ( TReceiver : : * ) ( mtpRequestId ) ; <nl> <nl> public : <nl> RPCFailHandlerOwnedNoReq ( TReceiver * receiver , CallbackType onFail ) : RPCOwnedFailHandler ( receiver ) , _onFail ( onFail ) { <nl> } <nl> - virtual bool operator ( ) ( mtpRequestId requestId , const RPCError & e ) const { <nl> + bool operator ( ) ( mtpRequestId requestId , const RPCError & e ) const override { <nl> return _owner ? ( static_cast < TReceiver * > ( _owner ) - > * _onFail ) ( requestId ) : true ; <nl> } <nl> <nl> class RPCFailHandlerOwnedNoReq : public RPCOwnedFailHandler { / / fail ( req_id ) <nl> <nl> template < typename T , typename TReceiver > <nl> class RPCBindedFailHandlerOwned : public RPCOwnedFailHandler { / / fail ( b , error ) <nl> - typedef bool ( TReceiver : : * CallbackType ) ( T , const RPCError & ) ; <nl> + using CallbackType = bool ( TReceiver : : * ) ( T , const RPCError & ) ; <nl> <nl> public : <nl> RPCBindedFailHandlerOwned ( T b , TReceiver * receiver , CallbackType onFail ) : RPCOwnedFailHandler ( receiver ) , _onFail ( onFail ) , _b ( b ) { <nl> } <nl> - virtual bool operator ( ) ( mtpRequestId requestId , const RPCError & e ) const { <nl> + bool operator ( ) ( mtpRequestId requestId , const RPCError & e ) const override { <nl> return _owner ? ( static_cast < TReceiver * > ( _owner ) - > * _onFail ) ( _b , e ) : true ; <nl> } <nl> <nl> class RPCBindedFailHandlerOwned : public RPCOwnedFailHandler { / / fail ( b , error ) <nl> <nl> template < typename T , typename TReceiver > <nl> class RPCBindedFailHandlerOwnedReq : public RPCOwnedFailHandler { / / fail ( b , error , req_id ) <nl> - typedef bool ( TReceiver : : * CallbackType ) ( T , const RPCError & , mtpRequestId ) ; <nl> + using CallbackType = bool ( TReceiver : : * ) ( T , const RPCError & , mtpRequestId ) ; <nl> <nl> public : <nl> RPCBindedFailHandlerOwnedReq ( T b , TReceiver * receiver , CallbackType onFail ) : RPCOwnedFailHandler ( receiver ) , _onFail ( onFail ) , _b ( b ) { <nl> } <nl> - virtual bool operator ( ) ( mtpRequestId requestId , const RPCError & e ) const { <nl> + bool operator ( ) ( mtpRequestId requestId , const RPCError & e ) const override { <nl> return _owner ? ( static_cast < TReceiver * > ( _owner ) - > * _onFail ) ( _b , e , requestId ) : true ; <nl> } <nl> <nl> class RPCBindedFailHandlerOwnedReq : public RPCOwnedFailHandler { / / fail ( b , err <nl> <nl> template < typename T , typename TReceiver > <nl> class RPCBindedFailHandlerOwnedNo : public RPCOwnedFailHandler { / / fail ( b ) <nl> - typedef bool ( TReceiver : : * CallbackType ) ( T ) ; <nl> + using CallbackType = bool ( TReceiver : : * ) ( T ) ; <nl> <nl> public : <nl> RPCBindedFailHandlerOwnedNo ( T b , TReceiver * receiver , CallbackType onFail ) : RPCOwnedFailHandler ( receiver ) , _onFail ( onFail ) , _b ( b ) { <nl> } <nl> - virtual bool operator ( ) ( mtpRequestId requestId , const RPCError & e ) const { <nl> + bool operator ( ) ( mtpRequestId requestId , const RPCError & e ) const override { <nl> return _owner ? ( static_cast < TReceiver * > ( _owner ) - > * _onFail ) ( _b ) : true ; <nl> } <nl> <nl> class RPCBindedFailHandlerOwnedNo : public RPCOwnedFailHandler { / / fail ( b ) <nl> <nl> template < typename T , typename TReceiver > <nl> class RPCBindedFailHandlerOwnedNoReq : public RPCOwnedFailHandler { / / fail ( b , req_id ) <nl> - typedef bool ( TReceiver : : * CallbackType ) ( T , mtpRequestId ) ; <nl> + using CallbackType = bool ( TReceiver : : * ) ( T , mtpRequestId ) ; <nl> <nl> public : <nl> RPCBindedFailHandlerOwnedNoReq ( T b , TReceiver * receiver , CallbackType onFail ) : RPCOwnedFailHandler ( receiver ) , _onFail ( onFail ) , _b ( b ) { <nl> } <nl> - virtual bool operator ( ) ( mtpRequestId requestId , const RPCError & e ) const { <nl> + bool operator ( ) ( mtpRequestId requestId , const RPCError & e ) const override { <nl> return _owner ? ( static_cast < TReceiver * > ( _owner ) - > * _onFail ) ( _b , requestId ) : true ; <nl> } <nl> <nl> class RPCBindedFailHandlerOwnedNoReq : public RPCOwnedFailHandler { / / fail ( b , r <nl> } ; <nl> <nl> class RPCSender { <nl> - typedef QSet < RPCOwnedDoneHandler * > DoneHandlers ; <nl> + using DoneHandlers = QSet < RPCOwnedDoneHandler * > ; <nl> DoneHandlers _rpcDoneHandlers ; <nl> - typedef QSet < RPCOwnedFailHandler * > FailHandlers ; <nl> + using FailHandlers = QSet < RPCOwnedFailHandler * > ; <nl> FailHandlers _rpcFailHandlers ; <nl> <nl> void _rpcRegHandler ( RPCOwnedDoneHandler * handler ) { <nl> class RPCSender { <nl> friend class RPCOwnedFailHandler ; <nl> <nl> public : <nl> - <nl> template < typename TReturn , typename TReceiver > / / done ( from , end ) <nl> RPCDoneHandlerPtr rpcDone ( TReturn ( TReceiver : : * onDone ) ( const mtpPrime * , const mtpPrime * ) ) { <nl> return RPCDoneHandlerPtr ( new RPCDoneHandlerBareOwned < TReturn , TReceiver > ( static_cast < TReceiver * > ( this ) , onDone ) ) ; <nl> class RPCSender { <nl> } <nl> <nl> protected : <nl> - <nl> void rpcInvalidate ( ) { <nl> for ( DoneHandlers : : iterator i = _rpcDoneHandlers . begin ( ) , e = _rpcDoneHandlers . end ( ) ; i ! = e ; + + i ) { <nl> ( * i ) - > invalidate ( ) ; <nl> class RPCSender { <nl> <nl> } ; <nl> <nl> - typedef void ( * MTPStateChangedHandler ) ( int32 dcId , int32 state ) ; <nl> - typedef void ( * MTPSessionResetHandler ) ( int32 dcId ) ; <nl> + using MTPStateChangedHandler = void ( * ) ( int32 dcId , int32 state ) ; <nl> + using MTPSessionResetHandler = void ( * ) ( int32 dcId ) ; <nl> <nl> template < typename Base , typename FunctionType > <nl> class RPCHandlerImplementation : public Base { <nl> class RPCDoneHandlerImplementationBareReq : public RPCDoneHandlerImplementation < <nl> <nl> } ; <nl> <nl> - template < typename R , typename T > <nl> - class RPCDoneHandlerImplementationPlain : public RPCDoneHandlerImplementation < R ( const T & ) > { / / done ( result ) <nl> + template < typename R , typename TResponse > <nl> + class RPCDoneHandlerImplementationPlain : public RPCDoneHandlerImplementation < R ( const TResponse & ) > { / / done ( result ) <nl> public : <nl> - using RPCDoneHandlerImplementation < R ( const T & ) > : : Parent : : Parent ; <nl> + using RPCDoneHandlerImplementation < R ( const TResponse & ) > : : Parent : : Parent ; <nl> void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const override { <nl> - return this - > _handler ? this - > _handler ( T ( from , end ) ) : void ( 0 ) ; <nl> + if ( this - > _handler ) { <nl> + auto response = TResponse ( ) ; <nl> + response . read ( from , end ) ; <nl> + this - > _handler ( std : : move ( response ) ) ; <nl> + } <nl> } <nl> <nl> } ; <nl> <nl> - template < typename R , typename T > <nl> - class RPCDoneHandlerImplementationReq : public RPCDoneHandlerImplementation < R ( const T & , mtpRequestId ) > { / / done ( result , req_id ) <nl> + template < typename R , typename TResponse > <nl> + class RPCDoneHandlerImplementationReq : public RPCDoneHandlerImplementation < R ( const TResponse & , mtpRequestId ) > { / / done ( result , req_id ) <nl> public : <nl> - using RPCDoneHandlerImplementation < R ( const T & , mtpRequestId ) > : : Parent : : Parent ; <nl> + using RPCDoneHandlerImplementation < R ( const TResponse & , mtpRequestId ) > : : Parent : : Parent ; <nl> void operator ( ) ( mtpRequestId requestId , const mtpPrime * from , const mtpPrime * end ) const override { <nl> - return this - > _handler ? this - > _handler ( T ( from , end ) , requestId ) : void ( 0 ) ; <nl> + if ( this - > _handler ) { <nl> + auto response = TResponse ( ) ; <nl> + response . read ( from , end ) ; <nl> + this - > _handler ( std : : move ( response ) , requestId ) ; <nl> + } <nl> } <nl> <nl> } ; <nl> mmm a / Telegram / SourceFiles / mtproto / scheme_auto . h <nl> ppp b / Telegram / SourceFiles / mtproto / scheme_auto . h <nl> typedef MTPBoxed < MTPphoneCallDiscardReason > MTPPhoneCallDiscardReason ; <nl> class MTPresPQ : private mtpDataOwner { <nl> public : <nl> MTPresPQ ( ) ; <nl> - MTPresPQ ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_resPQ ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDresPQ & c_resPQ ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPresPQ > MTPResPQ ; <nl> class MTPp_Q_inner_data : private mtpDataOwner { <nl> public : <nl> MTPp_Q_inner_data ( ) ; <nl> - MTPp_Q_inner_data ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_p_q_inner_data ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDp_q_inner_data & c_p_q_inner_data ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPp_Q_inner_data > MTPP_Q_inner_data ; <nl> <nl> class MTPserver_DH_Params : private mtpDataOwner { <nl> public : <nl> - MTPserver_DH_Params ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPserver_DH_Params ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPserver_DH_Params ( ) { <nl> } <nl> const MTPDserver_DH_params_fail & c_server_DH_params_fail ( ) const ; <nl> const MTPDserver_DH_params_ok & c_server_DH_params_ok ( ) const ; <nl> typedef MTPBoxed < MTPserver_DH_Params > MTPServer_DH_Params ; <nl> class MTPserver_DH_inner_data : private mtpDataOwner { <nl> public : <nl> MTPserver_DH_inner_data ( ) ; <nl> - MTPserver_DH_inner_data ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_server_DH_inner_data ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDserver_DH_inner_data & c_server_DH_inner_data ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPserver_DH_inner_data > MTPServer_DH_inner_data ; <nl> class MTPclient_DH_Inner_Data : private mtpDataOwner { <nl> public : <nl> MTPclient_DH_Inner_Data ( ) ; <nl> - MTPclient_DH_Inner_Data ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_client_DH_inner_data ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDclient_DH_inner_data & c_client_DH_inner_data ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPclient_DH_Inner_Data > MTPClient_DH_Inner_Data ; <nl> <nl> class MTPset_client_DH_params_answer : private mtpDataOwner { <nl> public : <nl> - MTPset_client_DH_params_answer ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPset_client_DH_params_answer ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPset_client_DH_params_answer ( ) { <nl> } <nl> const MTPDdh_gen_ok & c_dh_gen_ok ( ) const ; <nl> const MTPDdh_gen_retry & c_dh_gen_retry ( ) const ; <nl> class MTPdestroyAuthKeyRes { <nl> public : <nl> MTPdestroyAuthKeyRes ( ) { <nl> } <nl> - MTPdestroyAuthKeyRes ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> <nl> uint32 innerLength ( ) const ; <nl> mtpTypeId type ( ) const ; <nl> typedef MTPBoxed < MTPdestroyAuthKeyRes > MTPDestroyAuthKeyRes ; <nl> class MTPmsgsAck : private mtpDataOwner { <nl> public : <nl> MTPmsgsAck ( ) ; <nl> - MTPmsgsAck ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_msgs_ack ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDmsgs_ack & c_msgs_ack ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPmsgsAck > MTPMsgsAck ; <nl> <nl> class MTPbadMsgNotification : private mtpDataOwner { <nl> public : <nl> - MTPbadMsgNotification ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPbadMsgNotification ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPbadMsgNotification ( ) { <nl> } <nl> const MTPDbad_msg_notification & c_bad_msg_notification ( ) const ; <nl> const MTPDbad_server_salt & c_bad_server_salt ( ) const ; <nl> typedef MTPBoxed < MTPbadMsgNotification > MTPBadMsgNotification ; <nl> class MTPmsgsStateReq : private mtpDataOwner { <nl> public : <nl> MTPmsgsStateReq ( ) ; <nl> - MTPmsgsStateReq ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_msgs_state_req ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDmsgs_state_req & c_msgs_state_req ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPmsgsStateReq > MTPMsgsStateReq ; <nl> class MTPmsgsStateInfo : private mtpDataOwner { <nl> public : <nl> MTPmsgsStateInfo ( ) ; <nl> - MTPmsgsStateInfo ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_msgs_state_info ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDmsgs_state_info & c_msgs_state_info ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPmsgsStateInfo > MTPMsgsStateInfo ; <nl> class MTPmsgsAllInfo : private mtpDataOwner { <nl> public : <nl> MTPmsgsAllInfo ( ) ; <nl> - MTPmsgsAllInfo ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_msgs_all_info ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDmsgs_all_info & c_msgs_all_info ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPmsgsAllInfo > MTPMsgsAllInfo ; <nl> <nl> class MTPmsgDetailedInfo : private mtpDataOwner { <nl> public : <nl> - MTPmsgDetailedInfo ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPmsgDetailedInfo ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPmsgDetailedInfo ( ) { <nl> } <nl> const MTPDmsg_detailed_info & c_msg_detailed_info ( ) const ; <nl> const MTPDmsg_new_detailed_info & c_msg_new_detailed_info ( ) const ; <nl> typedef MTPBoxed < MTPmsgDetailedInfo > MTPMsgDetailedInfo ; <nl> class MTPmsgResendReq : private mtpDataOwner { <nl> public : <nl> MTPmsgResendReq ( ) ; <nl> - MTPmsgResendReq ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_msg_resend_req ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDmsg_resend_req & c_msg_resend_req ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPmsgResendReq > MTPMsgResendReq ; <nl> class MTPrpcError : private mtpDataOwner { <nl> public : <nl> MTPrpcError ( ) ; <nl> - MTPrpcError ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_rpc_error ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDrpc_error & c_rpc_error ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPrpcError > MTPRpcError ; <nl> <nl> class MTPrpcDropAnswer : private mtpDataOwner { <nl> public : <nl> - MTPrpcDropAnswer ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPrpcDropAnswer ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPrpcDropAnswer ( ) { <nl> } <nl> const MTPDrpc_answer_dropped & c_rpc_answer_dropped ( ) const ; <nl> <nl> typedef MTPBoxed < MTPrpcDropAnswer > MTPRpcDropAnswer ; <nl> class MTPfutureSalt : private mtpDataOwner { <nl> public : <nl> MTPfutureSalt ( ) ; <nl> - MTPfutureSalt ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_future_salt ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDfuture_salt & c_future_salt ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPfutureSalt > MTPFutureSalt ; <nl> class MTPfutureSalts : private mtpDataOwner { <nl> public : <nl> MTPfutureSalts ( ) ; <nl> - MTPfutureSalts ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_future_salts ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDfuture_salts & c_future_salts ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPfutureSalts > MTPFutureSalts ; <nl> class MTPpong : private mtpDataOwner { <nl> public : <nl> MTPpong ( ) ; <nl> - MTPpong ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_pong ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDpong & c_pong ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPpong > MTPPong ; <nl> <nl> class MTPdestroySessionRes : private mtpDataOwner { <nl> public : <nl> - MTPdestroySessionRes ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPdestroySessionRes ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPdestroySessionRes ( ) { <nl> } <nl> const MTPDdestroy_session_ok & c_destroy_session_ok ( ) const ; <nl> const MTPDdestroy_session_none & c_destroy_session_none ( ) const ; <nl> typedef MTPBoxed < MTPdestroySessionRes > MTPDestroySessionRes ; <nl> class MTPnewSession : private mtpDataOwner { <nl> public : <nl> MTPnewSession ( ) ; <nl> - MTPnewSession ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_new_session_created ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDnew_session_created & c_new_session_created ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPnewSession > MTPNewSession ; <nl> class MTPhttpWait : private mtpDataOwner { <nl> public : <nl> MTPhttpWait ( ) ; <nl> - MTPhttpWait ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_http_wait ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDhttp_wait & c_http_wait ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> class MTPbool { <nl> public : <nl> MTPbool ( ) { <nl> } <nl> - MTPbool ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> <nl> uint32 innerLength ( ) const ; <nl> mtpTypeId type ( ) const ; <nl> class MTPtrue { <nl> public : <nl> MTPtrue ( ) { <nl> } <nl> - MTPtrue ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_true ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> <nl> uint32 innerLength ( ) const ; <nl> mtpTypeId type ( ) const ; <nl> typedef MTPBoxed < MTPtrue > MTPTrue ; <nl> class MTPerror : private mtpDataOwner { <nl> public : <nl> MTPerror ( ) ; <nl> - MTPerror ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_error ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDerror & c_error ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> class MTPnull { <nl> public : <nl> MTPnull ( ) { <nl> } <nl> - MTPnull ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_null ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> <nl> uint32 innerLength ( ) const ; <nl> mtpTypeId type ( ) const ; <nl> typedef MTPBoxed < MTPnull > MTPNull ; <nl> <nl> class MTPinputPeer : private mtpDataOwner { <nl> public : <nl> - MTPinputPeer ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPinputPeer ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPinputPeer ( ) { <nl> } <nl> const MTPDinputPeerChat & c_inputPeerChat ( ) const ; <nl> const MTPDinputPeerUser & c_inputPeerUser ( ) const ; <nl> typedef MTPBoxed < MTPinputPeer > MTPInputPeer ; <nl> <nl> class MTPinputUser : private mtpDataOwner { <nl> public : <nl> - MTPinputUser ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPinputUser ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPinputUser ( ) { <nl> } <nl> const MTPDinputUser & c_inputUser ( ) const ; <nl> <nl> typedef MTPBoxed < MTPinputUser > MTPInputUser ; <nl> class MTPinputContact : private mtpDataOwner { <nl> public : <nl> MTPinputContact ( ) ; <nl> - MTPinputContact ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_inputPhoneContact ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDinputPhoneContact & c_inputPhoneContact ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPinputContact > MTPInputContact ; <nl> <nl> class MTPinputFile : private mtpDataOwner { <nl> public : <nl> - MTPinputFile ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPinputFile ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPinputFile ( ) { <nl> } <nl> const MTPDinputFile & c_inputFile ( ) const ; <nl> const MTPDinputFileBig & c_inputFileBig ( ) const ; <nl> typedef MTPBoxed < MTPinputFile > MTPInputFile ; <nl> <nl> class MTPinputMedia : private mtpDataOwner { <nl> public : <nl> - MTPinputMedia ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPinputMedia ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPinputMedia ( ) { <nl> } <nl> const MTPDinputMediaUploadedPhoto & c_inputMediaUploadedPhoto ( ) const ; <nl> const MTPDinputMediaPhoto & c_inputMediaPhoto ( ) const ; <nl> typedef MTPBoxed < MTPinputMedia > MTPInputMedia ; <nl> <nl> class MTPinputChatPhoto : private mtpDataOwner { <nl> public : <nl> - MTPinputChatPhoto ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPinputChatPhoto ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPinputChatPhoto ( ) { <nl> } <nl> const MTPDinputChatUploadedPhoto & c_inputChatUploadedPhoto ( ) const ; <nl> const MTPDinputChatPhoto & c_inputChatPhoto ( ) const ; <nl> typedef MTPBoxed < MTPinputChatPhoto > MTPInputChatPhoto ; <nl> <nl> class MTPinputGeoPoint : private mtpDataOwner { <nl> public : <nl> - MTPinputGeoPoint ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPinputGeoPoint ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPinputGeoPoint ( ) { <nl> } <nl> const MTPDinputGeoPoint & c_inputGeoPoint ( ) const ; <nl> <nl> typedef MTPBoxed < MTPinputGeoPoint > MTPInputGeoPoint ; <nl> <nl> class MTPinputPhoto : private mtpDataOwner { <nl> public : <nl> - MTPinputPhoto ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPinputPhoto ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPinputPhoto ( ) { <nl> } <nl> const MTPDinputPhoto & c_inputPhoto ( ) const ; <nl> <nl> typedef MTPBoxed < MTPinputPhoto > MTPInputPhoto ; <nl> <nl> class MTPinputFileLocation : private mtpDataOwner { <nl> public : <nl> - MTPinputFileLocation ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPinputFileLocation ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPinputFileLocation ( ) { <nl> } <nl> const MTPDinputFileLocation & c_inputFileLocation ( ) const ; <nl> const MTPDinputEncryptedFileLocation & c_inputEncryptedFileLocation ( ) const ; <nl> typedef MTPBoxed < MTPinputFileLocation > MTPInputFileLocation ; <nl> class MTPinputAppEvent : private mtpDataOwner { <nl> public : <nl> MTPinputAppEvent ( ) ; <nl> - MTPinputAppEvent ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_inputAppEvent ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDinputAppEvent & c_inputAppEvent ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPinputAppEvent > MTPInputAppEvent ; <nl> <nl> class MTPpeer : private mtpDataOwner { <nl> public : <nl> - MTPpeer ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPpeer ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPpeer ( ) { <nl> } <nl> const MTPDpeerUser & c_peerUser ( ) const ; <nl> const MTPDpeerChat & c_peerChat ( ) const ; <nl> class MTPstorage_fileType { <nl> public : <nl> MTPstorage_fileType ( ) { <nl> } <nl> - MTPstorage_fileType ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> <nl> uint32 innerLength ( ) const ; <nl> mtpTypeId type ( ) const ; <nl> typedef MTPBoxed < MTPstorage_fileType > MTPstorage_FileType ; <nl> <nl> class MTPfileLocation : private mtpDataOwner { <nl> public : <nl> - MTPfileLocation ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPfileLocation ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPfileLocation ( ) { <nl> } <nl> const MTPDfileLocationUnavailable & c_fileLocationUnavailable ( ) const ; <nl> const MTPDfileLocation & c_fileLocation ( ) const ; <nl> typedef MTPBoxed < MTPfileLocation > MTPFileLocation ; <nl> <nl> class MTPuser : private mtpDataOwner { <nl> public : <nl> - MTPuser ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPuser ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPuser ( ) { <nl> } <nl> const MTPDuserEmpty & c_userEmpty ( ) const ; <nl> const MTPDuser & c_user ( ) const ; <nl> typedef MTPBoxed < MTPuser > MTPUser ; <nl> <nl> class MTPuserProfilePhoto : private mtpDataOwner { <nl> public : <nl> - MTPuserProfilePhoto ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPuserProfilePhoto ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPuserProfilePhoto ( ) { <nl> } <nl> const MTPDuserProfilePhoto & c_userProfilePhoto ( ) const ; <nl> <nl> typedef MTPBoxed < MTPuserProfilePhoto > MTPUserProfilePhoto ; <nl> <nl> class MTPuserStatus : private mtpDataOwner { <nl> public : <nl> - MTPuserStatus ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPuserStatus ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPuserStatus ( ) { <nl> } <nl> const MTPDuserStatusOnline & c_userStatusOnline ( ) const ; <nl> const MTPDuserStatusOffline & c_userStatusOffline ( ) const ; <nl> typedef MTPBoxed < MTPuserStatus > MTPUserStatus ; <nl> <nl> class MTPchat : private mtpDataOwner { <nl> public : <nl> - MTPchat ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPchat ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPchat ( ) { <nl> } <nl> const MTPDchatEmpty & c_chatEmpty ( ) const ; <nl> const MTPDchat & c_chat ( ) const ; <nl> typedef MTPBoxed < MTPchat > MTPChat ; <nl> <nl> class MTPchatFull : private mtpDataOwner { <nl> public : <nl> - MTPchatFull ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPchatFull ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPchatFull ( ) { <nl> } <nl> const MTPDchatFull & c_chatFull ( ) const ; <nl> const MTPDchannelFull & c_channelFull ( ) const ; <nl> typedef MTPBoxed < MTPchatFull > MTPChatFull ; <nl> <nl> class MTPchatParticipant : private mtpDataOwner { <nl> public : <nl> - MTPchatParticipant ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPchatParticipant ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPchatParticipant ( ) { <nl> } <nl> const MTPDchatParticipant & c_chatParticipant ( ) const ; <nl> const MTPDchatParticipantCreator & c_chatParticipantCreator ( ) const ; <nl> typedef MTPBoxed < MTPchatParticipant > MTPChatParticipant ; <nl> <nl> class MTPchatParticipants : private mtpDataOwner { <nl> public : <nl> - MTPchatParticipants ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPchatParticipants ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPchatParticipants ( ) { <nl> } <nl> const MTPDchatParticipantsForbidden & c_chatParticipantsForbidden ( ) const ; <nl> const MTPDchatParticipants & c_chatParticipants ( ) const ; <nl> typedef MTPBoxed < MTPchatParticipants > MTPChatParticipants ; <nl> <nl> class MTPchatPhoto : private mtpDataOwner { <nl> public : <nl> - MTPchatPhoto ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPchatPhoto ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPchatPhoto ( ) { <nl> } <nl> const MTPDchatPhoto & c_chatPhoto ( ) const ; <nl> <nl> typedef MTPBoxed < MTPchatPhoto > MTPChatPhoto ; <nl> <nl> class MTPmessage : private mtpDataOwner { <nl> public : <nl> - MTPmessage ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPmessage ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPmessage ( ) { <nl> } <nl> const MTPDmessageEmpty & c_messageEmpty ( ) const ; <nl> const MTPDmessage & c_message ( ) const ; <nl> typedef MTPBoxed < MTPmessage > MTPMessage ; <nl> <nl> class MTPmessageMedia : private mtpDataOwner { <nl> public : <nl> - MTPmessageMedia ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPmessageMedia ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPmessageMedia ( ) { <nl> } <nl> const MTPDmessageMediaPhoto & c_messageMediaPhoto ( ) const ; <nl> const MTPDmessageMediaGeo & c_messageMediaGeo ( ) const ; <nl> typedef MTPBoxed < MTPmessageMedia > MTPMessageMedia ; <nl> <nl> class MTPmessageAction : private mtpDataOwner { <nl> public : <nl> - MTPmessageAction ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPmessageAction ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPmessageAction ( ) { <nl> } <nl> const MTPDmessageActionChatCreate & c_messageActionChatCreate ( ) const ; <nl> const MTPDmessageActionChatEditTitle & c_messageActionChatEditTitle ( ) const ; <nl> typedef MTPBoxed < MTPmessageAction > MTPMessageAction ; <nl> class MTPdialog : private mtpDataOwner { <nl> public : <nl> MTPdialog ( ) ; <nl> - MTPdialog ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_dialog ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDdialog & c_dialog ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPdialog > MTPDialog ; <nl> <nl> class MTPphoto : private mtpDataOwner { <nl> public : <nl> - MTPphoto ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPphoto ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPphoto ( ) { <nl> } <nl> const MTPDphotoEmpty & c_photoEmpty ( ) const ; <nl> const MTPDphoto & c_photo ( ) const ; <nl> typedef MTPBoxed < MTPphoto > MTPPhoto ; <nl> <nl> class MTPphotoSize : private mtpDataOwner { <nl> public : <nl> - MTPphotoSize ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPphotoSize ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPphotoSize ( ) { <nl> } <nl> const MTPDphotoSizeEmpty & c_photoSizeEmpty ( ) const ; <nl> const MTPDphotoSize & c_photoSize ( ) const ; <nl> typedef MTPBoxed < MTPphotoSize > MTPPhotoSize ; <nl> <nl> class MTPgeoPoint : private mtpDataOwner { <nl> public : <nl> - MTPgeoPoint ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPgeoPoint ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPgeoPoint ( ) { <nl> } <nl> const MTPDgeoPoint & c_geoPoint ( ) const ; <nl> <nl> typedef MTPBoxed < MTPgeoPoint > MTPGeoPoint ; <nl> class MTPauth_checkedPhone : private mtpDataOwner { <nl> public : <nl> MTPauth_checkedPhone ( ) ; <nl> - MTPauth_checkedPhone ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_auth_checkedPhone ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDauth_checkedPhone & c_auth_checkedPhone ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPauth_checkedPhone > MTPauth_CheckedPhone ; <nl> class MTPauth_sentCode : private mtpDataOwner { <nl> public : <nl> MTPauth_sentCode ( ) ; <nl> - MTPauth_sentCode ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_auth_sentCode ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDauth_sentCode & c_auth_sentCode ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPauth_sentCode > MTPauth_SentCode ; <nl> class MTPauth_authorization : private mtpDataOwner { <nl> public : <nl> MTPauth_authorization ( ) ; <nl> - MTPauth_authorization ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_auth_authorization ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDauth_authorization & c_auth_authorization ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPauth_authorization > MTPauth_Authorization ; <nl> class MTPauth_exportedAuthorization : private mtpDataOwner { <nl> public : <nl> MTPauth_exportedAuthorization ( ) ; <nl> - MTPauth_exportedAuthorization ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_auth_exportedAuthorization ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDauth_exportedAuthorization & c_auth_exportedAuthorization ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPauth_exportedAuthorization > MTPauth_ExportedAuthorization ; <nl> <nl> class MTPinputNotifyPeer : private mtpDataOwner { <nl> public : <nl> - MTPinputNotifyPeer ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPinputNotifyPeer ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPinputNotifyPeer ( ) { <nl> } <nl> const MTPDinputNotifyPeer & c_inputNotifyPeer ( ) const ; <nl> <nl> class MTPinputPeerNotifyEvents { <nl> public : <nl> MTPinputPeerNotifyEvents ( ) { <nl> } <nl> - MTPinputPeerNotifyEvents ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> <nl> uint32 innerLength ( ) const ; <nl> mtpTypeId type ( ) const ; <nl> typedef MTPBoxed < MTPinputPeerNotifyEvents > MTPInputPeerNotifyEvents ; <nl> class MTPinputPeerNotifySettings : private mtpDataOwner { <nl> public : <nl> MTPinputPeerNotifySettings ( ) ; <nl> - MTPinputPeerNotifySettings ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_inputPeerNotifySettings ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDinputPeerNotifySettings & c_inputPeerNotifySettings ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> class MTPpeerNotifyEvents { <nl> public : <nl> MTPpeerNotifyEvents ( ) { <nl> } <nl> - MTPpeerNotifyEvents ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> <nl> uint32 innerLength ( ) const ; <nl> mtpTypeId type ( ) const ; <nl> typedef MTPBoxed < MTPpeerNotifyEvents > MTPPeerNotifyEvents ; <nl> <nl> class MTPpeerNotifySettings : private mtpDataOwner { <nl> public : <nl> - MTPpeerNotifySettings ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPpeerNotifySettings ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPpeerNotifySettings ( ) { <nl> } <nl> const MTPDpeerNotifySettings & c_peerNotifySettings ( ) const ; <nl> <nl> typedef MTPBoxed < MTPpeerNotifySettings > MTPPeerNotifySettings ; <nl> class MTPpeerSettings : private mtpDataOwner { <nl> public : <nl> MTPpeerSettings ( ) ; <nl> - MTPpeerSettings ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_peerSettings ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDpeerSettings & c_peerSettings ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPpeerSettings > MTPPeerSettings ; <nl> <nl> class MTPwallPaper : private mtpDataOwner { <nl> public : <nl> - MTPwallPaper ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPwallPaper ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPwallPaper ( ) { <nl> } <nl> const MTPDwallPaper & c_wallPaper ( ) const ; <nl> const MTPDwallPaperSolid & c_wallPaperSolid ( ) const ; <nl> typedef MTPBoxed < MTPwallPaper > MTPWallPaper ; <nl> <nl> class MTPreportReason : private mtpDataOwner { <nl> public : <nl> - MTPreportReason ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPreportReason ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPreportReason ( ) { <nl> } <nl> const MTPDinputReportReasonOther & c_inputReportReasonOther ( ) const ; <nl> <nl> typedef MTPBoxed < MTPreportReason > MTPReportReason ; <nl> class MTPuserFull : private mtpDataOwner { <nl> public : <nl> MTPuserFull ( ) ; <nl> - MTPuserFull ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_userFull ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDuserFull & c_userFull ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPuserFull > MTPUserFull ; <nl> class MTPcontact : private mtpDataOwner { <nl> public : <nl> MTPcontact ( ) ; <nl> - MTPcontact ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_contact ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDcontact & c_contact ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPcontact > MTPContact ; <nl> class MTPimportedContact : private mtpDataOwner { <nl> public : <nl> MTPimportedContact ( ) ; <nl> - MTPimportedContact ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_importedContact ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDimportedContact & c_importedContact ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPimportedContact > MTPImportedContact ; <nl> class MTPcontactBlocked : private mtpDataOwner { <nl> public : <nl> MTPcontactBlocked ( ) ; <nl> - MTPcontactBlocked ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_contactBlocked ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDcontactBlocked & c_contactBlocked ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPcontactBlocked > MTPContactBlocked ; <nl> class MTPcontactStatus : private mtpDataOwner { <nl> public : <nl> MTPcontactStatus ( ) ; <nl> - MTPcontactStatus ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_contactStatus ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDcontactStatus & c_contactStatus ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPcontactStatus > MTPContactStatus ; <nl> class MTPcontacts_link : private mtpDataOwner { <nl> public : <nl> MTPcontacts_link ( ) ; <nl> - MTPcontacts_link ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_contacts_link ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDcontacts_link & c_contacts_link ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPcontacts_link > MTPcontacts_Link ; <nl> <nl> class MTPcontacts_contacts : private mtpDataOwner { <nl> public : <nl> - MTPcontacts_contacts ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPcontacts_contacts ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPcontacts_contacts ( ) { <nl> } <nl> const MTPDcontacts_contacts & c_contacts_contacts ( ) const ; <nl> <nl> typedef MTPBoxed < MTPcontacts_contacts > MTPcontacts_Contacts ; <nl> class MTPcontacts_importedContacts : private mtpDataOwner { <nl> public : <nl> MTPcontacts_importedContacts ( ) ; <nl> - MTPcontacts_importedContacts ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_contacts_importedContacts ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDcontacts_importedContacts & c_contacts_importedContacts ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPcontacts_importedContacts > MTPcontacts_ImportedContacts ; <nl> <nl> class MTPcontacts_blocked : private mtpDataOwner { <nl> public : <nl> - MTPcontacts_blocked ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPcontacts_blocked ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPcontacts_blocked ( ) { <nl> } <nl> const MTPDcontacts_blocked & c_contacts_blocked ( ) const ; <nl> const MTPDcontacts_blockedSlice & c_contacts_blockedSlice ( ) const ; <nl> typedef MTPBoxed < MTPcontacts_blocked > MTPcontacts_Blocked ; <nl> <nl> class MTPmessages_dialogs : private mtpDataOwner { <nl> public : <nl> - MTPmessages_dialogs ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPmessages_dialogs ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPmessages_dialogs ( ) { <nl> } <nl> const MTPDmessages_dialogs & c_messages_dialogs ( ) const ; <nl> const MTPDmessages_dialogsSlice & c_messages_dialogsSlice ( ) const ; <nl> typedef MTPBoxed < MTPmessages_dialogs > MTPmessages_Dialogs ; <nl> <nl> class MTPmessages_messages : private mtpDataOwner { <nl> public : <nl> - MTPmessages_messages ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPmessages_messages ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPmessages_messages ( ) { <nl> } <nl> const MTPDmessages_messages & c_messages_messages ( ) const ; <nl> const MTPDmessages_messagesSlice & c_messages_messagesSlice ( ) const ; <nl> typedef MTPBoxed < MTPmessages_messages > MTPmessages_Messages ; <nl> <nl> class MTPmessages_chats : private mtpDataOwner { <nl> public : <nl> - MTPmessages_chats ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPmessages_chats ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPmessages_chats ( ) { <nl> } <nl> const MTPDmessages_chats & c_messages_chats ( ) const ; <nl> const MTPDmessages_chatsSlice & c_messages_chatsSlice ( ) const ; <nl> typedef MTPBoxed < MTPmessages_chats > MTPmessages_Chats ; <nl> class MTPmessages_chatFull : private mtpDataOwner { <nl> public : <nl> MTPmessages_chatFull ( ) ; <nl> - MTPmessages_chatFull ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_chatFull ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDmessages_chatFull & c_messages_chatFull ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPmessages_chatFull > MTPmessages_ChatFull ; <nl> class MTPmessages_affectedHistory : private mtpDataOwner { <nl> public : <nl> MTPmessages_affectedHistory ( ) ; <nl> - MTPmessages_affectedHistory ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_affectedHistory ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDmessages_affectedHistory & c_messages_affectedHistory ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPmessages_affectedHistory > MTPmessages_AffectedHistory ; <nl> <nl> class MTPmessagesFilter : private mtpDataOwner { <nl> public : <nl> - MTPmessagesFilter ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPmessagesFilter ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPmessagesFilter ( ) { <nl> } <nl> const MTPDinputMessagesFilterPhoneCalls & c_inputMessagesFilterPhoneCalls ( ) const ; <nl> <nl> typedef MTPBoxed < MTPmessagesFilter > MTPMessagesFilter ; <nl> <nl> class MTPupdate : private mtpDataOwner { <nl> public : <nl> - MTPupdate ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPupdate ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPupdate ( ) { <nl> } <nl> const MTPDupdateNewMessage & c_updateNewMessage ( ) const ; <nl> const MTPDupdateMessageID & c_updateMessageID ( ) const ; <nl> typedef MTPBoxed < MTPupdate > MTPUpdate ; <nl> class MTPupdates_state : private mtpDataOwner { <nl> public : <nl> MTPupdates_state ( ) ; <nl> - MTPupdates_state ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_updates_state ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDupdates_state & c_updates_state ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPupdates_state > MTPupdates_State ; <nl> <nl> class MTPupdates_difference : private mtpDataOwner { <nl> public : <nl> - MTPupdates_difference ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPupdates_difference ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPupdates_difference ( ) { <nl> } <nl> const MTPDupdates_differenceEmpty & c_updates_differenceEmpty ( ) const ; <nl> const MTPDupdates_difference & c_updates_difference ( ) const ; <nl> typedef MTPBoxed < MTPupdates_difference > MTPupdates_Difference ; <nl> <nl> class MTPupdates : private mtpDataOwner { <nl> public : <nl> - MTPupdates ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPupdates ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPupdates ( ) { <nl> } <nl> const MTPDupdateShortMessage & c_updateShortMessage ( ) const ; <nl> const MTPDupdateShortChatMessage & c_updateShortChatMessage ( ) const ; <nl> typedef MTPBoxed < MTPupdates > MTPUpdates ; <nl> <nl> class MTPphotos_photos : private mtpDataOwner { <nl> public : <nl> - MTPphotos_photos ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPphotos_photos ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPphotos_photos ( ) { <nl> } <nl> const MTPDphotos_photos & c_photos_photos ( ) const ; <nl> const MTPDphotos_photosSlice & c_photos_photosSlice ( ) const ; <nl> typedef MTPBoxed < MTPphotos_photos > MTPphotos_Photos ; <nl> class MTPphotos_photo : private mtpDataOwner { <nl> public : <nl> MTPphotos_photo ( ) ; <nl> - MTPphotos_photo ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_photos_photo ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDphotos_photo & c_photos_photo ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPphotos_photo > MTPphotos_Photo ; <nl> class MTPupload_file : private mtpDataOwner { <nl> public : <nl> MTPupload_file ( ) ; <nl> - MTPupload_file ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_upload_file ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDupload_file & c_upload_file ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPupload_file > MTPupload_File ; <nl> class MTPdcOption : private mtpDataOwner { <nl> public : <nl> MTPdcOption ( ) ; <nl> - MTPdcOption ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_dcOption ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDdcOption & c_dcOption ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPdcOption > MTPDcOption ; <nl> class MTPconfig : private mtpDataOwner { <nl> public : <nl> MTPconfig ( ) ; <nl> - MTPconfig ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_config ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDconfig & c_config ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPconfig > MTPConfig ; <nl> class MTPnearestDc : private mtpDataOwner { <nl> public : <nl> MTPnearestDc ( ) ; <nl> - MTPnearestDc ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_nearestDc ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDnearestDc & c_nearestDc ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPnearestDc > MTPNearestDc ; <nl> <nl> class MTPhelp_appUpdate : private mtpDataOwner { <nl> public : <nl> - MTPhelp_appUpdate ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPhelp_appUpdate ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPhelp_appUpdate ( ) { <nl> } <nl> const MTPDhelp_appUpdate & c_help_appUpdate ( ) const ; <nl> <nl> typedef MTPBoxed < MTPhelp_appUpdate > MTPhelp_AppUpdate ; <nl> class MTPhelp_inviteText : private mtpDataOwner { <nl> public : <nl> MTPhelp_inviteText ( ) ; <nl> - MTPhelp_inviteText ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_help_inviteText ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDhelp_inviteText & c_help_inviteText ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPhelp_inviteText > MTPhelp_InviteText ; <nl> <nl> class MTPencryptedChat : private mtpDataOwner { <nl> public : <nl> - MTPencryptedChat ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPencryptedChat ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPencryptedChat ( ) { <nl> } <nl> const MTPDencryptedChatEmpty & c_encryptedChatEmpty ( ) const ; <nl> const MTPDencryptedChatWaiting & c_encryptedChatWaiting ( ) const ; <nl> typedef MTPBoxed < MTPencryptedChat > MTPEncryptedChat ; <nl> class MTPinputEncryptedChat : private mtpDataOwner { <nl> public : <nl> MTPinputEncryptedChat ( ) ; <nl> - MTPinputEncryptedChat ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_inputEncryptedChat ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDinputEncryptedChat & c_inputEncryptedChat ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPinputEncryptedChat > MTPInputEncryptedChat ; <nl> <nl> class MTPencryptedFile : private mtpDataOwner { <nl> public : <nl> - MTPencryptedFile ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPencryptedFile ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPencryptedFile ( ) { <nl> } <nl> const MTPDencryptedFile & c_encryptedFile ( ) const ; <nl> <nl> typedef MTPBoxed < MTPencryptedFile > MTPEncryptedFile ; <nl> <nl> class MTPinputEncryptedFile : private mtpDataOwner { <nl> public : <nl> - MTPinputEncryptedFile ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPinputEncryptedFile ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPinputEncryptedFile ( ) { <nl> } <nl> const MTPDinputEncryptedFileUploaded & c_inputEncryptedFileUploaded ( ) const ; <nl> const MTPDinputEncryptedFile & c_inputEncryptedFile ( ) const ; <nl> typedef MTPBoxed < MTPinputEncryptedFile > MTPInputEncryptedFile ; <nl> <nl> class MTPencryptedMessage : private mtpDataOwner { <nl> public : <nl> - MTPencryptedMessage ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPencryptedMessage ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPencryptedMessage ( ) { <nl> } <nl> const MTPDencryptedMessage & c_encryptedMessage ( ) const ; <nl> const MTPDencryptedMessageService & c_encryptedMessageService ( ) const ; <nl> typedef MTPBoxed < MTPencryptedMessage > MTPEncryptedMessage ; <nl> <nl> class MTPmessages_dhConfig : private mtpDataOwner { <nl> public : <nl> - MTPmessages_dhConfig ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPmessages_dhConfig ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPmessages_dhConfig ( ) { <nl> } <nl> const MTPDmessages_dhConfigNotModified & c_messages_dhConfigNotModified ( ) const ; <nl> const MTPDmessages_dhConfig & c_messages_dhConfig ( ) const ; <nl> typedef MTPBoxed < MTPmessages_dhConfig > MTPmessages_DhConfig ; <nl> <nl> class MTPmessages_sentEncryptedMessage : private mtpDataOwner { <nl> public : <nl> - MTPmessages_sentEncryptedMessage ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPmessages_sentEncryptedMessage ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPmessages_sentEncryptedMessage ( ) { <nl> } <nl> const MTPDmessages_sentEncryptedMessage & c_messages_sentEncryptedMessage ( ) const ; <nl> const MTPDmessages_sentEncryptedFile & c_messages_sentEncryptedFile ( ) const ; <nl> typedef MTPBoxed < MTPmessages_sentEncryptedMessage > MTPmessages_SentEncryptedMess <nl> <nl> class MTPinputDocument : private mtpDataOwner { <nl> public : <nl> - MTPinputDocument ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPinputDocument ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPinputDocument ( ) { <nl> } <nl> const MTPDinputDocument & c_inputDocument ( ) const ; <nl> <nl> typedef MTPBoxed < MTPinputDocument > MTPInputDocument ; <nl> <nl> class MTPdocument : private mtpDataOwner { <nl> public : <nl> - MTPdocument ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPdocument ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPdocument ( ) { <nl> } <nl> const MTPDdocumentEmpty & c_documentEmpty ( ) const ; <nl> const MTPDdocument & c_document ( ) const ; <nl> typedef MTPBoxed < MTPdocument > MTPDocument ; <nl> class MTPhelp_support : private mtpDataOwner { <nl> public : <nl> MTPhelp_support ( ) ; <nl> - MTPhelp_support ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_help_support ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDhelp_support & c_help_support ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPhelp_support > MTPhelp_Support ; <nl> <nl> class MTPnotifyPeer : private mtpDataOwner { <nl> public : <nl> - MTPnotifyPeer ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPnotifyPeer ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPnotifyPeer ( ) { <nl> } <nl> const MTPDnotifyPeer & c_notifyPeer ( ) const ; <nl> <nl> typedef MTPBoxed < MTPnotifyPeer > MTPNotifyPeer ; <nl> <nl> class MTPsendMessageAction : private mtpDataOwner { <nl> public : <nl> - MTPsendMessageAction ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPsendMessageAction ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPsendMessageAction ( ) { <nl> } <nl> const MTPDsendMessageUploadVideoAction & c_sendMessageUploadVideoAction ( ) const ; <nl> const MTPDsendMessageUploadAudioAction & c_sendMessageUploadAudioAction ( ) const ; <nl> typedef MTPBoxed < MTPsendMessageAction > MTPSendMessageAction ; <nl> class MTPcontacts_found : private mtpDataOwner { <nl> public : <nl> MTPcontacts_found ( ) ; <nl> - MTPcontacts_found ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_contacts_found ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDcontacts_found & c_contacts_found ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> class MTPinputPrivacyKey { <nl> public : <nl> MTPinputPrivacyKey ( ) { <nl> } <nl> - MTPinputPrivacyKey ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> <nl> uint32 innerLength ( ) const ; <nl> mtpTypeId type ( ) const ; <nl> class MTPprivacyKey { <nl> public : <nl> MTPprivacyKey ( ) { <nl> } <nl> - MTPprivacyKey ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> <nl> uint32 innerLength ( ) const ; <nl> mtpTypeId type ( ) const ; <nl> typedef MTPBoxed < MTPprivacyKey > MTPPrivacyKey ; <nl> <nl> class MTPinputPrivacyRule : private mtpDataOwner { <nl> public : <nl> - MTPinputPrivacyRule ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPinputPrivacyRule ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPinputPrivacyRule ( ) { <nl> } <nl> const MTPDinputPrivacyValueAllowUsers & c_inputPrivacyValueAllowUsers ( ) const ; <nl> const MTPDinputPrivacyValueDisallowUsers & c_inputPrivacyValueDisallowUsers ( ) const ; <nl> typedef MTPBoxed < MTPinputPrivacyRule > MTPInputPrivacyRule ; <nl> <nl> class MTPprivacyRule : private mtpDataOwner { <nl> public : <nl> - MTPprivacyRule ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPprivacyRule ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPprivacyRule ( ) { <nl> } <nl> const MTPDprivacyValueAllowUsers & c_privacyValueAllowUsers ( ) const ; <nl> const MTPDprivacyValueDisallowUsers & c_privacyValueDisallowUsers ( ) const ; <nl> typedef MTPBoxed < MTPprivacyRule > MTPPrivacyRule ; <nl> class MTPaccount_privacyRules : private mtpDataOwner { <nl> public : <nl> MTPaccount_privacyRules ( ) ; <nl> - MTPaccount_privacyRules ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_account_privacyRules ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDaccount_privacyRules & c_account_privacyRules ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPaccount_privacyRules > MTPaccount_PrivacyRules ; <nl> class MTPaccountDaysTTL : private mtpDataOwner { <nl> public : <nl> MTPaccountDaysTTL ( ) ; <nl> - MTPaccountDaysTTL ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_accountDaysTTL ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDaccountDaysTTL & c_accountDaysTTL ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPaccountDaysTTL > MTPAccountDaysTTL ; <nl> <nl> class MTPdocumentAttribute : private mtpDataOwner { <nl> public : <nl> - MTPdocumentAttribute ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPdocumentAttribute ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPdocumentAttribute ( ) { <nl> } <nl> const MTPDdocumentAttributeImageSize & c_documentAttributeImageSize ( ) const ; <nl> const MTPDdocumentAttributeSticker & c_documentAttributeSticker ( ) const ; <nl> typedef MTPBoxed < MTPdocumentAttribute > MTPDocumentAttribute ; <nl> <nl> class MTPmessages_stickers : private mtpDataOwner { <nl> public : <nl> - MTPmessages_stickers ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPmessages_stickers ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPmessages_stickers ( ) { <nl> } <nl> const MTPDmessages_stickers & c_messages_stickers ( ) const ; <nl> <nl> typedef MTPBoxed < MTPmessages_stickers > MTPmessages_Stickers ; <nl> class MTPstickerPack : private mtpDataOwner { <nl> public : <nl> MTPstickerPack ( ) ; <nl> - MTPstickerPack ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_stickerPack ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDstickerPack & c_stickerPack ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPstickerPack > MTPStickerPack ; <nl> <nl> class MTPmessages_allStickers : private mtpDataOwner { <nl> public : <nl> - MTPmessages_allStickers ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPmessages_allStickers ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPmessages_allStickers ( ) { <nl> } <nl> const MTPDmessages_allStickers & c_messages_allStickers ( ) const ; <nl> <nl> typedef MTPBoxed < MTPmessages_allStickers > MTPmessages_AllStickers ; <nl> class MTPdisabledFeature : private mtpDataOwner { <nl> public : <nl> MTPdisabledFeature ( ) ; <nl> - MTPdisabledFeature ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_disabledFeature ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDdisabledFeature & c_disabledFeature ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPdisabledFeature > MTPDisabledFeature ; <nl> class MTPmessages_affectedMessages : private mtpDataOwner { <nl> public : <nl> MTPmessages_affectedMessages ( ) ; <nl> - MTPmessages_affectedMessages ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_affectedMessages ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDmessages_affectedMessages & c_messages_affectedMessages ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> class MTPcontactLink { <nl> public : <nl> MTPcontactLink ( ) { <nl> } <nl> - MTPcontactLink ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> <nl> uint32 innerLength ( ) const ; <nl> mtpTypeId type ( ) const ; <nl> typedef MTPBoxed < MTPcontactLink > MTPContactLink ; <nl> <nl> class MTPwebPage : private mtpDataOwner { <nl> public : <nl> - MTPwebPage ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPwebPage ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPwebPage ( ) { <nl> } <nl> const MTPDwebPageEmpty & c_webPageEmpty ( ) const ; <nl> const MTPDwebPagePending & c_webPagePending ( ) const ; <nl> typedef MTPBoxed < MTPwebPage > MTPWebPage ; <nl> class MTPauthorization : private mtpDataOwner { <nl> public : <nl> MTPauthorization ( ) ; <nl> - MTPauthorization ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_authorization ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDauthorization & c_authorization ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPauthorization > MTPAuthorization ; <nl> class MTPaccount_authorizations : private mtpDataOwner { <nl> public : <nl> MTPaccount_authorizations ( ) ; <nl> - MTPaccount_authorizations ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_account_authorizations ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDaccount_authorizations & c_account_authorizations ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPaccount_authorizations > MTPaccount_Authorizations ; <nl> <nl> class MTPaccount_password : private mtpDataOwner { <nl> public : <nl> - MTPaccount_password ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPaccount_password ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPaccount_password ( ) { <nl> } <nl> const MTPDaccount_noPassword & c_account_noPassword ( ) const ; <nl> const MTPDaccount_password & c_account_password ( ) const ; <nl> typedef MTPBoxed < MTPaccount_password > MTPaccount_Password ; <nl> class MTPaccount_passwordSettings : private mtpDataOwner { <nl> public : <nl> MTPaccount_passwordSettings ( ) ; <nl> - MTPaccount_passwordSettings ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_account_passwordSettings ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDaccount_passwordSettings & c_account_passwordSettings ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPaccount_passwordSettings > MTPaccount_PasswordSettings ; <nl> class MTPaccount_passwordInputSettings : private mtpDataOwner { <nl> public : <nl> MTPaccount_passwordInputSettings ( ) ; <nl> - MTPaccount_passwordInputSettings ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_account_passwordInputSettings ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDaccount_passwordInputSettings & c_account_passwordInputSettings ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPaccount_passwordInputSettings > MTPaccount_PasswordInputSetti <nl> class MTPauth_passwordRecovery : private mtpDataOwner { <nl> public : <nl> MTPauth_passwordRecovery ( ) ; <nl> - MTPauth_passwordRecovery ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_auth_passwordRecovery ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDauth_passwordRecovery & c_auth_passwordRecovery ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPauth_passwordRecovery > MTPauth_PasswordRecovery ; <nl> class MTPreceivedNotifyMessage : private mtpDataOwner { <nl> public : <nl> MTPreceivedNotifyMessage ( ) ; <nl> - MTPreceivedNotifyMessage ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_receivedNotifyMessage ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDreceivedNotifyMessage & c_receivedNotifyMessage ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPreceivedNotifyMessage > MTPReceivedNotifyMessage ; <nl> <nl> class MTPexportedChatInvite : private mtpDataOwner { <nl> public : <nl> - MTPexportedChatInvite ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPexportedChatInvite ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPexportedChatInvite ( ) { <nl> } <nl> const MTPDchatInviteExported & c_chatInviteExported ( ) const ; <nl> <nl> typedef MTPBoxed < MTPexportedChatInvite > MTPExportedChatInvite ; <nl> <nl> class MTPchatInvite : private mtpDataOwner { <nl> public : <nl> - MTPchatInvite ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPchatInvite ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPchatInvite ( ) { <nl> } <nl> const MTPDchatInviteAlready & c_chatInviteAlready ( ) const ; <nl> const MTPDchatInvite & c_chatInvite ( ) const ; <nl> typedef MTPBoxed < MTPchatInvite > MTPChatInvite ; <nl> <nl> class MTPinputStickerSet : private mtpDataOwner { <nl> public : <nl> - MTPinputStickerSet ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPinputStickerSet ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPinputStickerSet ( ) { <nl> } <nl> const MTPDinputStickerSetID & c_inputStickerSetID ( ) const ; <nl> const MTPDinputStickerSetShortName & c_inputStickerSetShortName ( ) const ; <nl> typedef MTPBoxed < MTPinputStickerSet > MTPInputStickerSet ; <nl> class MTPstickerSet : private mtpDataOwner { <nl> public : <nl> MTPstickerSet ( ) ; <nl> - MTPstickerSet ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_stickerSet ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDstickerSet & c_stickerSet ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPstickerSet > MTPStickerSet ; <nl> class MTPmessages_stickerSet : private mtpDataOwner { <nl> public : <nl> MTPmessages_stickerSet ( ) ; <nl> - MTPmessages_stickerSet ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_stickerSet ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDmessages_stickerSet & c_messages_stickerSet ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPmessages_stickerSet > MTPmessages_StickerSet ; <nl> class MTPbotCommand : private mtpDataOwner { <nl> public : <nl> MTPbotCommand ( ) ; <nl> - MTPbotCommand ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_botCommand ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDbotCommand & c_botCommand ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPbotCommand > MTPBotCommand ; <nl> class MTPbotInfo : private mtpDataOwner { <nl> public : <nl> MTPbotInfo ( ) ; <nl> - MTPbotInfo ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_botInfo ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDbotInfo & c_botInfo ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPbotInfo > MTPBotInfo ; <nl> <nl> class MTPkeyboardButton : private mtpDataOwner { <nl> public : <nl> - MTPkeyboardButton ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPkeyboardButton ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPkeyboardButton ( ) { <nl> } <nl> const MTPDkeyboardButton & c_keyboardButton ( ) const ; <nl> const MTPDkeyboardButtonUrl & c_keyboardButtonUrl ( ) const ; <nl> typedef MTPBoxed < MTPkeyboardButton > MTPKeyboardButton ; <nl> class MTPkeyboardButtonRow : private mtpDataOwner { <nl> public : <nl> MTPkeyboardButtonRow ( ) ; <nl> - MTPkeyboardButtonRow ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_keyboardButtonRow ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDkeyboardButtonRow & c_keyboardButtonRow ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPkeyboardButtonRow > MTPKeyboardButtonRow ; <nl> <nl> class MTPreplyMarkup : private mtpDataOwner { <nl> public : <nl> - MTPreplyMarkup ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPreplyMarkup ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPreplyMarkup ( ) { <nl> } <nl> const MTPDreplyKeyboardHide & c_replyKeyboardHide ( ) const ; <nl> const MTPDreplyKeyboardForceReply & c_replyKeyboardForceReply ( ) const ; <nl> typedef MTPBoxed < MTPreplyMarkup > MTPReplyMarkup ; <nl> <nl> class MTPhelp_appChangelog : private mtpDataOwner { <nl> public : <nl> - MTPhelp_appChangelog ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPhelp_appChangelog ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPhelp_appChangelog ( ) { <nl> } <nl> const MTPDhelp_appChangelog & c_help_appChangelog ( ) const ; <nl> <nl> typedef MTPBoxed < MTPhelp_appChangelog > MTPhelp_AppChangelog ; <nl> <nl> class MTPmessageEntity : private mtpDataOwner { <nl> public : <nl> - MTPmessageEntity ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPmessageEntity ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPmessageEntity ( ) { <nl> } <nl> const MTPDmessageEntityUnknown & c_messageEntityUnknown ( ) const ; <nl> const MTPDmessageEntityMention & c_messageEntityMention ( ) const ; <nl> typedef MTPBoxed < MTPmessageEntity > MTPMessageEntity ; <nl> <nl> class MTPinputChannel : private mtpDataOwner { <nl> public : <nl> - MTPinputChannel ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPinputChannel ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPinputChannel ( ) { <nl> } <nl> const MTPDinputChannel & c_inputChannel ( ) const ; <nl> <nl> typedef MTPBoxed < MTPinputChannel > MTPInputChannel ; <nl> class MTPcontacts_resolvedPeer : private mtpDataOwner { <nl> public : <nl> MTPcontacts_resolvedPeer ( ) ; <nl> - MTPcontacts_resolvedPeer ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_contacts_resolvedPeer ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDcontacts_resolvedPeer & c_contacts_resolvedPeer ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPcontacts_resolvedPeer > MTPcontacts_ResolvedPeer ; <nl> class MTPmessageRange : private mtpDataOwner { <nl> public : <nl> MTPmessageRange ( ) ; <nl> - MTPmessageRange ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messageRange ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDmessageRange & c_messageRange ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPmessageRange > MTPMessageRange ; <nl> <nl> class MTPupdates_channelDifference : private mtpDataOwner { <nl> public : <nl> - MTPupdates_channelDifference ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPupdates_channelDifference ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPupdates_channelDifference ( ) { <nl> } <nl> const MTPDupdates_channelDifferenceEmpty & c_updates_channelDifferenceEmpty ( ) const ; <nl> const MTPDupdates_channelDifferenceTooLong & c_updates_channelDifferenceTooLong ( ) const ; <nl> typedef MTPBoxed < MTPupdates_channelDifference > MTPupdates_ChannelDifference ; <nl> <nl> class MTPchannelMessagesFilter : private mtpDataOwner { <nl> public : <nl> - MTPchannelMessagesFilter ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPchannelMessagesFilter ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPchannelMessagesFilter ( ) { <nl> } <nl> const MTPDchannelMessagesFilter & c_channelMessagesFilter ( ) const ; <nl> <nl> typedef MTPBoxed < MTPchannelMessagesFilter > MTPChannelMessagesFilter ; <nl> <nl> class MTPchannelParticipant : private mtpDataOwner { <nl> public : <nl> - MTPchannelParticipant ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPchannelParticipant ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPchannelParticipant ( ) { <nl> } <nl> const MTPDchannelParticipant & c_channelParticipant ( ) const ; <nl> const MTPDchannelParticipantSelf & c_channelParticipantSelf ( ) const ; <nl> class MTPchannelParticipantsFilter { <nl> public : <nl> MTPchannelParticipantsFilter ( ) { <nl> } <nl> - MTPchannelParticipantsFilter ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> <nl> uint32 innerLength ( ) const ; <nl> mtpTypeId type ( ) const ; <nl> class MTPchannelParticipantRole { <nl> public : <nl> MTPchannelParticipantRole ( ) { <nl> } <nl> - MTPchannelParticipantRole ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> <nl> uint32 innerLength ( ) const ; <nl> mtpTypeId type ( ) const ; <nl> typedef MTPBoxed < MTPchannelParticipantRole > MTPChannelParticipantRole ; <nl> class MTPchannels_channelParticipants : private mtpDataOwner { <nl> public : <nl> MTPchannels_channelParticipants ( ) ; <nl> - MTPchannels_channelParticipants ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_channels_channelParticipants ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDchannels_channelParticipants & c_channels_channelParticipants ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPchannels_channelParticipants > MTPchannels_ChannelParticipant <nl> class MTPchannels_channelParticipant : private mtpDataOwner { <nl> public : <nl> MTPchannels_channelParticipant ( ) ; <nl> - MTPchannels_channelParticipant ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_channels_channelParticipant ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDchannels_channelParticipant & c_channels_channelParticipant ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPchannels_channelParticipant > MTPchannels_ChannelParticipant ; <nl> class MTPhelp_termsOfService : private mtpDataOwner { <nl> public : <nl> MTPhelp_termsOfService ( ) ; <nl> - MTPhelp_termsOfService ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_help_termsOfService ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDhelp_termsOfService & c_help_termsOfService ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPhelp_termsOfService > MTPhelp_TermsOfService ; <nl> <nl> class MTPfoundGif : private mtpDataOwner { <nl> public : <nl> - MTPfoundGif ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPfoundGif ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPfoundGif ( ) { <nl> } <nl> const MTPDfoundGif & c_foundGif ( ) const ; <nl> const MTPDfoundGifCached & c_foundGifCached ( ) const ; <nl> typedef MTPBoxed < MTPfoundGif > MTPFoundGif ; <nl> class MTPmessages_foundGifs : private mtpDataOwner { <nl> public : <nl> MTPmessages_foundGifs ( ) ; <nl> - MTPmessages_foundGifs ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_foundGifs ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDmessages_foundGifs & c_messages_foundGifs ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPmessages_foundGifs > MTPmessages_FoundGifs ; <nl> <nl> class MTPmessages_savedGifs : private mtpDataOwner { <nl> public : <nl> - MTPmessages_savedGifs ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPmessages_savedGifs ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPmessages_savedGifs ( ) { <nl> } <nl> const MTPDmessages_savedGifs & c_messages_savedGifs ( ) const ; <nl> <nl> typedef MTPBoxed < MTPmessages_savedGifs > MTPmessages_SavedGifs ; <nl> <nl> class MTPinputBotInlineMessage : private mtpDataOwner { <nl> public : <nl> - MTPinputBotInlineMessage ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPinputBotInlineMessage ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPinputBotInlineMessage ( ) { <nl> } <nl> const MTPDinputBotInlineMessageMediaAuto & c_inputBotInlineMessageMediaAuto ( ) const ; <nl> const MTPDinputBotInlineMessageText & c_inputBotInlineMessageText ( ) const ; <nl> typedef MTPBoxed < MTPinputBotInlineMessage > MTPInputBotInlineMessage ; <nl> <nl> class MTPinputBotInlineResult : private mtpDataOwner { <nl> public : <nl> - MTPinputBotInlineResult ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPinputBotInlineResult ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPinputBotInlineResult ( ) { <nl> } <nl> const MTPDinputBotInlineResult & c_inputBotInlineResult ( ) const ; <nl> const MTPDinputBotInlineResultPhoto & c_inputBotInlineResultPhoto ( ) const ; <nl> typedef MTPBoxed < MTPinputBotInlineResult > MTPInputBotInlineResult ; <nl> <nl> class MTPbotInlineMessage : private mtpDataOwner { <nl> public : <nl> - MTPbotInlineMessage ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPbotInlineMessage ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPbotInlineMessage ( ) { <nl> } <nl> const MTPDbotInlineMessageMediaAuto & c_botInlineMessageMediaAuto ( ) const ; <nl> const MTPDbotInlineMessageText & c_botInlineMessageText ( ) const ; <nl> typedef MTPBoxed < MTPbotInlineMessage > MTPBotInlineMessage ; <nl> <nl> class MTPbotInlineResult : private mtpDataOwner { <nl> public : <nl> - MTPbotInlineResult ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPbotInlineResult ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPbotInlineResult ( ) { <nl> } <nl> const MTPDbotInlineResult & c_botInlineResult ( ) const ; <nl> const MTPDbotInlineMediaResult & c_botInlineMediaResult ( ) const ; <nl> typedef MTPBoxed < MTPbotInlineResult > MTPBotInlineResult ; <nl> class MTPmessages_botResults : private mtpDataOwner { <nl> public : <nl> MTPmessages_botResults ( ) ; <nl> - MTPmessages_botResults ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_botResults ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDmessages_botResults & c_messages_botResults ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPmessages_botResults > MTPmessages_BotResults ; <nl> class MTPexportedMessageLink : private mtpDataOwner { <nl> public : <nl> MTPexportedMessageLink ( ) ; <nl> - MTPexportedMessageLink ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_exportedMessageLink ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDexportedMessageLink & c_exportedMessageLink ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPexportedMessageLink > MTPExportedMessageLink ; <nl> class MTPmessageFwdHeader : private mtpDataOwner { <nl> public : <nl> MTPmessageFwdHeader ( ) ; <nl> - MTPmessageFwdHeader ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messageFwdHeader ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDmessageFwdHeader & c_messageFwdHeader ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> class MTPauth_codeType { <nl> public : <nl> MTPauth_codeType ( ) { <nl> } <nl> - MTPauth_codeType ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> <nl> uint32 innerLength ( ) const ; <nl> mtpTypeId type ( ) const ; <nl> typedef MTPBoxed < MTPauth_codeType > MTPauth_CodeType ; <nl> <nl> class MTPauth_sentCodeType : private mtpDataOwner { <nl> public : <nl> - MTPauth_sentCodeType ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPauth_sentCodeType ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPauth_sentCodeType ( ) { <nl> } <nl> const MTPDauth_sentCodeTypeApp & c_auth_sentCodeTypeApp ( ) const ; <nl> const MTPDauth_sentCodeTypeSms & c_auth_sentCodeTypeSms ( ) const ; <nl> typedef MTPBoxed < MTPauth_sentCodeType > MTPauth_SentCodeType ; <nl> class MTPmessages_botCallbackAnswer : private mtpDataOwner { <nl> public : <nl> MTPmessages_botCallbackAnswer ( ) ; <nl> - MTPmessages_botCallbackAnswer ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_botCallbackAnswer ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDmessages_botCallbackAnswer & c_messages_botCallbackAnswer ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPmessages_botCallbackAnswer > MTPmessages_BotCallbackAnswer ; <nl> class MTPmessages_messageEditData : private mtpDataOwner { <nl> public : <nl> MTPmessages_messageEditData ( ) ; <nl> - MTPmessages_messageEditData ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_messageEditData ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDmessages_messageEditData & c_messages_messageEditData ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPmessages_messageEditData > MTPmessages_MessageEditData ; <nl> class MTPinputBotInlineMessageID : private mtpDataOwner { <nl> public : <nl> MTPinputBotInlineMessageID ( ) ; <nl> - MTPinputBotInlineMessageID ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_inputBotInlineMessageID ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDinputBotInlineMessageID & c_inputBotInlineMessageID ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPinputBotInlineMessageID > MTPInputBotInlineMessageID ; <nl> class MTPinlineBotSwitchPM : private mtpDataOwner { <nl> public : <nl> MTPinlineBotSwitchPM ( ) ; <nl> - MTPinlineBotSwitchPM ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_inlineBotSwitchPM ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDinlineBotSwitchPM & c_inlineBotSwitchPM ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPinlineBotSwitchPM > MTPInlineBotSwitchPM ; <nl> class MTPmessages_peerDialogs : private mtpDataOwner { <nl> public : <nl> MTPmessages_peerDialogs ( ) ; <nl> - MTPmessages_peerDialogs ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_peerDialogs ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDmessages_peerDialogs & c_messages_peerDialogs ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPmessages_peerDialogs > MTPmessages_PeerDialogs ; <nl> class MTPtopPeer : private mtpDataOwner { <nl> public : <nl> MTPtopPeer ( ) ; <nl> - MTPtopPeer ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_topPeer ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDtopPeer & c_topPeer ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> class MTPtopPeerCategory { <nl> public : <nl> MTPtopPeerCategory ( ) { <nl> } <nl> - MTPtopPeerCategory ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> <nl> uint32 innerLength ( ) const ; <nl> mtpTypeId type ( ) const ; <nl> typedef MTPBoxed < MTPtopPeerCategory > MTPTopPeerCategory ; <nl> class MTPtopPeerCategoryPeers : private mtpDataOwner { <nl> public : <nl> MTPtopPeerCategoryPeers ( ) ; <nl> - MTPtopPeerCategoryPeers ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_topPeerCategoryPeers ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDtopPeerCategoryPeers & c_topPeerCategoryPeers ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPtopPeerCategoryPeers > MTPTopPeerCategoryPeers ; <nl> <nl> class MTPcontacts_topPeers : private mtpDataOwner { <nl> public : <nl> - MTPcontacts_topPeers ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPcontacts_topPeers ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPcontacts_topPeers ( ) { <nl> } <nl> const MTPDcontacts_topPeers & c_contacts_topPeers ( ) const ; <nl> <nl> typedef MTPBoxed < MTPcontacts_topPeers > MTPcontacts_TopPeers ; <nl> <nl> class MTPdraftMessage : private mtpDataOwner { <nl> public : <nl> - MTPdraftMessage ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPdraftMessage ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPdraftMessage ( ) { <nl> } <nl> const MTPDdraftMessage & c_draftMessage ( ) const ; <nl> <nl> typedef MTPBoxed < MTPdraftMessage > MTPDraftMessage ; <nl> <nl> class MTPmessages_featuredStickers : private mtpDataOwner { <nl> public : <nl> - MTPmessages_featuredStickers ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPmessages_featuredStickers ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPmessages_featuredStickers ( ) { <nl> } <nl> const MTPDmessages_featuredStickers & c_messages_featuredStickers ( ) const ; <nl> <nl> typedef MTPBoxed < MTPmessages_featuredStickers > MTPmessages_FeaturedStickers ; <nl> <nl> class MTPmessages_recentStickers : private mtpDataOwner { <nl> public : <nl> - MTPmessages_recentStickers ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPmessages_recentStickers ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPmessages_recentStickers ( ) { <nl> } <nl> const MTPDmessages_recentStickers & c_messages_recentStickers ( ) const ; <nl> <nl> typedef MTPBoxed < MTPmessages_recentStickers > MTPmessages_RecentStickers ; <nl> class MTPmessages_archivedStickers : private mtpDataOwner { <nl> public : <nl> MTPmessages_archivedStickers ( ) ; <nl> - MTPmessages_archivedStickers ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_archivedStickers ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDmessages_archivedStickers & c_messages_archivedStickers ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPmessages_archivedStickers > MTPmessages_ArchivedStickers ; <nl> <nl> class MTPmessages_stickerSetInstallResult : private mtpDataOwner { <nl> public : <nl> - MTPmessages_stickerSetInstallResult ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPmessages_stickerSetInstallResult ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPmessages_stickerSetInstallResult ( ) { <nl> } <nl> const MTPDmessages_stickerSetInstallResultArchive & c_messages_stickerSetInstallResultArchive ( ) const ; <nl> <nl> typedef MTPBoxed < MTPmessages_stickerSetInstallResult > MTPmessages_StickerSetInst <nl> <nl> class MTPstickerSetCovered : private mtpDataOwner { <nl> public : <nl> - MTPstickerSetCovered ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPstickerSetCovered ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPstickerSetCovered ( ) { <nl> } <nl> const MTPDstickerSetCovered & c_stickerSetCovered ( ) const ; <nl> const MTPDstickerSetMultiCovered & c_stickerSetMultiCovered ( ) const ; <nl> typedef MTPBoxed < MTPstickerSetCovered > MTPStickerSetCovered ; <nl> class MTPmaskCoords : private mtpDataOwner { <nl> public : <nl> MTPmaskCoords ( ) ; <nl> - MTPmaskCoords ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_maskCoords ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDmaskCoords & c_maskCoords ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPmaskCoords > MTPMaskCoords ; <nl> <nl> class MTPinputStickeredMedia : private mtpDataOwner { <nl> public : <nl> - MTPinputStickeredMedia ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPinputStickeredMedia ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPinputStickeredMedia ( ) { <nl> } <nl> const MTPDinputStickeredMediaPhoto & c_inputStickeredMediaPhoto ( ) const ; <nl> const MTPDinputStickeredMediaDocument & c_inputStickeredMediaDocument ( ) const ; <nl> typedef MTPBoxed < MTPinputStickeredMedia > MTPInputStickeredMedia ; <nl> class MTPgame : private mtpDataOwner { <nl> public : <nl> MTPgame ( ) ; <nl> - MTPgame ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_game ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDgame & c_game ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPgame > MTPGame ; <nl> <nl> class MTPinputGame : private mtpDataOwner { <nl> public : <nl> - MTPinputGame ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPinputGame ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPinputGame ( ) { <nl> } <nl> const MTPDinputGameID & c_inputGameID ( ) const ; <nl> const MTPDinputGameShortName & c_inputGameShortName ( ) const ; <nl> typedef MTPBoxed < MTPinputGame > MTPInputGame ; <nl> class MTPhighScore : private mtpDataOwner { <nl> public : <nl> MTPhighScore ( ) ; <nl> - MTPhighScore ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_highScore ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDhighScore & c_highScore ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPhighScore > MTPHighScore ; <nl> class MTPmessages_highScores : private mtpDataOwner { <nl> public : <nl> MTPmessages_highScores ( ) ; <nl> - MTPmessages_highScores ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_highScores ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDmessages_highScores & c_messages_highScores ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPmessages_highScores > MTPmessages_HighScores ; <nl> <nl> class MTPrichText : private mtpDataOwner { <nl> public : <nl> - MTPrichText ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPrichText ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPrichText ( ) { <nl> } <nl> const MTPDtextPlain & c_textPlain ( ) const ; <nl> const MTPDtextBold & c_textBold ( ) const ; <nl> typedef MTPBoxed < MTPrichText > MTPRichText ; <nl> <nl> class MTPpageBlock : private mtpDataOwner { <nl> public : <nl> - MTPpageBlock ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPpageBlock ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPpageBlock ( ) { <nl> } <nl> const MTPDpageBlockTitle & c_pageBlockTitle ( ) const ; <nl> const MTPDpageBlockSubtitle & c_pageBlockSubtitle ( ) const ; <nl> typedef MTPBoxed < MTPpageBlock > MTPPageBlock ; <nl> <nl> class MTPpage : private mtpDataOwner { <nl> public : <nl> - MTPpage ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPpage ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPpage ( ) { <nl> } <nl> const MTPDpagePart & c_pagePart ( ) const ; <nl> const MTPDpageFull & c_pageFull ( ) const ; <nl> typedef MTPBoxed < MTPpage > MTPPage ; <nl> class MTPinputPhoneCall : private mtpDataOwner { <nl> public : <nl> MTPinputPhoneCall ( ) ; <nl> - MTPinputPhoneCall ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_inputPhoneCall ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDinputPhoneCall & c_inputPhoneCall ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPinputPhoneCall > MTPInputPhoneCall ; <nl> <nl> class MTPphoneCall : private mtpDataOwner { <nl> public : <nl> - MTPphoneCall ( ) : mtpDataOwner ( nullptr ) { <nl> - } <nl> - MTPphoneCall ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> + MTPphoneCall ( ) { <nl> } <nl> const MTPDphoneCallEmpty & c_phoneCallEmpty ( ) const ; <nl> const MTPDphoneCallWaiting & c_phoneCallWaiting ( ) const ; <nl> typedef MTPBoxed < MTPphoneCall > MTPPhoneCall ; <nl> class MTPphoneConnection : private mtpDataOwner { <nl> public : <nl> MTPphoneConnection ( ) ; <nl> - MTPphoneConnection ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_phoneConnection ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDphoneConnection & c_phoneConnection ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPphoneConnection > MTPPhoneConnection ; <nl> class MTPphoneCallProtocol : private mtpDataOwner { <nl> public : <nl> MTPphoneCallProtocol ( ) ; <nl> - MTPphoneCallProtocol ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_phoneCallProtocol ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDphoneCallProtocol & c_phoneCallProtocol ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> typedef MTPBoxed < MTPphoneCallProtocol > MTPPhoneCallProtocol ; <nl> class MTPphone_phoneCall : private mtpDataOwner { <nl> public : <nl> MTPphone_phoneCall ( ) ; <nl> - MTPphone_phoneCall ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_phone_phoneCall ) : mtpDataOwner ( nullptr ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> const MTPDphone_phoneCall & c_phone_phoneCall ( ) const ; <nl> <nl> uint32 innerLength ( ) const ; <nl> class MTPphoneCallDiscardReason { <nl> public : <nl> MTPphoneCallDiscardReason ( ) { <nl> } <nl> - MTPphoneCallDiscardReason ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> <nl> uint32 innerLength ( ) const ; <nl> mtpTypeId type ( ) const ; <nl> typedef MTPBoxed < MTPphoneCallDiscardReason > MTPPhoneCallDiscardReason ; <nl> <nl> class MTPDresPQ : public mtpData { <nl> public : <nl> - MTPDresPQ ( ) { <nl> - } <nl> + MTPDresPQ ( ) = default ; <nl> MTPDresPQ ( const MTPint128 & _nonce , const MTPint128 & _server_nonce , const MTPstring & _pq , const MTPVector < MTPlong > & _server_public_key_fingerprints ) : vnonce ( _nonce ) , vserver_nonce ( _server_nonce ) , vpq ( _pq ) , vserver_public_key_fingerprints ( _server_public_key_fingerprints ) { <nl> } <nl> <nl> class MTPDresPQ : public mtpData { <nl> <nl> class MTPDp_q_inner_data : public mtpData { <nl> public : <nl> - MTPDp_q_inner_data ( ) { <nl> - } <nl> + MTPDp_q_inner_data ( ) = default ; <nl> MTPDp_q_inner_data ( const MTPstring & _pq , const MTPstring & _p , const MTPstring & _q , const MTPint128 & _nonce , const MTPint128 & _server_nonce , const MTPint256 & _new_nonce ) : vpq ( _pq ) , vp ( _p ) , vq ( _q ) , vnonce ( _nonce ) , vserver_nonce ( _server_nonce ) , vnew_nonce ( _new_nonce ) { <nl> } <nl> <nl> class MTPDp_q_inner_data : public mtpData { <nl> <nl> class MTPDserver_DH_params_fail : public mtpData { <nl> public : <nl> - MTPDserver_DH_params_fail ( ) { <nl> - } <nl> + MTPDserver_DH_params_fail ( ) = default ; <nl> MTPDserver_DH_params_fail ( const MTPint128 & _nonce , const MTPint128 & _server_nonce , const MTPint128 & _new_nonce_hash ) : vnonce ( _nonce ) , vserver_nonce ( _server_nonce ) , vnew_nonce_hash ( _new_nonce_hash ) { <nl> } <nl> <nl> class MTPDserver_DH_params_fail : public mtpData { <nl> <nl> class MTPDserver_DH_params_ok : public mtpData { <nl> public : <nl> - MTPDserver_DH_params_ok ( ) { <nl> - } <nl> + MTPDserver_DH_params_ok ( ) = default ; <nl> MTPDserver_DH_params_ok ( const MTPint128 & _nonce , const MTPint128 & _server_nonce , const MTPstring & _encrypted_answer ) : vnonce ( _nonce ) , vserver_nonce ( _server_nonce ) , vencrypted_answer ( _encrypted_answer ) { <nl> } <nl> <nl> class MTPDserver_DH_params_ok : public mtpData { <nl> <nl> class MTPDserver_DH_inner_data : public mtpData { <nl> public : <nl> - MTPDserver_DH_inner_data ( ) { <nl> - } <nl> + MTPDserver_DH_inner_data ( ) = default ; <nl> MTPDserver_DH_inner_data ( const MTPint128 & _nonce , const MTPint128 & _server_nonce , MTPint _g , const MTPstring & _dh_prime , const MTPstring & _g_a , MTPint _server_time ) : vnonce ( _nonce ) , vserver_nonce ( _server_nonce ) , vg ( _g ) , vdh_prime ( _dh_prime ) , vg_a ( _g_a ) , vserver_time ( _server_time ) { <nl> } <nl> <nl> class MTPDserver_DH_inner_data : public mtpData { <nl> <nl> class MTPDclient_DH_inner_data : public mtpData { <nl> public : <nl> - MTPDclient_DH_inner_data ( ) { <nl> - } <nl> + MTPDclient_DH_inner_data ( ) = default ; <nl> MTPDclient_DH_inner_data ( const MTPint128 & _nonce , const MTPint128 & _server_nonce , const MTPlong & _retry_id , const MTPstring & _g_b ) : vnonce ( _nonce ) , vserver_nonce ( _server_nonce ) , vretry_id ( _retry_id ) , vg_b ( _g_b ) { <nl> } <nl> <nl> class MTPDclient_DH_inner_data : public mtpData { <nl> <nl> class MTPDdh_gen_ok : public mtpData { <nl> public : <nl> - MTPDdh_gen_ok ( ) { <nl> - } <nl> + MTPDdh_gen_ok ( ) = default ; <nl> MTPDdh_gen_ok ( const MTPint128 & _nonce , const MTPint128 & _server_nonce , const MTPint128 & _new_nonce_hash1 ) : vnonce ( _nonce ) , vserver_nonce ( _server_nonce ) , vnew_nonce_hash1 ( _new_nonce_hash1 ) { <nl> } <nl> <nl> class MTPDdh_gen_ok : public mtpData { <nl> <nl> class MTPDdh_gen_retry : public mtpData { <nl> public : <nl> - MTPDdh_gen_retry ( ) { <nl> - } <nl> + MTPDdh_gen_retry ( ) = default ; <nl> MTPDdh_gen_retry ( const MTPint128 & _nonce , const MTPint128 & _server_nonce , const MTPint128 & _new_nonce_hash2 ) : vnonce ( _nonce ) , vserver_nonce ( _server_nonce ) , vnew_nonce_hash2 ( _new_nonce_hash2 ) { <nl> } <nl> <nl> class MTPDdh_gen_retry : public mtpData { <nl> <nl> class MTPDdh_gen_fail : public mtpData { <nl> public : <nl> - MTPDdh_gen_fail ( ) { <nl> - } <nl> + MTPDdh_gen_fail ( ) = default ; <nl> MTPDdh_gen_fail ( const MTPint128 & _nonce , const MTPint128 & _server_nonce , const MTPint128 & _new_nonce_hash3 ) : vnonce ( _nonce ) , vserver_nonce ( _server_nonce ) , vnew_nonce_hash3 ( _new_nonce_hash3 ) { <nl> } <nl> <nl> class MTPDdh_gen_fail : public mtpData { <nl> <nl> class MTPDmsgs_ack : public mtpData { <nl> public : <nl> - MTPDmsgs_ack ( ) { <nl> - } <nl> + MTPDmsgs_ack ( ) = default ; <nl> MTPDmsgs_ack ( const MTPVector < MTPlong > & _msg_ids ) : vmsg_ids ( _msg_ids ) { <nl> } <nl> <nl> class MTPDmsgs_ack : public mtpData { <nl> <nl> class MTPDbad_msg_notification : public mtpData { <nl> public : <nl> - MTPDbad_msg_notification ( ) { <nl> - } <nl> + MTPDbad_msg_notification ( ) = default ; <nl> MTPDbad_msg_notification ( const MTPlong & _bad_msg_id , MTPint _bad_msg_seqno , MTPint _error_code ) : vbad_msg_id ( _bad_msg_id ) , vbad_msg_seqno ( _bad_msg_seqno ) , verror_code ( _error_code ) { <nl> } <nl> <nl> class MTPDbad_msg_notification : public mtpData { <nl> <nl> class MTPDbad_server_salt : public mtpData { <nl> public : <nl> - MTPDbad_server_salt ( ) { <nl> - } <nl> + MTPDbad_server_salt ( ) = default ; <nl> MTPDbad_server_salt ( const MTPlong & _bad_msg_id , MTPint _bad_msg_seqno , MTPint _error_code , const MTPlong & _new_server_salt ) : vbad_msg_id ( _bad_msg_id ) , vbad_msg_seqno ( _bad_msg_seqno ) , verror_code ( _error_code ) , vnew_server_salt ( _new_server_salt ) { <nl> } <nl> <nl> class MTPDbad_server_salt : public mtpData { <nl> <nl> class MTPDmsgs_state_req : public mtpData { <nl> public : <nl> - MTPDmsgs_state_req ( ) { <nl> - } <nl> + MTPDmsgs_state_req ( ) = default ; <nl> MTPDmsgs_state_req ( const MTPVector < MTPlong > & _msg_ids ) : vmsg_ids ( _msg_ids ) { <nl> } <nl> <nl> class MTPDmsgs_state_req : public mtpData { <nl> <nl> class MTPDmsgs_state_info : public mtpData { <nl> public : <nl> - MTPDmsgs_state_info ( ) { <nl> - } <nl> + MTPDmsgs_state_info ( ) = default ; <nl> MTPDmsgs_state_info ( const MTPlong & _req_msg_id , const MTPstring & _info ) : vreq_msg_id ( _req_msg_id ) , vinfo ( _info ) { <nl> } <nl> <nl> class MTPDmsgs_state_info : public mtpData { <nl> <nl> class MTPDmsgs_all_info : public mtpData { <nl> public : <nl> - MTPDmsgs_all_info ( ) { <nl> - } <nl> + MTPDmsgs_all_info ( ) = default ; <nl> MTPDmsgs_all_info ( const MTPVector < MTPlong > & _msg_ids , const MTPstring & _info ) : vmsg_ids ( _msg_ids ) , vinfo ( _info ) { <nl> } <nl> <nl> class MTPDmsgs_all_info : public mtpData { <nl> <nl> class MTPDmsg_detailed_info : public mtpData { <nl> public : <nl> - MTPDmsg_detailed_info ( ) { <nl> - } <nl> + MTPDmsg_detailed_info ( ) = default ; <nl> MTPDmsg_detailed_info ( const MTPlong & _msg_id , const MTPlong & _answer_msg_id , MTPint _bytes , MTPint _status ) : vmsg_id ( _msg_id ) , vanswer_msg_id ( _answer_msg_id ) , vbytes ( _bytes ) , vstatus ( _status ) { <nl> } <nl> <nl> class MTPDmsg_detailed_info : public mtpData { <nl> <nl> class MTPDmsg_new_detailed_info : public mtpData { <nl> public : <nl> - MTPDmsg_new_detailed_info ( ) { <nl> - } <nl> + MTPDmsg_new_detailed_info ( ) = default ; <nl> MTPDmsg_new_detailed_info ( const MTPlong & _answer_msg_id , MTPint _bytes , MTPint _status ) : vanswer_msg_id ( _answer_msg_id ) , vbytes ( _bytes ) , vstatus ( _status ) { <nl> } <nl> <nl> class MTPDmsg_new_detailed_info : public mtpData { <nl> <nl> class MTPDmsg_resend_req : public mtpData { <nl> public : <nl> - MTPDmsg_resend_req ( ) { <nl> - } <nl> + MTPDmsg_resend_req ( ) = default ; <nl> MTPDmsg_resend_req ( const MTPVector < MTPlong > & _msg_ids ) : vmsg_ids ( _msg_ids ) { <nl> } <nl> <nl> class MTPDmsg_resend_req : public mtpData { <nl> <nl> class MTPDrpc_error : public mtpData { <nl> public : <nl> - MTPDrpc_error ( ) { <nl> - } <nl> + MTPDrpc_error ( ) = default ; <nl> MTPDrpc_error ( MTPint _error_code , const MTPstring & _error_message ) : verror_code ( _error_code ) , verror_message ( _error_message ) { <nl> } <nl> <nl> class MTPDrpc_error : public mtpData { <nl> <nl> class MTPDrpc_answer_dropped : public mtpData { <nl> public : <nl> - MTPDrpc_answer_dropped ( ) { <nl> - } <nl> + MTPDrpc_answer_dropped ( ) = default ; <nl> MTPDrpc_answer_dropped ( const MTPlong & _msg_id , MTPint _seq_no , MTPint _bytes ) : vmsg_id ( _msg_id ) , vseq_no ( _seq_no ) , vbytes ( _bytes ) { <nl> } <nl> <nl> class MTPDrpc_answer_dropped : public mtpData { <nl> <nl> class MTPDfuture_salt : public mtpData { <nl> public : <nl> - MTPDfuture_salt ( ) { <nl> - } <nl> + MTPDfuture_salt ( ) = default ; <nl> MTPDfuture_salt ( MTPint _valid_since , MTPint _valid_until , const MTPlong & _salt ) : vvalid_since ( _valid_since ) , vvalid_until ( _valid_until ) , vsalt ( _salt ) { <nl> } <nl> <nl> class MTPDfuture_salt : public mtpData { <nl> <nl> class MTPDfuture_salts : public mtpData { <nl> public : <nl> - MTPDfuture_salts ( ) { <nl> - } <nl> + MTPDfuture_salts ( ) = default ; <nl> MTPDfuture_salts ( const MTPlong & _req_msg_id , MTPint _now , const MTPvector < MTPfutureSalt > & _salts ) : vreq_msg_id ( _req_msg_id ) , vnow ( _now ) , vsalts ( _salts ) { <nl> } <nl> <nl> class MTPDfuture_salts : public mtpData { <nl> <nl> class MTPDpong : public mtpData { <nl> public : <nl> - MTPDpong ( ) { <nl> - } <nl> + MTPDpong ( ) = default ; <nl> MTPDpong ( const MTPlong & _msg_id , const MTPlong & _ping_id ) : vmsg_id ( _msg_id ) , vping_id ( _ping_id ) { <nl> } <nl> <nl> class MTPDpong : public mtpData { <nl> <nl> class MTPDdestroy_session_ok : public mtpData { <nl> public : <nl> - MTPDdestroy_session_ok ( ) { <nl> - } <nl> + MTPDdestroy_session_ok ( ) = default ; <nl> MTPDdestroy_session_ok ( const MTPlong & _session_id ) : vsession_id ( _session_id ) { <nl> } <nl> <nl> class MTPDdestroy_session_ok : public mtpData { <nl> <nl> class MTPDdestroy_session_none : public mtpData { <nl> public : <nl> - MTPDdestroy_session_none ( ) { <nl> - } <nl> + MTPDdestroy_session_none ( ) = default ; <nl> MTPDdestroy_session_none ( const MTPlong & _session_id ) : vsession_id ( _session_id ) { <nl> } <nl> <nl> class MTPDdestroy_session_none : public mtpData { <nl> <nl> class MTPDnew_session_created : public mtpData { <nl> public : <nl> - MTPDnew_session_created ( ) { <nl> - } <nl> + MTPDnew_session_created ( ) = default ; <nl> MTPDnew_session_created ( const MTPlong & _first_msg_id , const MTPlong & _unique_id , const MTPlong & _server_salt ) : vfirst_msg_id ( _first_msg_id ) , vunique_id ( _unique_id ) , vserver_salt ( _server_salt ) { <nl> } <nl> <nl> class MTPDnew_session_created : public mtpData { <nl> <nl> class MTPDhttp_wait : public mtpData { <nl> public : <nl> - MTPDhttp_wait ( ) { <nl> - } <nl> + MTPDhttp_wait ( ) = default ; <nl> MTPDhttp_wait ( MTPint _max_delay , MTPint _wait_after , MTPint _max_wait ) : vmax_delay ( _max_delay ) , vwait_after ( _wait_after ) , vmax_wait ( _max_wait ) { <nl> } <nl> <nl> class MTPDhttp_wait : public mtpData { <nl> <nl> class MTPDerror : public mtpData { <nl> public : <nl> - MTPDerror ( ) { <nl> - } <nl> + MTPDerror ( ) = default ; <nl> MTPDerror ( MTPint _code , const MTPstring & _text ) : vcode ( _code ) , vtext ( _text ) { <nl> } <nl> <nl> class MTPDerror : public mtpData { <nl> <nl> class MTPDinputPeerChat : public mtpData { <nl> public : <nl> - MTPDinputPeerChat ( ) { <nl> - } <nl> + MTPDinputPeerChat ( ) = default ; <nl> MTPDinputPeerChat ( MTPint _chat_id ) : vchat_id ( _chat_id ) { <nl> } <nl> <nl> class MTPDinputPeerChat : public mtpData { <nl> <nl> class MTPDinputPeerUser : public mtpData { <nl> public : <nl> - MTPDinputPeerUser ( ) { <nl> - } <nl> + MTPDinputPeerUser ( ) = default ; <nl> MTPDinputPeerUser ( MTPint _user_id , const MTPlong & _access_hash ) : vuser_id ( _user_id ) , vaccess_hash ( _access_hash ) { <nl> } <nl> <nl> class MTPDinputPeerUser : public mtpData { <nl> <nl> class MTPDinputPeerChannel : public mtpData { <nl> public : <nl> - MTPDinputPeerChannel ( ) { <nl> - } <nl> + MTPDinputPeerChannel ( ) = default ; <nl> MTPDinputPeerChannel ( MTPint _channel_id , const MTPlong & _access_hash ) : vchannel_id ( _channel_id ) , vaccess_hash ( _access_hash ) { <nl> } <nl> <nl> class MTPDinputPeerChannel : public mtpData { <nl> <nl> class MTPDinputUser : public mtpData { <nl> public : <nl> - MTPDinputUser ( ) { <nl> - } <nl> + MTPDinputUser ( ) = default ; <nl> MTPDinputUser ( MTPint _user_id , const MTPlong & _access_hash ) : vuser_id ( _user_id ) , vaccess_hash ( _access_hash ) { <nl> } <nl> <nl> class MTPDinputUser : public mtpData { <nl> <nl> class MTPDinputPhoneContact : public mtpData { <nl> public : <nl> - MTPDinputPhoneContact ( ) { <nl> - } <nl> + MTPDinputPhoneContact ( ) = default ; <nl> MTPDinputPhoneContact ( const MTPlong & _client_id , const MTPstring & _phone , const MTPstring & _first_name , const MTPstring & _last_name ) : vclient_id ( _client_id ) , vphone ( _phone ) , vfirst_name ( _first_name ) , vlast_name ( _last_name ) { <nl> } <nl> <nl> class MTPDinputPhoneContact : public mtpData { <nl> <nl> class MTPDinputFile : public mtpData { <nl> public : <nl> - MTPDinputFile ( ) { <nl> - } <nl> + MTPDinputFile ( ) = default ; <nl> MTPDinputFile ( const MTPlong & _id , MTPint _parts , const MTPstring & _name , const MTPstring & _md5_checksum ) : vid ( _id ) , vparts ( _parts ) , vname ( _name ) , vmd5_checksum ( _md5_checksum ) { <nl> } <nl> <nl> class MTPDinputFile : public mtpData { <nl> <nl> class MTPDinputFileBig : public mtpData { <nl> public : <nl> - MTPDinputFileBig ( ) { <nl> - } <nl> + MTPDinputFileBig ( ) = default ; <nl> MTPDinputFileBig ( const MTPlong & _id , MTPint _parts , const MTPstring & _name ) : vid ( _id ) , vparts ( _parts ) , vname ( _name ) { <nl> } <nl> <nl> class MTPDinputMediaUploadedPhoto : public mtpData { <nl> <nl> bool has_stickers ( ) const { return vflags . v & Flag : : f_stickers ; } <nl> <nl> - MTPDinputMediaUploadedPhoto ( ) { <nl> - } <nl> + MTPDinputMediaUploadedPhoto ( ) = default ; <nl> MTPDinputMediaUploadedPhoto ( const MTPflags < MTPDinputMediaUploadedPhoto : : Flags > & _flags , const MTPInputFile & _file , const MTPstring & _caption , const MTPVector < MTPInputDocument > & _stickers ) : vflags ( _flags ) , vfile ( _file ) , vcaption ( _caption ) , vstickers ( _stickers ) { <nl> } <nl> <nl> class MTPDinputMediaUploadedPhoto : public mtpData { <nl> <nl> class MTPDinputMediaPhoto : public mtpData { <nl> public : <nl> - MTPDinputMediaPhoto ( ) { <nl> - } <nl> + MTPDinputMediaPhoto ( ) = default ; <nl> MTPDinputMediaPhoto ( const MTPInputPhoto & _id , const MTPstring & _caption ) : vid ( _id ) , vcaption ( _caption ) { <nl> } <nl> <nl> class MTPDinputMediaPhoto : public mtpData { <nl> <nl> class MTPDinputMediaGeoPoint : public mtpData { <nl> public : <nl> - MTPDinputMediaGeoPoint ( ) { <nl> - } <nl> + MTPDinputMediaGeoPoint ( ) = default ; <nl> MTPDinputMediaGeoPoint ( const MTPInputGeoPoint & _geo_point ) : vgeo_point ( _geo_point ) { <nl> } <nl> <nl> class MTPDinputMediaGeoPoint : public mtpData { <nl> <nl> class MTPDinputMediaContact : public mtpData { <nl> public : <nl> - MTPDinputMediaContact ( ) { <nl> - } <nl> + MTPDinputMediaContact ( ) = default ; <nl> MTPDinputMediaContact ( const MTPstring & _phone_number , const MTPstring & _first_name , const MTPstring & _last_name ) : vphone_number ( _phone_number ) , vfirst_name ( _first_name ) , vlast_name ( _last_name ) { <nl> } <nl> <nl> class MTPDinputMediaUploadedDocument : public mtpData { <nl> <nl> bool has_stickers ( ) const { return vflags . v & Flag : : f_stickers ; } <nl> <nl> - MTPDinputMediaUploadedDocument ( ) { <nl> - } <nl> + MTPDinputMediaUploadedDocument ( ) = default ; <nl> MTPDinputMediaUploadedDocument ( const MTPflags < MTPDinputMediaUploadedDocument : : Flags > & _flags , const MTPInputFile & _file , const MTPstring & _mime_type , const MTPVector < MTPDocumentAttribute > & _attributes , const MTPstring & _caption , const MTPVector < MTPInputDocument > & _stickers ) : vflags ( _flags ) , vfile ( _file ) , vmime_type ( _mime_type ) , vattributes ( _attributes ) , vcaption ( _caption ) , vstickers ( _stickers ) { <nl> } <nl> <nl> class MTPDinputMediaUploadedThumbDocument : public mtpData { <nl> <nl> bool has_stickers ( ) const { return vflags . v & Flag : : f_stickers ; } <nl> <nl> - MTPDinputMediaUploadedThumbDocument ( ) { <nl> - } <nl> + MTPDinputMediaUploadedThumbDocument ( ) = default ; <nl> MTPDinputMediaUploadedThumbDocument ( const MTPflags < MTPDinputMediaUploadedThumbDocument : : Flags > & _flags , const MTPInputFile & _file , const MTPInputFile & _thumb , const MTPstring & _mime_type , const MTPVector < MTPDocumentAttribute > & _attributes , const MTPstring & _caption , const MTPVector < MTPInputDocument > & _stickers ) : vflags ( _flags ) , vfile ( _file ) , vthumb ( _thumb ) , vmime_type ( _mime_type ) , vattributes ( _attributes ) , vcaption ( _caption ) , vstickers ( _stickers ) { <nl> } <nl> <nl> class MTPDinputMediaUploadedThumbDocument : public mtpData { <nl> <nl> class MTPDinputMediaDocument : public mtpData { <nl> public : <nl> - MTPDinputMediaDocument ( ) { <nl> - } <nl> + MTPDinputMediaDocument ( ) = default ; <nl> MTPDinputMediaDocument ( const MTPInputDocument & _id , const MTPstring & _caption ) : vid ( _id ) , vcaption ( _caption ) { <nl> } <nl> <nl> class MTPDinputMediaDocument : public mtpData { <nl> <nl> class MTPDinputMediaVenue : public mtpData { <nl> public : <nl> - MTPDinputMediaVenue ( ) { <nl> - } <nl> + MTPDinputMediaVenue ( ) = default ; <nl> MTPDinputMediaVenue ( const MTPInputGeoPoint & _geo_point , const MTPstring & _title , const MTPstring & _address , const MTPstring & _provider , const MTPstring & _venue_id ) : vgeo_point ( _geo_point ) , vtitle ( _title ) , vaddress ( _address ) , vprovider ( _provider ) , vvenue_id ( _venue_id ) { <nl> } <nl> <nl> class MTPDinputMediaVenue : public mtpData { <nl> <nl> class MTPDinputMediaGifExternal : public mtpData { <nl> public : <nl> - MTPDinputMediaGifExternal ( ) { <nl> - } <nl> + MTPDinputMediaGifExternal ( ) = default ; <nl> MTPDinputMediaGifExternal ( const MTPstring & _url , const MTPstring & _q ) : vurl ( _url ) , vq ( _q ) { <nl> } <nl> <nl> class MTPDinputMediaGifExternal : public mtpData { <nl> <nl> class MTPDinputMediaPhotoExternal : public mtpData { <nl> public : <nl> - MTPDinputMediaPhotoExternal ( ) { <nl> - } <nl> + MTPDinputMediaPhotoExternal ( ) = default ; <nl> MTPDinputMediaPhotoExternal ( const MTPstring & _url , const MTPstring & _caption ) : vurl ( _url ) , vcaption ( _caption ) { <nl> } <nl> <nl> class MTPDinputMediaPhotoExternal : public mtpData { <nl> <nl> class MTPDinputMediaDocumentExternal : public mtpData { <nl> public : <nl> - MTPDinputMediaDocumentExternal ( ) { <nl> - } <nl> + MTPDinputMediaDocumentExternal ( ) = default ; <nl> MTPDinputMediaDocumentExternal ( const MTPstring & _url , const MTPstring & _caption ) : vurl ( _url ) , vcaption ( _caption ) { <nl> } <nl> <nl> class MTPDinputMediaDocumentExternal : public mtpData { <nl> <nl> class MTPDinputMediaGame : public mtpData { <nl> public : <nl> - MTPDinputMediaGame ( ) { <nl> - } <nl> + MTPDinputMediaGame ( ) = default ; <nl> MTPDinputMediaGame ( const MTPInputGame & _id ) : vid ( _id ) { <nl> } <nl> <nl> class MTPDinputMediaGame : public mtpData { <nl> <nl> class MTPDinputChatUploadedPhoto : public mtpData { <nl> public : <nl> - MTPDinputChatUploadedPhoto ( ) { <nl> - } <nl> + MTPDinputChatUploadedPhoto ( ) = default ; <nl> MTPDinputChatUploadedPhoto ( const MTPInputFile & _file ) : vfile ( _file ) { <nl> } <nl> <nl> class MTPDinputChatUploadedPhoto : public mtpData { <nl> <nl> class MTPDinputChatPhoto : public mtpData { <nl> public : <nl> - MTPDinputChatPhoto ( ) { <nl> - } <nl> + MTPDinputChatPhoto ( ) = default ; <nl> MTPDinputChatPhoto ( const MTPInputPhoto & _id ) : vid ( _id ) { <nl> } <nl> <nl> class MTPDinputChatPhoto : public mtpData { <nl> <nl> class MTPDinputGeoPoint : public mtpData { <nl> public : <nl> - MTPDinputGeoPoint ( ) { <nl> - } <nl> + MTPDinputGeoPoint ( ) = default ; <nl> MTPDinputGeoPoint ( const MTPdouble & _lat , const MTPdouble & _long ) : vlat ( _lat ) , vlong ( _long ) { <nl> } <nl> <nl> class MTPDinputGeoPoint : public mtpData { <nl> <nl> class MTPDinputPhoto : public mtpData { <nl> public : <nl> - MTPDinputPhoto ( ) { <nl> - } <nl> + MTPDinputPhoto ( ) = default ; <nl> MTPDinputPhoto ( const MTPlong & _id , const MTPlong & _access_hash ) : vid ( _id ) , vaccess_hash ( _access_hash ) { <nl> } <nl> <nl> class MTPDinputPhoto : public mtpData { <nl> <nl> class MTPDinputFileLocation : public mtpData { <nl> public : <nl> - MTPDinputFileLocation ( ) { <nl> - } <nl> + MTPDinputFileLocation ( ) = default ; <nl> MTPDinputFileLocation ( const MTPlong & _volume_id , MTPint _local_id , const MTPlong & _secret ) : vvolume_id ( _volume_id ) , vlocal_id ( _local_id ) , vsecret ( _secret ) { <nl> } <nl> <nl> class MTPDinputFileLocation : public mtpData { <nl> <nl> class MTPDinputEncryptedFileLocation : public mtpData { <nl> public : <nl> - MTPDinputEncryptedFileLocation ( ) { <nl> - } <nl> + MTPDinputEncryptedFileLocation ( ) = default ; <nl> MTPDinputEncryptedFileLocation ( const MTPlong & _id , const MTPlong & _access_hash ) : vid ( _id ) , vaccess_hash ( _access_hash ) { <nl> } <nl> <nl> class MTPDinputEncryptedFileLocation : public mtpData { <nl> <nl> class MTPDinputDocumentFileLocation : public mtpData { <nl> public : <nl> - MTPDinputDocumentFileLocation ( ) { <nl> - } <nl> + MTPDinputDocumentFileLocation ( ) = default ; <nl> MTPDinputDocumentFileLocation ( const MTPlong & _id , const MTPlong & _access_hash , MTPint _version ) : vid ( _id ) , vaccess_hash ( _access_hash ) , vversion ( _version ) { <nl> } <nl> <nl> class MTPDinputDocumentFileLocation : public mtpData { <nl> <nl> class MTPDinputAppEvent : public mtpData { <nl> public : <nl> - MTPDinputAppEvent ( ) { <nl> - } <nl> + MTPDinputAppEvent ( ) = default ; <nl> MTPDinputAppEvent ( const MTPdouble & _time , const MTPstring & _type , const MTPlong & _peer , const MTPstring & _data ) : vtime ( _time ) , vtype ( _type ) , vpeer ( _peer ) , vdata ( _data ) { <nl> } <nl> <nl> class MTPDinputAppEvent : public mtpData { <nl> <nl> class MTPDpeerUser : public mtpData { <nl> public : <nl> - MTPDpeerUser ( ) { <nl> - } <nl> + MTPDpeerUser ( ) = default ; <nl> MTPDpeerUser ( MTPint _user_id ) : vuser_id ( _user_id ) { <nl> } <nl> <nl> class MTPDpeerUser : public mtpData { <nl> <nl> class MTPDpeerChat : public mtpData { <nl> public : <nl> - MTPDpeerChat ( ) { <nl> - } <nl> + MTPDpeerChat ( ) = default ; <nl> MTPDpeerChat ( MTPint _chat_id ) : vchat_id ( _chat_id ) { <nl> } <nl> <nl> class MTPDpeerChat : public mtpData { <nl> <nl> class MTPDpeerChannel : public mtpData { <nl> public : <nl> - MTPDpeerChannel ( ) { <nl> - } <nl> + MTPDpeerChannel ( ) = default ; <nl> MTPDpeerChannel ( MTPint _channel_id ) : vchannel_id ( _channel_id ) { <nl> } <nl> <nl> class MTPDpeerChannel : public mtpData { <nl> <nl> class MTPDfileLocationUnavailable : public mtpData { <nl> public : <nl> - MTPDfileLocationUnavailable ( ) { <nl> - } <nl> + MTPDfileLocationUnavailable ( ) = default ; <nl> MTPDfileLocationUnavailable ( const MTPlong & _volume_id , MTPint _local_id , const MTPlong & _secret ) : vvolume_id ( _volume_id ) , vlocal_id ( _local_id ) , vsecret ( _secret ) { <nl> } <nl> <nl> class MTPDfileLocationUnavailable : public mtpData { <nl> <nl> class MTPDfileLocation : public mtpData { <nl> public : <nl> - MTPDfileLocation ( ) { <nl> - } <nl> + MTPDfileLocation ( ) = default ; <nl> MTPDfileLocation ( MTPint _dc_id , const MTPlong & _volume_id , MTPint _local_id , const MTPlong & _secret ) : vdc_id ( _dc_id ) , vvolume_id ( _volume_id ) , vlocal_id ( _local_id ) , vsecret ( _secret ) { <nl> } <nl> <nl> class MTPDfileLocation : public mtpData { <nl> <nl> class MTPDuserEmpty : public mtpData { <nl> public : <nl> - MTPDuserEmpty ( ) { <nl> - } <nl> + MTPDuserEmpty ( ) = default ; <nl> MTPDuserEmpty ( MTPint _id ) : vid ( _id ) { <nl> } <nl> <nl> class MTPDuser : public mtpData { <nl> bool has_restriction_reason ( ) const { return vflags . v & Flag : : f_restriction_reason ; } <nl> bool has_bot_inline_placeholder ( ) const { return vflags . v & Flag : : f_bot_inline_placeholder ; } <nl> <nl> - MTPDuser ( ) { <nl> - } <nl> + MTPDuser ( ) = default ; <nl> MTPDuser ( const MTPflags < MTPDuser : : Flags > & _flags , MTPint _id , const MTPlong & _access_hash , const MTPstring & _first_name , const MTPstring & _last_name , const MTPstring & _username , const MTPstring & _phone , const MTPUserProfilePhoto & _photo , const MTPUserStatus & _status , MTPint _bot_info_version , const MTPstring & _restriction_reason , const MTPstring & _bot_inline_placeholder ) : vflags ( _flags ) , vid ( _id ) , vaccess_hash ( _access_hash ) , vfirst_name ( _first_name ) , vlast_name ( _last_name ) , vusername ( _username ) , vphone ( _phone ) , vphoto ( _photo ) , vstatus ( _status ) , vbot_info_version ( _bot_info_version ) , vrestriction_reason ( _restriction_reason ) , vbot_inline_placeholder ( _bot_inline_placeholder ) { <nl> } <nl> <nl> class MTPDuser : public mtpData { <nl> <nl> class MTPDuserProfilePhoto : public mtpData { <nl> public : <nl> - MTPDuserProfilePhoto ( ) { <nl> - } <nl> + MTPDuserProfilePhoto ( ) = default ; <nl> MTPDuserProfilePhoto ( const MTPlong & _photo_id , const MTPFileLocation & _photo_small , const MTPFileLocation & _photo_big ) : vphoto_id ( _photo_id ) , vphoto_small ( _photo_small ) , vphoto_big ( _photo_big ) { <nl> } <nl> <nl> class MTPDuserProfilePhoto : public mtpData { <nl> <nl> class MTPDuserStatusOnline : public mtpData { <nl> public : <nl> - MTPDuserStatusOnline ( ) { <nl> - } <nl> + MTPDuserStatusOnline ( ) = default ; <nl> MTPDuserStatusOnline ( MTPint _expires ) : vexpires ( _expires ) { <nl> } <nl> <nl> class MTPDuserStatusOnline : public mtpData { <nl> <nl> class MTPDuserStatusOffline : public mtpData { <nl> public : <nl> - MTPDuserStatusOffline ( ) { <nl> - } <nl> + MTPDuserStatusOffline ( ) = default ; <nl> MTPDuserStatusOffline ( MTPint _was_online ) : vwas_online ( _was_online ) { <nl> } <nl> <nl> class MTPDuserStatusOffline : public mtpData { <nl> <nl> class MTPDchatEmpty : public mtpData { <nl> public : <nl> - MTPDchatEmpty ( ) { <nl> - } <nl> + MTPDchatEmpty ( ) = default ; <nl> MTPDchatEmpty ( MTPint _id ) : vid ( _id ) { <nl> } <nl> <nl> class MTPDchat : public mtpData { <nl> bool is_deactivated ( ) const { return vflags . v & Flag : : f_deactivated ; } <nl> bool has_migrated_to ( ) const { return vflags . v & Flag : : f_migrated_to ; } <nl> <nl> - MTPDchat ( ) { <nl> - } <nl> + MTPDchat ( ) = default ; <nl> MTPDchat ( const MTPflags < MTPDchat : : Flags > & _flags , MTPint _id , const MTPstring & _title , const MTPChatPhoto & _photo , MTPint _participants_count , MTPint _date , MTPint _version , const MTPInputChannel & _migrated_to ) : vflags ( _flags ) , vid ( _id ) , vtitle ( _title ) , vphoto ( _photo ) , vparticipants_count ( _participants_count ) , vdate ( _date ) , vversion ( _version ) , vmigrated_to ( _migrated_to ) { <nl> } <nl> <nl> class MTPDchat : public mtpData { <nl> <nl> class MTPDchatForbidden : public mtpData { <nl> public : <nl> - MTPDchatForbidden ( ) { <nl> - } <nl> + MTPDchatForbidden ( ) = default ; <nl> MTPDchatForbidden ( MTPint _id , const MTPstring & _title ) : vid ( _id ) , vtitle ( _title ) { <nl> } <nl> <nl> class MTPDchannel : public mtpData { <nl> bool has_username ( ) const { return vflags . v & Flag : : f_username ; } <nl> bool has_restriction_reason ( ) const { return vflags . v & Flag : : f_restriction_reason ; } <nl> <nl> - MTPDchannel ( ) { <nl> - } <nl> + MTPDchannel ( ) = default ; <nl> MTPDchannel ( const MTPflags < MTPDchannel : : Flags > & _flags , MTPint _id , const MTPlong & _access_hash , const MTPstring & _title , const MTPstring & _username , const MTPChatPhoto & _photo , MTPint _date , MTPint _version , const MTPstring & _restriction_reason ) : vflags ( _flags ) , vid ( _id ) , vaccess_hash ( _access_hash ) , vtitle ( _title ) , vusername ( _username ) , vphoto ( _photo ) , vdate ( _date ) , vversion ( _version ) , vrestriction_reason ( _restriction_reason ) { <nl> } <nl> <nl> class MTPDchannelForbidden : public mtpData { <nl> bool is_broadcast ( ) const { return vflags . v & Flag : : f_broadcast ; } <nl> bool is_megagroup ( ) const { return vflags . v & Flag : : f_megagroup ; } <nl> <nl> - MTPDchannelForbidden ( ) { <nl> - } <nl> + MTPDchannelForbidden ( ) = default ; <nl> MTPDchannelForbidden ( const MTPflags < MTPDchannelForbidden : : Flags > & _flags , MTPint _id , const MTPlong & _access_hash , const MTPstring & _title ) : vflags ( _flags ) , vid ( _id ) , vaccess_hash ( _access_hash ) , vtitle ( _title ) { <nl> } <nl> <nl> class MTPDchannelForbidden : public mtpData { <nl> <nl> class MTPDchatFull : public mtpData { <nl> public : <nl> - MTPDchatFull ( ) { <nl> - } <nl> + MTPDchatFull ( ) = default ; <nl> MTPDchatFull ( MTPint _id , const MTPChatParticipants & _participants , const MTPPhoto & _chat_photo , const MTPPeerNotifySettings & _notify_settings , const MTPExportedChatInvite & _exported_invite , const MTPVector < MTPBotInfo > & _bot_info ) : vid ( _id ) , vparticipants ( _participants ) , vchat_photo ( _chat_photo ) , vnotify_settings ( _notify_settings ) , vexported_invite ( _exported_invite ) , vbot_info ( _bot_info ) { <nl> } <nl> <nl> class MTPDchannelFull : public mtpData { <nl> bool has_migrated_from_max_id ( ) const { return vflags . v & Flag : : f_migrated_from_max_id ; } <nl> bool has_pinned_msg_id ( ) const { return vflags . v & Flag : : f_pinned_msg_id ; } <nl> <nl> - MTPDchannelFull ( ) { <nl> - } <nl> + MTPDchannelFull ( ) = default ; <nl> MTPDchannelFull ( const MTPflags < MTPDchannelFull : : Flags > & _flags , MTPint _id , const MTPstring & _about , MTPint _participants_count , MTPint _admins_count , MTPint _kicked_count , MTPint _read_inbox_max_id , MTPint _read_outbox_max_id , MTPint _unread_count , const MTPPhoto & _chat_photo , const MTPPeerNotifySettings & _notify_settings , const MTPExportedChatInvite & _exported_invite , const MTPVector < MTPBotInfo > & _bot_info , MTPint _migrated_from_chat_id , MTPint _migrated_from_max_id , MTPint _pinned_msg_id ) : vflags ( _flags ) , vid ( _id ) , vabout ( _about ) , vparticipants_count ( _participants_count ) , vadmins_count ( _admins_count ) , vkicked_count ( _kicked_count ) , vread_inbox_max_id ( _read_inbox_max_id ) , vread_outbox_max_id ( _read_outbox_max_id ) , vunread_count ( _unread_count ) , vchat_photo ( _chat_photo ) , vnotify_settings ( _notify_settings ) , vexported_invite ( _exported_invite ) , vbot_info ( _bot_info ) , vmigrated_from_chat_id ( _migrated_from_chat_id ) , vmigrated_from_max_id ( _migrated_from_max_id ) , vpinned_msg_id ( _pinned_msg_id ) { <nl> } <nl> <nl> class MTPDchannelFull : public mtpData { <nl> <nl> class MTPDchatParticipant : public mtpData { <nl> public : <nl> - MTPDchatParticipant ( ) { <nl> - } <nl> + MTPDchatParticipant ( ) = default ; <nl> MTPDchatParticipant ( MTPint _user_id , MTPint _inviter_id , MTPint _date ) : vuser_id ( _user_id ) , vinviter_id ( _inviter_id ) , vdate ( _date ) { <nl> } <nl> <nl> class MTPDchatParticipant : public mtpData { <nl> <nl> class MTPDchatParticipantCreator : public mtpData { <nl> public : <nl> - MTPDchatParticipantCreator ( ) { <nl> - } <nl> + MTPDchatParticipantCreator ( ) = default ; <nl> MTPDchatParticipantCreator ( MTPint _user_id ) : vuser_id ( _user_id ) { <nl> } <nl> <nl> class MTPDchatParticipantCreator : public mtpData { <nl> <nl> class MTPDchatParticipantAdmin : public mtpData { <nl> public : <nl> - MTPDchatParticipantAdmin ( ) { <nl> - } <nl> + MTPDchatParticipantAdmin ( ) = default ; <nl> MTPDchatParticipantAdmin ( MTPint _user_id , MTPint _inviter_id , MTPint _date ) : vuser_id ( _user_id ) , vinviter_id ( _inviter_id ) , vdate ( _date ) { <nl> } <nl> <nl> class MTPDchatParticipantsForbidden : public mtpData { <nl> <nl> bool has_self_participant ( ) const { return vflags . v & Flag : : f_self_participant ; } <nl> <nl> - MTPDchatParticipantsForbidden ( ) { <nl> - } <nl> + MTPDchatParticipantsForbidden ( ) = default ; <nl> MTPDchatParticipantsForbidden ( const MTPflags < MTPDchatParticipantsForbidden : : Flags > & _flags , MTPint _chat_id , const MTPChatParticipant & _self_participant ) : vflags ( _flags ) , vchat_id ( _chat_id ) , vself_participant ( _self_participant ) { <nl> } <nl> <nl> class MTPDchatParticipantsForbidden : public mtpData { <nl> <nl> class MTPDchatParticipants : public mtpData { <nl> public : <nl> - MTPDchatParticipants ( ) { <nl> - } <nl> + MTPDchatParticipants ( ) = default ; <nl> MTPDchatParticipants ( MTPint _chat_id , const MTPVector < MTPChatParticipant > & _participants , MTPint _version ) : vchat_id ( _chat_id ) , vparticipants ( _participants ) , vversion ( _version ) { <nl> } <nl> <nl> class MTPDchatParticipants : public mtpData { <nl> <nl> class MTPDchatPhoto : public mtpData { <nl> public : <nl> - MTPDchatPhoto ( ) { <nl> - } <nl> + MTPDchatPhoto ( ) = default ; <nl> MTPDchatPhoto ( const MTPFileLocation & _photo_small , const MTPFileLocation & _photo_big ) : vphoto_small ( _photo_small ) , vphoto_big ( _photo_big ) { <nl> } <nl> <nl> class MTPDchatPhoto : public mtpData { <nl> <nl> class MTPDmessageEmpty : public mtpData { <nl> public : <nl> - MTPDmessageEmpty ( ) { <nl> - } <nl> + MTPDmessageEmpty ( ) = default ; <nl> MTPDmessageEmpty ( MTPint _id ) : vid ( _id ) { <nl> } <nl> <nl> class MTPDmessage : public mtpData { <nl> bool has_views ( ) const { return vflags . v & Flag : : f_views ; } <nl> bool has_edit_date ( ) const { return vflags . v & Flag : : f_edit_date ; } <nl> <nl> - MTPDmessage ( ) { <nl> - } <nl> + MTPDmessage ( ) = default ; <nl> MTPDmessage ( const MTPflags < MTPDmessage : : Flags > & _flags , MTPint _id , MTPint _from_id , const MTPPeer & _to_id , const MTPMessageFwdHeader & _fwd_from , MTPint _via_bot_id , MTPint _reply_to_msg_id , MTPint _date , const MTPstring & _message , const MTPMessageMedia & _media , const MTPReplyMarkup & _reply_markup , const MTPVector < MTPMessageEntity > & _entities , MTPint _views , MTPint _edit_date ) : vflags ( _flags ) , vid ( _id ) , vfrom_id ( _from_id ) , vto_id ( _to_id ) , vfwd_from ( _fwd_from ) , vvia_bot_id ( _via_bot_id ) , vreply_to_msg_id ( _reply_to_msg_id ) , vdate ( _date ) , vmessage ( _message ) , vmedia ( _media ) , vreply_markup ( _reply_markup ) , ventities ( _entities ) , vviews ( _views ) , vedit_date ( _edit_date ) { <nl> } <nl> <nl> class MTPDmessageService : public mtpData { <nl> bool has_from_id ( ) const { return vflags . v & Flag : : f_from_id ; } <nl> bool has_reply_to_msg_id ( ) const { return vflags . v & Flag : : f_reply_to_msg_id ; } <nl> <nl> - MTPDmessageService ( ) { <nl> - } <nl> + MTPDmessageService ( ) = default ; <nl> MTPDmessageService ( const MTPflags < MTPDmessageService : : Flags > & _flags , MTPint _id , MTPint _from_id , const MTPPeer & _to_id , MTPint _reply_to_msg_id , MTPint _date , const MTPMessageAction & _action ) : vflags ( _flags ) , vid ( _id ) , vfrom_id ( _from_id ) , vto_id ( _to_id ) , vreply_to_msg_id ( _reply_to_msg_id ) , vdate ( _date ) , vaction ( _action ) { <nl> } <nl> <nl> class MTPDmessageService : public mtpData { <nl> <nl> class MTPDmessageMediaPhoto : public mtpData { <nl> public : <nl> - MTPDmessageMediaPhoto ( ) { <nl> - } <nl> + MTPDmessageMediaPhoto ( ) = default ; <nl> MTPDmessageMediaPhoto ( const MTPPhoto & _photo , const MTPstring & _caption ) : vphoto ( _photo ) , vcaption ( _caption ) { <nl> } <nl> <nl> class MTPDmessageMediaPhoto : public mtpData { <nl> <nl> class MTPDmessageMediaGeo : public mtpData { <nl> public : <nl> - MTPDmessageMediaGeo ( ) { <nl> - } <nl> + MTPDmessageMediaGeo ( ) = default ; <nl> MTPDmessageMediaGeo ( const MTPGeoPoint & _geo ) : vgeo ( _geo ) { <nl> } <nl> <nl> class MTPDmessageMediaGeo : public mtpData { <nl> <nl> class MTPDmessageMediaContact : public mtpData { <nl> public : <nl> - MTPDmessageMediaContact ( ) { <nl> - } <nl> + MTPDmessageMediaContact ( ) = default ; <nl> MTPDmessageMediaContact ( const MTPstring & _phone_number , const MTPstring & _first_name , const MTPstring & _last_name , MTPint _user_id ) : vphone_number ( _phone_number ) , vfirst_name ( _first_name ) , vlast_name ( _last_name ) , vuser_id ( _user_id ) { <nl> } <nl> <nl> class MTPDmessageMediaContact : public mtpData { <nl> <nl> class MTPDmessageMediaDocument : public mtpData { <nl> public : <nl> - MTPDmessageMediaDocument ( ) { <nl> - } <nl> + MTPDmessageMediaDocument ( ) = default ; <nl> MTPDmessageMediaDocument ( const MTPDocument & _document , const MTPstring & _caption ) : vdocument ( _document ) , vcaption ( _caption ) { <nl> } <nl> <nl> class MTPDmessageMediaDocument : public mtpData { <nl> <nl> class MTPDmessageMediaWebPage : public mtpData { <nl> public : <nl> - MTPDmessageMediaWebPage ( ) { <nl> - } <nl> + MTPDmessageMediaWebPage ( ) = default ; <nl> MTPDmessageMediaWebPage ( const MTPWebPage & _webpage ) : vwebpage ( _webpage ) { <nl> } <nl> <nl> class MTPDmessageMediaWebPage : public mtpData { <nl> <nl> class MTPDmessageMediaVenue : public mtpData { <nl> public : <nl> - MTPDmessageMediaVenue ( ) { <nl> - } <nl> + MTPDmessageMediaVenue ( ) = default ; <nl> MTPDmessageMediaVenue ( const MTPGeoPoint & _geo , const MTPstring & _title , const MTPstring & _address , const MTPstring & _provider , const MTPstring & _venue_id ) : vgeo ( _geo ) , vtitle ( _title ) , vaddress ( _address ) , vprovider ( _provider ) , vvenue_id ( _venue_id ) { <nl> } <nl> <nl> class MTPDmessageMediaVenue : public mtpData { <nl> <nl> class MTPDmessageMediaGame : public mtpData { <nl> public : <nl> - MTPDmessageMediaGame ( ) { <nl> - } <nl> + MTPDmessageMediaGame ( ) = default ; <nl> MTPDmessageMediaGame ( const MTPGame & _game ) : vgame ( _game ) { <nl> } <nl> <nl> class MTPDmessageMediaGame : public mtpData { <nl> <nl> class MTPDmessageActionChatCreate : public mtpData { <nl> public : <nl> - MTPDmessageActionChatCreate ( ) { <nl> - } <nl> + MTPDmessageActionChatCreate ( ) = default ; <nl> MTPDmessageActionChatCreate ( const MTPstring & _title , const MTPVector < MTPint > & _users ) : vtitle ( _title ) , vusers ( _users ) { <nl> } <nl> <nl> class MTPDmessageActionChatCreate : public mtpData { <nl> <nl> class MTPDmessageActionChatEditTitle : public mtpData { <nl> public : <nl> - MTPDmessageActionChatEditTitle ( ) { <nl> - } <nl> + MTPDmessageActionChatEditTitle ( ) = default ; <nl> MTPDmessageActionChatEditTitle ( const MTPstring & _title ) : vtitle ( _title ) { <nl> } <nl> <nl> class MTPDmessageActionChatEditTitle : public mtpData { <nl> <nl> class MTPDmessageActionChatEditPhoto : public mtpData { <nl> public : <nl> - MTPDmessageActionChatEditPhoto ( ) { <nl> - } <nl> + MTPDmessageActionChatEditPhoto ( ) = default ; <nl> MTPDmessageActionChatEditPhoto ( const MTPPhoto & _photo ) : vphoto ( _photo ) { <nl> } <nl> <nl> class MTPDmessageActionChatEditPhoto : public mtpData { <nl> <nl> class MTPDmessageActionChatAddUser : public mtpData { <nl> public : <nl> - MTPDmessageActionChatAddUser ( ) { <nl> - } <nl> + MTPDmessageActionChatAddUser ( ) = default ; <nl> MTPDmessageActionChatAddUser ( const MTPVector < MTPint > & _users ) : vusers ( _users ) { <nl> } <nl> <nl> class MTPDmessageActionChatAddUser : public mtpData { <nl> <nl> class MTPDmessageActionChatDeleteUser : public mtpData { <nl> public : <nl> - MTPDmessageActionChatDeleteUser ( ) { <nl> - } <nl> + MTPDmessageActionChatDeleteUser ( ) = default ; <nl> MTPDmessageActionChatDeleteUser ( MTPint _user_id ) : vuser_id ( _user_id ) { <nl> } <nl> <nl> class MTPDmessageActionChatDeleteUser : public mtpData { <nl> <nl> class MTPDmessageActionChatJoinedByLink : public mtpData { <nl> public : <nl> - MTPDmessageActionChatJoinedByLink ( ) { <nl> - } <nl> + MTPDmessageActionChatJoinedByLink ( ) = default ; <nl> MTPDmessageActionChatJoinedByLink ( MTPint _inviter_id ) : vinviter_id ( _inviter_id ) { <nl> } <nl> <nl> class MTPDmessageActionChatJoinedByLink : public mtpData { <nl> <nl> class MTPDmessageActionChannelCreate : public mtpData { <nl> public : <nl> - MTPDmessageActionChannelCreate ( ) { <nl> - } <nl> + MTPDmessageActionChannelCreate ( ) = default ; <nl> MTPDmessageActionChannelCreate ( const MTPstring & _title ) : vtitle ( _title ) { <nl> } <nl> <nl> class MTPDmessageActionChannelCreate : public mtpData { <nl> <nl> class MTPDmessageActionChatMigrateTo : public mtpData { <nl> public : <nl> - MTPDmessageActionChatMigrateTo ( ) { <nl> - } <nl> + MTPDmessageActionChatMigrateTo ( ) = default ; <nl> MTPDmessageActionChatMigrateTo ( MTPint _channel_id ) : vchannel_id ( _channel_id ) { <nl> } <nl> <nl> class MTPDmessageActionChatMigrateTo : public mtpData { <nl> <nl> class MTPDmessageActionChannelMigrateFrom : public mtpData { <nl> public : <nl> - MTPDmessageActionChannelMigrateFrom ( ) { <nl> - } <nl> + MTPDmessageActionChannelMigrateFrom ( ) = default ; <nl> MTPDmessageActionChannelMigrateFrom ( const MTPstring & _title , MTPint _chat_id ) : vtitle ( _title ) , vchat_id ( _chat_id ) { <nl> } <nl> <nl> class MTPDmessageActionChannelMigrateFrom : public mtpData { <nl> <nl> class MTPDmessageActionGameScore : public mtpData { <nl> public : <nl> - MTPDmessageActionGameScore ( ) { <nl> - } <nl> + MTPDmessageActionGameScore ( ) = default ; <nl> MTPDmessageActionGameScore ( const MTPlong & _game_id , MTPint _score ) : vgame_id ( _game_id ) , vscore ( _score ) { <nl> } <nl> <nl> class MTPDmessageActionPhoneCall : public mtpData { <nl> bool has_reason ( ) const { return vflags . v & Flag : : f_reason ; } <nl> bool has_duration ( ) const { return vflags . v & Flag : : f_duration ; } <nl> <nl> - MTPDmessageActionPhoneCall ( ) { <nl> - } <nl> + MTPDmessageActionPhoneCall ( ) = default ; <nl> MTPDmessageActionPhoneCall ( const MTPflags < MTPDmessageActionPhoneCall : : Flags > & _flags , const MTPlong & _call_id , const MTPPhoneCallDiscardReason & _reason , MTPint _duration ) : vflags ( _flags ) , vcall_id ( _call_id ) , vreason ( _reason ) , vduration ( _duration ) { <nl> } <nl> <nl> class MTPDdialog : public mtpData { <nl> bool has_pts ( ) const { return vflags . v & Flag : : f_pts ; } <nl> bool has_draft ( ) const { return vflags . v & Flag : : f_draft ; } <nl> <nl> - MTPDdialog ( ) { <nl> - } <nl> + MTPDdialog ( ) = default ; <nl> MTPDdialog ( const MTPflags < MTPDdialog : : Flags > & _flags , const MTPPeer & _peer , MTPint _top_message , MTPint _read_inbox_max_id , MTPint _read_outbox_max_id , MTPint _unread_count , const MTPPeerNotifySettings & _notify_settings , MTPint _pts , const MTPDraftMessage & _draft ) : vflags ( _flags ) , vpeer ( _peer ) , vtop_message ( _top_message ) , vread_inbox_max_id ( _read_inbox_max_id ) , vread_outbox_max_id ( _read_outbox_max_id ) , vunread_count ( _unread_count ) , vnotify_settings ( _notify_settings ) , vpts ( _pts ) , vdraft ( _draft ) { <nl> } <nl> <nl> class MTPDdialog : public mtpData { <nl> <nl> class MTPDphotoEmpty : public mtpData { <nl> public : <nl> - MTPDphotoEmpty ( ) { <nl> - } <nl> + MTPDphotoEmpty ( ) = default ; <nl> MTPDphotoEmpty ( const MTPlong & _id ) : vid ( _id ) { <nl> } <nl> <nl> class MTPDphoto : public mtpData { <nl> <nl> bool is_has_stickers ( ) const { return vflags . v & Flag : : f_has_stickers ; } <nl> <nl> - MTPDphoto ( ) { <nl> - } <nl> + MTPDphoto ( ) = default ; <nl> MTPDphoto ( const MTPflags < MTPDphoto : : Flags > & _flags , const MTPlong & _id , const MTPlong & _access_hash , MTPint _date , const MTPVector < MTPPhotoSize > & _sizes ) : vflags ( _flags ) , vid ( _id ) , vaccess_hash ( _access_hash ) , vdate ( _date ) , vsizes ( _sizes ) { <nl> } <nl> <nl> class MTPDphoto : public mtpData { <nl> <nl> class MTPDphotoSizeEmpty : public mtpData { <nl> public : <nl> - MTPDphotoSizeEmpty ( ) { <nl> - } <nl> + MTPDphotoSizeEmpty ( ) = default ; <nl> MTPDphotoSizeEmpty ( const MTPstring & _type ) : vtype ( _type ) { <nl> } <nl> <nl> class MTPDphotoSizeEmpty : public mtpData { <nl> <nl> class MTPDphotoSize : public mtpData { <nl> public : <nl> - MTPDphotoSize ( ) { <nl> - } <nl> + MTPDphotoSize ( ) = default ; <nl> MTPDphotoSize ( const MTPstring & _type , const MTPFileLocation & _location , MTPint _w , MTPint _h , MTPint _size ) : vtype ( _type ) , vlocation ( _location ) , vw ( _w ) , vh ( _h ) , vsize ( _size ) { <nl> } <nl> <nl> class MTPDphotoSize : public mtpData { <nl> <nl> class MTPDphotoCachedSize : public mtpData { <nl> public : <nl> - MTPDphotoCachedSize ( ) { <nl> - } <nl> + MTPDphotoCachedSize ( ) = default ; <nl> MTPDphotoCachedSize ( const MTPstring & _type , const MTPFileLocation & _location , MTPint _w , MTPint _h , const MTPbytes & _bytes ) : vtype ( _type ) , vlocation ( _location ) , vw ( _w ) , vh ( _h ) , vbytes ( _bytes ) { <nl> } <nl> <nl> class MTPDphotoCachedSize : public mtpData { <nl> <nl> class MTPDgeoPoint : public mtpData { <nl> public : <nl> - MTPDgeoPoint ( ) { <nl> - } <nl> + MTPDgeoPoint ( ) = default ; <nl> MTPDgeoPoint ( const MTPdouble & _long , const MTPdouble & _lat ) : vlong ( _long ) , vlat ( _lat ) { <nl> } <nl> <nl> class MTPDgeoPoint : public mtpData { <nl> <nl> class MTPDauth_checkedPhone : public mtpData { <nl> public : <nl> - MTPDauth_checkedPhone ( ) { <nl> - } <nl> + MTPDauth_checkedPhone ( ) = default ; <nl> MTPDauth_checkedPhone ( MTPBool _phone_registered ) : vphone_registered ( _phone_registered ) { <nl> } <nl> <nl> class MTPDauth_sentCode : public mtpData { <nl> bool has_next_type ( ) const { return vflags . v & Flag : : f_next_type ; } <nl> bool has_timeout ( ) const { return vflags . v & Flag : : f_timeout ; } <nl> <nl> - MTPDauth_sentCode ( ) { <nl> - } <nl> + MTPDauth_sentCode ( ) = default ; <nl> MTPDauth_sentCode ( const MTPflags < MTPDauth_sentCode : : Flags > & _flags , const MTPauth_SentCodeType & _type , const MTPstring & _phone_code_hash , const MTPauth_CodeType & _next_type , MTPint _timeout ) : vflags ( _flags ) , vtype ( _type ) , vphone_code_hash ( _phone_code_hash ) , vnext_type ( _next_type ) , vtimeout ( _timeout ) { <nl> } <nl> <nl> class MTPDauth_authorization : public mtpData { <nl> <nl> bool has_tmp_sessions ( ) const { return vflags . v & Flag : : f_tmp_sessions ; } <nl> <nl> - MTPDauth_authorization ( ) { <nl> - } <nl> + MTPDauth_authorization ( ) = default ; <nl> MTPDauth_authorization ( const MTPflags < MTPDauth_authorization : : Flags > & _flags , MTPint _tmp_sessions , const MTPUser & _user ) : vflags ( _flags ) , vtmp_sessions ( _tmp_sessions ) , vuser ( _user ) { <nl> } <nl> <nl> class MTPDauth_authorization : public mtpData { <nl> <nl> class MTPDauth_exportedAuthorization : public mtpData { <nl> public : <nl> - MTPDauth_exportedAuthorization ( ) { <nl> - } <nl> + MTPDauth_exportedAuthorization ( ) = default ; <nl> MTPDauth_exportedAuthorization ( MTPint _id , const MTPbytes & _bytes ) : vid ( _id ) , vbytes ( _bytes ) { <nl> } <nl> <nl> class MTPDauth_exportedAuthorization : public mtpData { <nl> <nl> class MTPDinputNotifyPeer : public mtpData { <nl> public : <nl> - MTPDinputNotifyPeer ( ) { <nl> - } <nl> + MTPDinputNotifyPeer ( ) = default ; <nl> MTPDinputNotifyPeer ( const MTPInputPeer & _peer ) : vpeer ( _peer ) { <nl> } <nl> <nl> class MTPDinputPeerNotifySettings : public mtpData { <nl> bool is_show_previews ( ) const { return vflags . v & Flag : : f_show_previews ; } <nl> bool is_silent ( ) const { return vflags . v & Flag : : f_silent ; } <nl> <nl> - MTPDinputPeerNotifySettings ( ) { <nl> - } <nl> + MTPDinputPeerNotifySettings ( ) = default ; <nl> MTPDinputPeerNotifySettings ( const MTPflags < MTPDinputPeerNotifySettings : : Flags > & _flags , MTPint _mute_until , const MTPstring & _sound ) : vflags ( _flags ) , vmute_until ( _mute_until ) , vsound ( _sound ) { <nl> } <nl> <nl> class MTPDpeerNotifySettings : public mtpData { <nl> bool is_show_previews ( ) const { return vflags . v & Flag : : f_show_previews ; } <nl> bool is_silent ( ) const { return vflags . v & Flag : : f_silent ; } <nl> <nl> - MTPDpeerNotifySettings ( ) { <nl> - } <nl> + MTPDpeerNotifySettings ( ) = default ; <nl> MTPDpeerNotifySettings ( const MTPflags < MTPDpeerNotifySettings : : Flags > & _flags , MTPint _mute_until , const MTPstring & _sound ) : vflags ( _flags ) , vmute_until ( _mute_until ) , vsound ( _sound ) { <nl> } <nl> <nl> class MTPDpeerSettings : public mtpData { <nl> <nl> bool is_report_spam ( ) const { return vflags . v & Flag : : f_report_spam ; } <nl> <nl> - MTPDpeerSettings ( ) { <nl> - } <nl> + MTPDpeerSettings ( ) = default ; <nl> MTPDpeerSettings ( const MTPflags < MTPDpeerSettings : : Flags > & _flags ) : vflags ( _flags ) { <nl> } <nl> <nl> class MTPDpeerSettings : public mtpData { <nl> <nl> class MTPDwallPaper : public mtpData { <nl> public : <nl> - MTPDwallPaper ( ) { <nl> - } <nl> + MTPDwallPaper ( ) = default ; <nl> MTPDwallPaper ( MTPint _id , const MTPstring & _title , const MTPVector < MTPPhotoSize > & _sizes , MTPint _color ) : vid ( _id ) , vtitle ( _title ) , vsizes ( _sizes ) , vcolor ( _color ) { <nl> } <nl> <nl> class MTPDwallPaper : public mtpData { <nl> <nl> class MTPDwallPaperSolid : public mtpData { <nl> public : <nl> - MTPDwallPaperSolid ( ) { <nl> - } <nl> + MTPDwallPaperSolid ( ) = default ; <nl> MTPDwallPaperSolid ( MTPint _id , const MTPstring & _title , MTPint _bg_color , MTPint _color ) : vid ( _id ) , vtitle ( _title ) , vbg_color ( _bg_color ) , vcolor ( _color ) { <nl> } <nl> <nl> class MTPDwallPaperSolid : public mtpData { <nl> <nl> class MTPDinputReportReasonOther : public mtpData { <nl> public : <nl> - MTPDinputReportReasonOther ( ) { <nl> - } <nl> + MTPDinputReportReasonOther ( ) = default ; <nl> MTPDinputReportReasonOther ( const MTPstring & _text ) : vtext ( _text ) { <nl> } <nl> <nl> class MTPDuserFull : public mtpData { <nl> bool has_profile_photo ( ) const { return vflags . v & Flag : : f_profile_photo ; } <nl> bool has_bot_info ( ) const { return vflags . v & Flag : : f_bot_info ; } <nl> <nl> - MTPDuserFull ( ) { <nl> - } <nl> + MTPDuserFull ( ) = default ; <nl> MTPDuserFull ( const MTPflags < MTPDuserFull : : Flags > & _flags , const MTPUser & _user , const MTPstring & _about , const MTPcontacts_Link & _link , const MTPPhoto & _profile_photo , const MTPPeerNotifySettings & _notify_settings , const MTPBotInfo & _bot_info , MTPint _common_chats_count ) : vflags ( _flags ) , vuser ( _user ) , vabout ( _about ) , vlink ( _link ) , vprofile_photo ( _profile_photo ) , vnotify_settings ( _notify_settings ) , vbot_info ( _bot_info ) , vcommon_chats_count ( _common_chats_count ) { <nl> } <nl> <nl> class MTPDuserFull : public mtpData { <nl> <nl> class MTPDcontact : public mtpData { <nl> public : <nl> - MTPDcontact ( ) { <nl> - } <nl> + MTPDcontact ( ) = default ; <nl> MTPDcontact ( MTPint _user_id , MTPBool _mutual ) : vuser_id ( _user_id ) , vmutual ( _mutual ) { <nl> } <nl> <nl> class MTPDcontact : public mtpData { <nl> <nl> class MTPDimportedContact : public mtpData { <nl> public : <nl> - MTPDimportedContact ( ) { <nl> - } <nl> + MTPDimportedContact ( ) = default ; <nl> MTPDimportedContact ( MTPint _user_id , const MTPlong & _client_id ) : vuser_id ( _user_id ) , vclient_id ( _client_id ) { <nl> } <nl> <nl> class MTPDimportedContact : public mtpData { <nl> <nl> class MTPDcontactBlocked : public mtpData { <nl> public : <nl> - MTPDcontactBlocked ( ) { <nl> - } <nl> + MTPDcontactBlocked ( ) = default ; <nl> MTPDcontactBlocked ( MTPint _user_id , MTPint _date ) : vuser_id ( _user_id ) , vdate ( _date ) { <nl> } <nl> <nl> class MTPDcontactBlocked : public mtpData { <nl> <nl> class MTPDcontactStatus : public mtpData { <nl> public : <nl> - MTPDcontactStatus ( ) { <nl> - } <nl> + MTPDcontactStatus ( ) = default ; <nl> MTPDcontactStatus ( MTPint _user_id , const MTPUserStatus & _status ) : vuser_id ( _user_id ) , vstatus ( _status ) { <nl> } <nl> <nl> class MTPDcontactStatus : public mtpData { <nl> <nl> class MTPDcontacts_link : public mtpData { <nl> public : <nl> - MTPDcontacts_link ( ) { <nl> - } <nl> + MTPDcontacts_link ( ) = default ; <nl> MTPDcontacts_link ( const MTPContactLink & _my_link , const MTPContactLink & _foreign_link , const MTPUser & _user ) : vmy_link ( _my_link ) , vforeign_link ( _foreign_link ) , vuser ( _user ) { <nl> } <nl> <nl> class MTPDcontacts_link : public mtpData { <nl> <nl> class MTPDcontacts_contacts : public mtpData { <nl> public : <nl> - MTPDcontacts_contacts ( ) { <nl> - } <nl> + MTPDcontacts_contacts ( ) = default ; <nl> MTPDcontacts_contacts ( const MTPVector < MTPContact > & _contacts , const MTPVector < MTPUser > & _users ) : vcontacts ( _contacts ) , vusers ( _users ) { <nl> } <nl> <nl> class MTPDcontacts_contacts : public mtpData { <nl> <nl> class MTPDcontacts_importedContacts : public mtpData { <nl> public : <nl> - MTPDcontacts_importedContacts ( ) { <nl> - } <nl> + MTPDcontacts_importedContacts ( ) = default ; <nl> MTPDcontacts_importedContacts ( const MTPVector < MTPImportedContact > & _imported , const MTPVector < MTPlong > & _retry_contacts , const MTPVector < MTPUser > & _users ) : vimported ( _imported ) , vretry_contacts ( _retry_contacts ) , vusers ( _users ) { <nl> } <nl> <nl> class MTPDcontacts_importedContacts : public mtpData { <nl> <nl> class MTPDcontacts_blocked : public mtpData { <nl> public : <nl> - MTPDcontacts_blocked ( ) { <nl> - } <nl> + MTPDcontacts_blocked ( ) = default ; <nl> MTPDcontacts_blocked ( const MTPVector < MTPContactBlocked > & _blocked , const MTPVector < MTPUser > & _users ) : vblocked ( _blocked ) , vusers ( _users ) { <nl> } <nl> <nl> class MTPDcontacts_blocked : public mtpData { <nl> <nl> class MTPDcontacts_blockedSlice : public mtpData { <nl> public : <nl> - MTPDcontacts_blockedSlice ( ) { <nl> - } <nl> + MTPDcontacts_blockedSlice ( ) = default ; <nl> MTPDcontacts_blockedSlice ( MTPint _count , const MTPVector < MTPContactBlocked > & _blocked , const MTPVector < MTPUser > & _users ) : vcount ( _count ) , vblocked ( _blocked ) , vusers ( _users ) { <nl> } <nl> <nl> class MTPDcontacts_blockedSlice : public mtpData { <nl> <nl> class MTPDmessages_dialogs : public mtpData { <nl> public : <nl> - MTPDmessages_dialogs ( ) { <nl> - } <nl> + MTPDmessages_dialogs ( ) = default ; <nl> MTPDmessages_dialogs ( const MTPVector < MTPDialog > & _dialogs , const MTPVector < MTPMessage > & _messages , const MTPVector < MTPChat > & _chats , const MTPVector < MTPUser > & _users ) : vdialogs ( _dialogs ) , vmessages ( _messages ) , vchats ( _chats ) , vusers ( _users ) { <nl> } <nl> <nl> class MTPDmessages_dialogs : public mtpData { <nl> <nl> class MTPDmessages_dialogsSlice : public mtpData { <nl> public : <nl> - MTPDmessages_dialogsSlice ( ) { <nl> - } <nl> + MTPDmessages_dialogsSlice ( ) = default ; <nl> MTPDmessages_dialogsSlice ( MTPint _count , const MTPVector < MTPDialog > & _dialogs , const MTPVector < MTPMessage > & _messages , const MTPVector < MTPChat > & _chats , const MTPVector < MTPUser > & _users ) : vcount ( _count ) , vdialogs ( _dialogs ) , vmessages ( _messages ) , vchats ( _chats ) , vusers ( _users ) { <nl> } <nl> <nl> class MTPDmessages_dialogsSlice : public mtpData { <nl> <nl> class MTPDmessages_messages : public mtpData { <nl> public : <nl> - MTPDmessages_messages ( ) { <nl> - } <nl> + MTPDmessages_messages ( ) = default ; <nl> MTPDmessages_messages ( const MTPVector < MTPMessage > & _messages , const MTPVector < MTPChat > & _chats , const MTPVector < MTPUser > & _users ) : vmessages ( _messages ) , vchats ( _chats ) , vusers ( _users ) { <nl> } <nl> <nl> class MTPDmessages_messages : public mtpData { <nl> <nl> class MTPDmessages_messagesSlice : public mtpData { <nl> public : <nl> - MTPDmessages_messagesSlice ( ) { <nl> - } <nl> + MTPDmessages_messagesSlice ( ) = default ; <nl> MTPDmessages_messagesSlice ( MTPint _count , const MTPVector < MTPMessage > & _messages , const MTPVector < MTPChat > & _chats , const MTPVector < MTPUser > & _users ) : vcount ( _count ) , vmessages ( _messages ) , vchats ( _chats ) , vusers ( _users ) { <nl> } <nl> <nl> class MTPDmessages_channelMessages : public mtpData { <nl> Q_DECLARE_FLAGS ( Flags , Flag ) ; <nl> friend inline Flags operator ~ ( Flag v ) { return QFlag ( ~ static_cast < int32 > ( v ) ) ; } <nl> <nl> - MTPDmessages_channelMessages ( ) { <nl> - } <nl> + MTPDmessages_channelMessages ( ) = default ; <nl> MTPDmessages_channelMessages ( const MTPflags < MTPDmessages_channelMessages : : Flags > & _flags , MTPint _pts , MTPint _count , const MTPVector < MTPMessage > & _messages , const MTPVector < MTPChat > & _chats , const MTPVector < MTPUser > & _users ) : vflags ( _flags ) , vpts ( _pts ) , vcount ( _count ) , vmessages ( _messages ) , vchats ( _chats ) , vusers ( _users ) { <nl> } <nl> <nl> class MTPDmessages_channelMessages : public mtpData { <nl> <nl> class MTPDmessages_chats : public mtpData { <nl> public : <nl> - MTPDmessages_chats ( ) { <nl> - } <nl> + MTPDmessages_chats ( ) = default ; <nl> MTPDmessages_chats ( const MTPVector < MTPChat > & _chats ) : vchats ( _chats ) { <nl> } <nl> <nl> class MTPDmessages_chats : public mtpData { <nl> <nl> class MTPDmessages_chatsSlice : public mtpData { <nl> public : <nl> - MTPDmessages_chatsSlice ( ) { <nl> - } <nl> + MTPDmessages_chatsSlice ( ) = default ; <nl> MTPDmessages_chatsSlice ( MTPint _count , const MTPVector < MTPChat > & _chats ) : vcount ( _count ) , vchats ( _chats ) { <nl> } <nl> <nl> class MTPDmessages_chatsSlice : public mtpData { <nl> <nl> class MTPDmessages_chatFull : public mtpData { <nl> public : <nl> - MTPDmessages_chatFull ( ) { <nl> - } <nl> + MTPDmessages_chatFull ( ) = default ; <nl> MTPDmessages_chatFull ( const MTPChatFull & _full_chat , const MTPVector < MTPChat > & _chats , const MTPVector < MTPUser > & _users ) : vfull_chat ( _full_chat ) , vchats ( _chats ) , vusers ( _users ) { <nl> } <nl> <nl> class MTPDmessages_chatFull : public mtpData { <nl> <nl> class MTPDmessages_affectedHistory : public mtpData { <nl> public : <nl> - MTPDmessages_affectedHistory ( ) { <nl> - } <nl> + MTPDmessages_affectedHistory ( ) = default ; <nl> MTPDmessages_affectedHistory ( MTPint _pts , MTPint _pts_count , MTPint _offset ) : vpts ( _pts ) , vpts_count ( _pts_count ) , voffset ( _offset ) { <nl> } <nl> <nl> class MTPDinputMessagesFilterPhoneCalls : public mtpData { <nl> <nl> bool is_missed ( ) const { return vflags . v & Flag : : f_missed ; } <nl> <nl> - MTPDinputMessagesFilterPhoneCalls ( ) { <nl> - } <nl> + MTPDinputMessagesFilterPhoneCalls ( ) = default ; <nl> MTPDinputMessagesFilterPhoneCalls ( const MTPflags < MTPDinputMessagesFilterPhoneCalls : : Flags > & _flags ) : vflags ( _flags ) { <nl> } <nl> <nl> class MTPDinputMessagesFilterPhoneCalls : public mtpData { <nl> <nl> class MTPDupdateNewMessage : public mtpData { <nl> public : <nl> - MTPDupdateNewMessage ( ) { <nl> - } <nl> + MTPDupdateNewMessage ( ) = default ; <nl> MTPDupdateNewMessage ( const MTPMessage & _message , MTPint _pts , MTPint _pts_count ) : vmessage ( _message ) , vpts ( _pts ) , vpts_count ( _pts_count ) { <nl> } <nl> <nl> class MTPDupdateNewMessage : public mtpData { <nl> <nl> class MTPDupdateMessageID : public mtpData { <nl> public : <nl> - MTPDupdateMessageID ( ) { <nl> - } <nl> + MTPDupdateMessageID ( ) = default ; <nl> MTPDupdateMessageID ( MTPint _id , const MTPlong & _random_id ) : vid ( _id ) , vrandom_id ( _random_id ) { <nl> } <nl> <nl> class MTPDupdateMessageID : public mtpData { <nl> <nl> class MTPDupdateDeleteMessages : public mtpData { <nl> public : <nl> - MTPDupdateDeleteMessages ( ) { <nl> - } <nl> + MTPDupdateDeleteMessages ( ) = default ; <nl> MTPDupdateDeleteMessages ( const MTPVector < MTPint > & _messages , MTPint _pts , MTPint _pts_count ) : vmessages ( _messages ) , vpts ( _pts ) , vpts_count ( _pts_count ) { <nl> } <nl> <nl> class MTPDupdateDeleteMessages : public mtpData { <nl> <nl> class MTPDupdateUserTyping : public mtpData { <nl> public : <nl> - MTPDupdateUserTyping ( ) { <nl> - } <nl> + MTPDupdateUserTyping ( ) = default ; <nl> MTPDupdateUserTyping ( MTPint _user_id , const MTPSendMessageAction & _action ) : vuser_id ( _user_id ) , vaction ( _action ) { <nl> } <nl> <nl> class MTPDupdateUserTyping : public mtpData { <nl> <nl> class MTPDupdateChatUserTyping : public mtpData { <nl> public : <nl> - MTPDupdateChatUserTyping ( ) { <nl> - } <nl> + MTPDupdateChatUserTyping ( ) = default ; <nl> MTPDupdateChatUserTyping ( MTPint _chat_id , MTPint _user_id , const MTPSendMessageAction & _action ) : vchat_id ( _chat_id ) , vuser_id ( _user_id ) , vaction ( _action ) { <nl> } <nl> <nl> class MTPDupdateChatUserTyping : public mtpData { <nl> <nl> class MTPDupdateChatParticipants : public mtpData { <nl> public : <nl> - MTPDupdateChatParticipants ( ) { <nl> - } <nl> + MTPDupdateChatParticipants ( ) = default ; <nl> MTPDupdateChatParticipants ( const MTPChatParticipants & _participants ) : vparticipants ( _participants ) { <nl> } <nl> <nl> class MTPDupdateChatParticipants : public mtpData { <nl> <nl> class MTPDupdateUserStatus : public mtpData { <nl> public : <nl> - MTPDupdateUserStatus ( ) { <nl> - } <nl> + MTPDupdateUserStatus ( ) = default ; <nl> MTPDupdateUserStatus ( MTPint _user_id , const MTPUserStatus & _status ) : vuser_id ( _user_id ) , vstatus ( _status ) { <nl> } <nl> <nl> class MTPDupdateUserStatus : public mtpData { <nl> <nl> class MTPDupdateUserName : public mtpData { <nl> public : <nl> - MTPDupdateUserName ( ) { <nl> - } <nl> + MTPDupdateUserName ( ) = default ; <nl> MTPDupdateUserName ( MTPint _user_id , const MTPstring & _first_name , const MTPstring & _last_name , const MTPstring & _username ) : vuser_id ( _user_id ) , vfirst_name ( _first_name ) , vlast_name ( _last_name ) , vusername ( _username ) { <nl> } <nl> <nl> class MTPDupdateUserName : public mtpData { <nl> <nl> class MTPDupdateUserPhoto : public mtpData { <nl> public : <nl> - MTPDupdateUserPhoto ( ) { <nl> - } <nl> + MTPDupdateUserPhoto ( ) = default ; <nl> MTPDupdateUserPhoto ( MTPint _user_id , MTPint _date , const MTPUserProfilePhoto & _photo , MTPBool _previous ) : vuser_id ( _user_id ) , vdate ( _date ) , vphoto ( _photo ) , vprevious ( _previous ) { <nl> } <nl> <nl> class MTPDupdateUserPhoto : public mtpData { <nl> <nl> class MTPDupdateContactRegistered : public mtpData { <nl> public : <nl> - MTPDupdateContactRegistered ( ) { <nl> - } <nl> + MTPDupdateContactRegistered ( ) = default ; <nl> MTPDupdateContactRegistered ( MTPint _user_id , MTPint _date ) : vuser_id ( _user_id ) , vdate ( _date ) { <nl> } <nl> <nl> class MTPDupdateContactRegistered : public mtpData { <nl> <nl> class MTPDupdateContactLink : public mtpData { <nl> public : <nl> - MTPDupdateContactLink ( ) { <nl> - } <nl> + MTPDupdateContactLink ( ) = default ; <nl> MTPDupdateContactLink ( MTPint _user_id , const MTPContactLink & _my_link , const MTPContactLink & _foreign_link ) : vuser_id ( _user_id ) , vmy_link ( _my_link ) , vforeign_link ( _foreign_link ) { <nl> } <nl> <nl> class MTPDupdateContactLink : public mtpData { <nl> <nl> class MTPDupdateNewEncryptedMessage : public mtpData { <nl> public : <nl> - MTPDupdateNewEncryptedMessage ( ) { <nl> - } <nl> + MTPDupdateNewEncryptedMessage ( ) = default ; <nl> MTPDupdateNewEncryptedMessage ( const MTPEncryptedMessage & _message , MTPint _qts ) : vmessage ( _message ) , vqts ( _qts ) { <nl> } <nl> <nl> class MTPDupdateNewEncryptedMessage : public mtpData { <nl> <nl> class MTPDupdateEncryptedChatTyping : public mtpData { <nl> public : <nl> - MTPDupdateEncryptedChatTyping ( ) { <nl> - } <nl> + MTPDupdateEncryptedChatTyping ( ) = default ; <nl> MTPDupdateEncryptedChatTyping ( MTPint _chat_id ) : vchat_id ( _chat_id ) { <nl> } <nl> <nl> class MTPDupdateEncryptedChatTyping : public mtpData { <nl> <nl> class MTPDupdateEncryption : public mtpData { <nl> public : <nl> - MTPDupdateEncryption ( ) { <nl> - } <nl> + MTPDupdateEncryption ( ) = default ; <nl> MTPDupdateEncryption ( const MTPEncryptedChat & _chat , MTPint _date ) : vchat ( _chat ) , vdate ( _date ) { <nl> } <nl> <nl> class MTPDupdateEncryption : public mtpData { <nl> <nl> class MTPDupdateEncryptedMessagesRead : public mtpData { <nl> public : <nl> - MTPDupdateEncryptedMessagesRead ( ) { <nl> - } <nl> + MTPDupdateEncryptedMessagesRead ( ) = default ; <nl> MTPDupdateEncryptedMessagesRead ( MTPint _chat_id , MTPint _max_date , MTPint _date ) : vchat_id ( _chat_id ) , vmax_date ( _max_date ) , vdate ( _date ) { <nl> } <nl> <nl> class MTPDupdateEncryptedMessagesRead : public mtpData { <nl> <nl> class MTPDupdateChatParticipantAdd : public mtpData { <nl> public : <nl> - MTPDupdateChatParticipantAdd ( ) { <nl> - } <nl> + MTPDupdateChatParticipantAdd ( ) = default ; <nl> MTPDupdateChatParticipantAdd ( MTPint _chat_id , MTPint _user_id , MTPint _inviter_id , MTPint _date , MTPint _version ) : vchat_id ( _chat_id ) , vuser_id ( _user_id ) , vinviter_id ( _inviter_id ) , vdate ( _date ) , vversion ( _version ) { <nl> } <nl> <nl> class MTPDupdateChatParticipantAdd : public mtpData { <nl> <nl> class MTPDupdateChatParticipantDelete : public mtpData { <nl> public : <nl> - MTPDupdateChatParticipantDelete ( ) { <nl> - } <nl> + MTPDupdateChatParticipantDelete ( ) = default ; <nl> MTPDupdateChatParticipantDelete ( MTPint _chat_id , MTPint _user_id , MTPint _version ) : vchat_id ( _chat_id ) , vuser_id ( _user_id ) , vversion ( _version ) { <nl> } <nl> <nl> class MTPDupdateChatParticipantDelete : public mtpData { <nl> <nl> class MTPDupdateDcOptions : public mtpData { <nl> public : <nl> - MTPDupdateDcOptions ( ) { <nl> - } <nl> + MTPDupdateDcOptions ( ) = default ; <nl> MTPDupdateDcOptions ( const MTPVector < MTPDcOption > & _dc_options ) : vdc_options ( _dc_options ) { <nl> } <nl> <nl> class MTPDupdateDcOptions : public mtpData { <nl> <nl> class MTPDupdateUserBlocked : public mtpData { <nl> public : <nl> - MTPDupdateUserBlocked ( ) { <nl> - } <nl> + MTPDupdateUserBlocked ( ) = default ; <nl> MTPDupdateUserBlocked ( MTPint _user_id , MTPBool _blocked ) : vuser_id ( _user_id ) , vblocked ( _blocked ) { <nl> } <nl> <nl> class MTPDupdateUserBlocked : public mtpData { <nl> <nl> class MTPDupdateNotifySettings : public mtpData { <nl> public : <nl> - MTPDupdateNotifySettings ( ) { <nl> - } <nl> + MTPDupdateNotifySettings ( ) = default ; <nl> MTPDupdateNotifySettings ( const MTPNotifyPeer & _peer , const MTPPeerNotifySettings & _notify_settings ) : vpeer ( _peer ) , vnotify_settings ( _notify_settings ) { <nl> } <nl> <nl> class MTPDupdateServiceNotification : public mtpData { <nl> bool is_popup ( ) const { return vflags . v & Flag : : f_popup ; } <nl> bool has_inbox_date ( ) const { return vflags . v & Flag : : f_inbox_date ; } <nl> <nl> - MTPDupdateServiceNotification ( ) { <nl> - } <nl> + MTPDupdateServiceNotification ( ) = default ; <nl> MTPDupdateServiceNotification ( const MTPflags < MTPDupdateServiceNotification : : Flags > & _flags , MTPint _inbox_date , const MTPstring & _type , const MTPstring & _message , const MTPMessageMedia & _media , const MTPVector < MTPMessageEntity > & _entities ) : vflags ( _flags ) , vinbox_date ( _inbox_date ) , vtype ( _type ) , vmessage ( _message ) , vmedia ( _media ) , ventities ( _entities ) { <nl> } <nl> <nl> class MTPDupdateServiceNotification : public mtpData { <nl> <nl> class MTPDupdatePrivacy : public mtpData { <nl> public : <nl> - MTPDupdatePrivacy ( ) { <nl> - } <nl> + MTPDupdatePrivacy ( ) = default ; <nl> MTPDupdatePrivacy ( const MTPPrivacyKey & _key , const MTPVector < MTPPrivacyRule > & _rules ) : vkey ( _key ) , vrules ( _rules ) { <nl> } <nl> <nl> class MTPDupdatePrivacy : public mtpData { <nl> <nl> class MTPDupdateUserPhone : public mtpData { <nl> public : <nl> - MTPDupdateUserPhone ( ) { <nl> - } <nl> + MTPDupdateUserPhone ( ) = default ; <nl> MTPDupdateUserPhone ( MTPint _user_id , const MTPstring & _phone ) : vuser_id ( _user_id ) , vphone ( _phone ) { <nl> } <nl> <nl> class MTPDupdateUserPhone : public mtpData { <nl> <nl> class MTPDupdateReadHistoryInbox : public mtpData { <nl> public : <nl> - MTPDupdateReadHistoryInbox ( ) { <nl> - } <nl> + MTPDupdateReadHistoryInbox ( ) = default ; <nl> MTPDupdateReadHistoryInbox ( const MTPPeer & _peer , MTPint _max_id , MTPint _pts , MTPint _pts_count ) : vpeer ( _peer ) , vmax_id ( _max_id ) , vpts ( _pts ) , vpts_count ( _pts_count ) { <nl> } <nl> <nl> class MTPDupdateReadHistoryInbox : public mtpData { <nl> <nl> class MTPDupdateReadHistoryOutbox : public mtpData { <nl> public : <nl> - MTPDupdateReadHistoryOutbox ( ) { <nl> - } <nl> + MTPDupdateReadHistoryOutbox ( ) = default ; <nl> MTPDupdateReadHistoryOutbox ( const MTPPeer & _peer , MTPint _max_id , MTPint _pts , MTPint _pts_count ) : vpeer ( _peer ) , vmax_id ( _max_id ) , vpts ( _pts ) , vpts_count ( _pts_count ) { <nl> } <nl> <nl> class MTPDupdateReadHistoryOutbox : public mtpData { <nl> <nl> class MTPDupdateWebPage : public mtpData { <nl> public : <nl> - MTPDupdateWebPage ( ) { <nl> - } <nl> + MTPDupdateWebPage ( ) = default ; <nl> MTPDupdateWebPage ( const MTPWebPage & _webpage , MTPint _pts , MTPint _pts_count ) : vwebpage ( _webpage ) , vpts ( _pts ) , vpts_count ( _pts_count ) { <nl> } <nl> <nl> class MTPDupdateWebPage : public mtpData { <nl> <nl> class MTPDupdateReadMessagesContents : public mtpData { <nl> public : <nl> - MTPDupdateReadMessagesContents ( ) { <nl> - } <nl> + MTPDupdateReadMessagesContents ( ) = default ; <nl> MTPDupdateReadMessagesContents ( const MTPVector < MTPint > & _messages , MTPint _pts , MTPint _pts_count ) : vmessages ( _messages ) , vpts ( _pts ) , vpts_count ( _pts_count ) { <nl> } <nl> <nl> class MTPDupdateChannelTooLong : public mtpData { <nl> <nl> bool has_pts ( ) const { return vflags . v & Flag : : f_pts ; } <nl> <nl> - MTPDupdateChannelTooLong ( ) { <nl> - } <nl> + MTPDupdateChannelTooLong ( ) = default ; <nl> MTPDupdateChannelTooLong ( const MTPflags < MTPDupdateChannelTooLong : : Flags > & _flags , MTPint _channel_id , MTPint _pts ) : vflags ( _flags ) , vchannel_id ( _channel_id ) , vpts ( _pts ) { <nl> } <nl> <nl> class MTPDupdateChannelTooLong : public mtpData { <nl> <nl> class MTPDupdateChannel : public mtpData { <nl> public : <nl> - MTPDupdateChannel ( ) { <nl> - } <nl> + MTPDupdateChannel ( ) = default ; <nl> MTPDupdateChannel ( MTPint _channel_id ) : vchannel_id ( _channel_id ) { <nl> } <nl> <nl> class MTPDupdateChannel : public mtpData { <nl> <nl> class MTPDupdateNewChannelMessage : public mtpData { <nl> public : <nl> - MTPDupdateNewChannelMessage ( ) { <nl> - } <nl> + MTPDupdateNewChannelMessage ( ) = default ; <nl> MTPDupdateNewChannelMessage ( const MTPMessage & _message , MTPint _pts , MTPint _pts_count ) : vmessage ( _message ) , vpts ( _pts ) , vpts_count ( _pts_count ) { <nl> } <nl> <nl> class MTPDupdateNewChannelMessage : public mtpData { <nl> <nl> class MTPDupdateReadChannelInbox : public mtpData { <nl> public : <nl> - MTPDupdateReadChannelInbox ( ) { <nl> - } <nl> + MTPDupdateReadChannelInbox ( ) = default ; <nl> MTPDupdateReadChannelInbox ( MTPint _channel_id , MTPint _max_id ) : vchannel_id ( _channel_id ) , vmax_id ( _max_id ) { <nl> } <nl> <nl> class MTPDupdateReadChannelInbox : public mtpData { <nl> <nl> class MTPDupdateDeleteChannelMessages : public mtpData { <nl> public : <nl> - MTPDupdateDeleteChannelMessages ( ) { <nl> - } <nl> + MTPDupdateDeleteChannelMessages ( ) = default ; <nl> MTPDupdateDeleteChannelMessages ( MTPint _channel_id , const MTPVector < MTPint > & _messages , MTPint _pts , MTPint _pts_count ) : vchannel_id ( _channel_id ) , vmessages ( _messages ) , vpts ( _pts ) , vpts_count ( _pts_count ) { <nl> } <nl> <nl> class MTPDupdateDeleteChannelMessages : public mtpData { <nl> <nl> class MTPDupdateChannelMessageViews : public mtpData { <nl> public : <nl> - MTPDupdateChannelMessageViews ( ) { <nl> - } <nl> + MTPDupdateChannelMessageViews ( ) = default ; <nl> MTPDupdateChannelMessageViews ( MTPint _channel_id , MTPint _id , MTPint _views ) : vchannel_id ( _channel_id ) , vid ( _id ) , vviews ( _views ) { <nl> } <nl> <nl> class MTPDupdateChannelMessageViews : public mtpData { <nl> <nl> class MTPDupdateChatAdmins : public mtpData { <nl> public : <nl> - MTPDupdateChatAdmins ( ) { <nl> - } <nl> + MTPDupdateChatAdmins ( ) = default ; <nl> MTPDupdateChatAdmins ( MTPint _chat_id , MTPBool _enabled , MTPint _version ) : vchat_id ( _chat_id ) , venabled ( _enabled ) , vversion ( _version ) { <nl> } <nl> <nl> class MTPDupdateChatAdmins : public mtpData { <nl> <nl> class MTPDupdateChatParticipantAdmin : public mtpData { <nl> public : <nl> - MTPDupdateChatParticipantAdmin ( ) { <nl> - } <nl> + MTPDupdateChatParticipantAdmin ( ) = default ; <nl> MTPDupdateChatParticipantAdmin ( MTPint _chat_id , MTPint _user_id , MTPBool _is_admin , MTPint _version ) : vchat_id ( _chat_id ) , vuser_id ( _user_id ) , vis_admin ( _is_admin ) , vversion ( _version ) { <nl> } <nl> <nl> class MTPDupdateChatParticipantAdmin : public mtpData { <nl> <nl> class MTPDupdateNewStickerSet : public mtpData { <nl> public : <nl> - MTPDupdateNewStickerSet ( ) { <nl> - } <nl> + MTPDupdateNewStickerSet ( ) = default ; <nl> MTPDupdateNewStickerSet ( const MTPmessages_StickerSet & _stickerset ) : vstickerset ( _stickerset ) { <nl> } <nl> <nl> class MTPDupdateStickerSetsOrder : public mtpData { <nl> <nl> bool is_masks ( ) const { return vflags . v & Flag : : f_masks ; } <nl> <nl> - MTPDupdateStickerSetsOrder ( ) { <nl> - } <nl> + MTPDupdateStickerSetsOrder ( ) = default ; <nl> MTPDupdateStickerSetsOrder ( const MTPflags < MTPDupdateStickerSetsOrder : : Flags > & _flags , const MTPVector < MTPlong > & _order ) : vflags ( _flags ) , vorder ( _order ) { <nl> } <nl> <nl> class MTPDupdateBotInlineQuery : public mtpData { <nl> <nl> bool has_geo ( ) const { return vflags . v & Flag : : f_geo ; } <nl> <nl> - MTPDupdateBotInlineQuery ( ) { <nl> - } <nl> + MTPDupdateBotInlineQuery ( ) = default ; <nl> MTPDupdateBotInlineQuery ( const MTPflags < MTPDupdateBotInlineQuery : : Flags > & _flags , const MTPlong & _query_id , MTPint _user_id , const MTPstring & _query , const MTPGeoPoint & _geo , const MTPstring & _offset ) : vflags ( _flags ) , vquery_id ( _query_id ) , vuser_id ( _user_id ) , vquery ( _query ) , vgeo ( _geo ) , voffset ( _offset ) { <nl> } <nl> <nl> class MTPDupdateBotInlineSend : public mtpData { <nl> bool has_geo ( ) const { return vflags . v & Flag : : f_geo ; } <nl> bool has_msg_id ( ) const { return vflags . v & Flag : : f_msg_id ; } <nl> <nl> - MTPDupdateBotInlineSend ( ) { <nl> - } <nl> + MTPDupdateBotInlineSend ( ) = default ; <nl> MTPDupdateBotInlineSend ( const MTPflags < MTPDupdateBotInlineSend : : Flags > & _flags , MTPint _user_id , const MTPstring & _query , const MTPGeoPoint & _geo , const MTPstring & _id , const MTPInputBotInlineMessageID & _msg_id ) : vflags ( _flags ) , vuser_id ( _user_id ) , vquery ( _query ) , vgeo ( _geo ) , vid ( _id ) , vmsg_id ( _msg_id ) { <nl> } <nl> <nl> class MTPDupdateBotInlineSend : public mtpData { <nl> <nl> class MTPDupdateEditChannelMessage : public mtpData { <nl> public : <nl> - MTPDupdateEditChannelMessage ( ) { <nl> - } <nl> + MTPDupdateEditChannelMessage ( ) = default ; <nl> MTPDupdateEditChannelMessage ( const MTPMessage & _message , MTPint _pts , MTPint _pts_count ) : vmessage ( _message ) , vpts ( _pts ) , vpts_count ( _pts_count ) { <nl> } <nl> <nl> class MTPDupdateEditChannelMessage : public mtpData { <nl> <nl> class MTPDupdateChannelPinnedMessage : public mtpData { <nl> public : <nl> - MTPDupdateChannelPinnedMessage ( ) { <nl> - } <nl> + MTPDupdateChannelPinnedMessage ( ) = default ; <nl> MTPDupdateChannelPinnedMessage ( MTPint _channel_id , MTPint _id ) : vchannel_id ( _channel_id ) , vid ( _id ) { <nl> } <nl> <nl> class MTPDupdateBotCallbackQuery : public mtpData { <nl> bool has_data ( ) const { return vflags . v & Flag : : f_data ; } <nl> bool has_game_short_name ( ) const { return vflags . v & Flag : : f_game_short_name ; } <nl> <nl> - MTPDupdateBotCallbackQuery ( ) { <nl> - } <nl> + MTPDupdateBotCallbackQuery ( ) = default ; <nl> MTPDupdateBotCallbackQuery ( const MTPflags < MTPDupdateBotCallbackQuery : : Flags > & _flags , const MTPlong & _query_id , MTPint _user_id , const MTPPeer & _peer , MTPint _msg_id , const MTPlong & _chat_instance , const MTPbytes & _data , const MTPstring & _game_short_name ) : vflags ( _flags ) , vquery_id ( _query_id ) , vuser_id ( _user_id ) , vpeer ( _peer ) , vmsg_id ( _msg_id ) , vchat_instance ( _chat_instance ) , vdata ( _data ) , vgame_short_name ( _game_short_name ) { <nl> } <nl> <nl> class MTPDupdateBotCallbackQuery : public mtpData { <nl> <nl> class MTPDupdateEditMessage : public mtpData { <nl> public : <nl> - MTPDupdateEditMessage ( ) { <nl> - } <nl> + MTPDupdateEditMessage ( ) = default ; <nl> MTPDupdateEditMessage ( const MTPMessage & _message , MTPint _pts , MTPint _pts_count ) : vmessage ( _message ) , vpts ( _pts ) , vpts_count ( _pts_count ) { <nl> } <nl> <nl> class MTPDupdateInlineBotCallbackQuery : public mtpData { <nl> bool has_data ( ) const { return vflags . v & Flag : : f_data ; } <nl> bool has_game_short_name ( ) const { return vflags . v & Flag : : f_game_short_name ; } <nl> <nl> - MTPDupdateInlineBotCallbackQuery ( ) { <nl> - } <nl> + MTPDupdateInlineBotCallbackQuery ( ) = default ; <nl> MTPDupdateInlineBotCallbackQuery ( const MTPflags < MTPDupdateInlineBotCallbackQuery : : Flags > & _flags , const MTPlong & _query_id , MTPint _user_id , const MTPInputBotInlineMessageID & _msg_id , const MTPlong & _chat_instance , const MTPbytes & _data , const MTPstring & _game_short_name ) : vflags ( _flags ) , vquery_id ( _query_id ) , vuser_id ( _user_id ) , vmsg_id ( _msg_id ) , vchat_instance ( _chat_instance ) , vdata ( _data ) , vgame_short_name ( _game_short_name ) { <nl> } <nl> <nl> class MTPDupdateInlineBotCallbackQuery : public mtpData { <nl> <nl> class MTPDupdateReadChannelOutbox : public mtpData { <nl> public : <nl> - MTPDupdateReadChannelOutbox ( ) { <nl> - } <nl> + MTPDupdateReadChannelOutbox ( ) = default ; <nl> MTPDupdateReadChannelOutbox ( MTPint _channel_id , MTPint _max_id ) : vchannel_id ( _channel_id ) , vmax_id ( _max_id ) { <nl> } <nl> <nl> class MTPDupdateReadChannelOutbox : public mtpData { <nl> <nl> class MTPDupdateDraftMessage : public mtpData { <nl> public : <nl> - MTPDupdateDraftMessage ( ) { <nl> - } <nl> + MTPDupdateDraftMessage ( ) = default ; <nl> MTPDupdateDraftMessage ( const MTPPeer & _peer , const MTPDraftMessage & _draft ) : vpeer ( _peer ) , vdraft ( _draft ) { <nl> } <nl> <nl> class MTPDupdateDraftMessage : public mtpData { <nl> <nl> class MTPDupdateChannelWebPage : public mtpData { <nl> public : <nl> - MTPDupdateChannelWebPage ( ) { <nl> - } <nl> + MTPDupdateChannelWebPage ( ) = default ; <nl> MTPDupdateChannelWebPage ( MTPint _channel_id , const MTPWebPage & _webpage , MTPint _pts , MTPint _pts_count ) : vchannel_id ( _channel_id ) , vwebpage ( _webpage ) , vpts ( _pts ) , vpts_count ( _pts_count ) { <nl> } <nl> <nl> class MTPDupdateChannelWebPage : public mtpData { <nl> <nl> class MTPDupdatePhoneCall : public mtpData { <nl> public : <nl> - MTPDupdatePhoneCall ( ) { <nl> - } <nl> + MTPDupdatePhoneCall ( ) = default ; <nl> MTPDupdatePhoneCall ( const MTPPhoneCall & _phone_call ) : vphone_call ( _phone_call ) { <nl> } <nl> <nl> class MTPDupdateDialogPinned : public mtpData { <nl> <nl> bool is_pinned ( ) const { return vflags . v & Flag : : f_pinned ; } <nl> <nl> - MTPDupdateDialogPinned ( ) { <nl> - } <nl> + MTPDupdateDialogPinned ( ) = default ; <nl> MTPDupdateDialogPinned ( const MTPflags < MTPDupdateDialogPinned : : Flags > & _flags , const MTPPeer & _peer ) : vflags ( _flags ) , vpeer ( _peer ) { <nl> } <nl> <nl> class MTPDupdatePinnedDialogs : public mtpData { <nl> <nl> bool has_order ( ) const { return vflags . v & Flag : : f_order ; } <nl> <nl> - MTPDupdatePinnedDialogs ( ) { <nl> - } <nl> + MTPDupdatePinnedDialogs ( ) = default ; <nl> MTPDupdatePinnedDialogs ( const MTPflags < MTPDupdatePinnedDialogs : : Flags > & _flags , const MTPVector < MTPPeer > & _order ) : vflags ( _flags ) , vorder ( _order ) { <nl> } <nl> <nl> class MTPDupdatePinnedDialogs : public mtpData { <nl> <nl> class MTPDupdates_state : public mtpData { <nl> public : <nl> - MTPDupdates_state ( ) { <nl> - } <nl> + MTPDupdates_state ( ) = default ; <nl> MTPDupdates_state ( MTPint _pts , MTPint _qts , MTPint _date , MTPint _seq , MTPint _unread_count ) : vpts ( _pts ) , vqts ( _qts ) , vdate ( _date ) , vseq ( _seq ) , vunread_count ( _unread_count ) { <nl> } <nl> <nl> class MTPDupdates_state : public mtpData { <nl> <nl> class MTPDupdates_differenceEmpty : public mtpData { <nl> public : <nl> - MTPDupdates_differenceEmpty ( ) { <nl> - } <nl> + MTPDupdates_differenceEmpty ( ) = default ; <nl> MTPDupdates_differenceEmpty ( MTPint _date , MTPint _seq ) : vdate ( _date ) , vseq ( _seq ) { <nl> } <nl> <nl> class MTPDupdates_differenceEmpty : public mtpData { <nl> <nl> class MTPDupdates_difference : public mtpData { <nl> public : <nl> - MTPDupdates_difference ( ) { <nl> - } <nl> + MTPDupdates_difference ( ) = default ; <nl> MTPDupdates_difference ( const MTPVector < MTPMessage > & _new_messages , const MTPVector < MTPEncryptedMessage > & _new_encrypted_messages , const MTPVector < MTPUpdate > & _other_updates , const MTPVector < MTPChat > & _chats , const MTPVector < MTPUser > & _users , const MTPupdates_State & _state ) : vnew_messages ( _new_messages ) , vnew_encrypted_messages ( _new_encrypted_messages ) , vother_updates ( _other_updates ) , vchats ( _chats ) , vusers ( _users ) , vstate ( _state ) { <nl> } <nl> <nl> class MTPDupdates_difference : public mtpData { <nl> <nl> class MTPDupdates_differenceSlice : public mtpData { <nl> public : <nl> - MTPDupdates_differenceSlice ( ) { <nl> - } <nl> + MTPDupdates_differenceSlice ( ) = default ; <nl> MTPDupdates_differenceSlice ( const MTPVector < MTPMessage > & _new_messages , const MTPVector < MTPEncryptedMessage > & _new_encrypted_messages , const MTPVector < MTPUpdate > & _other_updates , const MTPVector < MTPChat > & _chats , const MTPVector < MTPUser > & _users , const MTPupdates_State & _intermediate_state ) : vnew_messages ( _new_messages ) , vnew_encrypted_messages ( _new_encrypted_messages ) , vother_updates ( _other_updates ) , vchats ( _chats ) , vusers ( _users ) , vintermediate_state ( _intermediate_state ) { <nl> } <nl> <nl> class MTPDupdates_differenceSlice : public mtpData { <nl> <nl> class MTPDupdates_differenceTooLong : public mtpData { <nl> public : <nl> - MTPDupdates_differenceTooLong ( ) { <nl> - } <nl> + MTPDupdates_differenceTooLong ( ) = default ; <nl> MTPDupdates_differenceTooLong ( MTPint _pts ) : vpts ( _pts ) { <nl> } <nl> <nl> class MTPDupdateShortMessage : public mtpData { <nl> bool has_reply_to_msg_id ( ) const { return vflags . v & Flag : : f_reply_to_msg_id ; } <nl> bool has_entities ( ) const { return vflags . v & Flag : : f_entities ; } <nl> <nl> - MTPDupdateShortMessage ( ) { <nl> - } <nl> + MTPDupdateShortMessage ( ) = default ; <nl> MTPDupdateShortMessage ( const MTPflags < MTPDupdateShortMessage : : Flags > & _flags , MTPint _id , MTPint _user_id , const MTPstring & _message , MTPint _pts , MTPint _pts_count , MTPint _date , const MTPMessageFwdHeader & _fwd_from , MTPint _via_bot_id , MTPint _reply_to_msg_id , const MTPVector < MTPMessageEntity > & _entities ) : vflags ( _flags ) , vid ( _id ) , vuser_id ( _user_id ) , vmessage ( _message ) , vpts ( _pts ) , vpts_count ( _pts_count ) , vdate ( _date ) , vfwd_from ( _fwd_from ) , vvia_bot_id ( _via_bot_id ) , vreply_to_msg_id ( _reply_to_msg_id ) , ventities ( _entities ) { <nl> } <nl> <nl> class MTPDupdateShortChatMessage : public mtpData { <nl> bool has_reply_to_msg_id ( ) const { return vflags . v & Flag : : f_reply_to_msg_id ; } <nl> bool has_entities ( ) const { return vflags . v & Flag : : f_entities ; } <nl> <nl> - MTPDupdateShortChatMessage ( ) { <nl> - } <nl> + MTPDupdateShortChatMessage ( ) = default ; <nl> MTPDupdateShortChatMessage ( const MTPflags < MTPDupdateShortChatMessage : : Flags > & _flags , MTPint _id , MTPint _from_id , MTPint _chat_id , const MTPstring & _message , MTPint _pts , MTPint _pts_count , MTPint _date , const MTPMessageFwdHeader & _fwd_from , MTPint _via_bot_id , MTPint _reply_to_msg_id , const MTPVector < MTPMessageEntity > & _entities ) : vflags ( _flags ) , vid ( _id ) , vfrom_id ( _from_id ) , vchat_id ( _chat_id ) , vmessage ( _message ) , vpts ( _pts ) , vpts_count ( _pts_count ) , vdate ( _date ) , vfwd_from ( _fwd_from ) , vvia_bot_id ( _via_bot_id ) , vreply_to_msg_id ( _reply_to_msg_id ) , ventities ( _entities ) { <nl> } <nl> <nl> class MTPDupdateShortChatMessage : public mtpData { <nl> <nl> class MTPDupdateShort : public mtpData { <nl> public : <nl> - MTPDupdateShort ( ) { <nl> - } <nl> + MTPDupdateShort ( ) = default ; <nl> MTPDupdateShort ( const MTPUpdate & _update , MTPint _date ) : vupdate ( _update ) , vdate ( _date ) { <nl> } <nl> <nl> class MTPDupdateShort : public mtpData { <nl> <nl> class MTPDupdatesCombined : public mtpData { <nl> public : <nl> - MTPDupdatesCombined ( ) { <nl> - } <nl> + MTPDupdatesCombined ( ) = default ; <nl> MTPDupdatesCombined ( const MTPVector < MTPUpdate > & _updates , const MTPVector < MTPUser > & _users , const MTPVector < MTPChat > & _chats , MTPint _date , MTPint _seq_start , MTPint _seq ) : vupdates ( _updates ) , vusers ( _users ) , vchats ( _chats ) , vdate ( _date ) , vseq_start ( _seq_start ) , vseq ( _seq ) { <nl> } <nl> <nl> class MTPDupdatesCombined : public mtpData { <nl> <nl> class MTPDupdates : public mtpData { <nl> public : <nl> - MTPDupdates ( ) { <nl> - } <nl> + MTPDupdates ( ) = default ; <nl> MTPDupdates ( const MTPVector < MTPUpdate > & _updates , const MTPVector < MTPUser > & _users , const MTPVector < MTPChat > & _chats , MTPint _date , MTPint _seq ) : vupdates ( _updates ) , vusers ( _users ) , vchats ( _chats ) , vdate ( _date ) , vseq ( _seq ) { <nl> } <nl> <nl> class MTPDupdateShortSentMessage : public mtpData { <nl> bool has_media ( ) const { return vflags . v & Flag : : f_media ; } <nl> bool has_entities ( ) const { return vflags . v & Flag : : f_entities ; } <nl> <nl> - MTPDupdateShortSentMessage ( ) { <nl> - } <nl> + MTPDupdateShortSentMessage ( ) = default ; <nl> MTPDupdateShortSentMessage ( const MTPflags < MTPDupdateShortSentMessage : : Flags > & _flags , MTPint _id , MTPint _pts , MTPint _pts_count , MTPint _date , const MTPMessageMedia & _media , const MTPVector < MTPMessageEntity > & _entities ) : vflags ( _flags ) , vid ( _id ) , vpts ( _pts ) , vpts_count ( _pts_count ) , vdate ( _date ) , vmedia ( _media ) , ventities ( _entities ) { <nl> } <nl> <nl> class MTPDupdateShortSentMessage : public mtpData { <nl> <nl> class MTPDphotos_photos : public mtpData { <nl> public : <nl> - MTPDphotos_photos ( ) { <nl> - } <nl> + MTPDphotos_photos ( ) = default ; <nl> MTPDphotos_photos ( const MTPVector < MTPPhoto > & _photos , const MTPVector < MTPUser > & _users ) : vphotos ( _photos ) , vusers ( _users ) { <nl> } <nl> <nl> class MTPDphotos_photos : public mtpData { <nl> <nl> class MTPDphotos_photosSlice : public mtpData { <nl> public : <nl> - MTPDphotos_photosSlice ( ) { <nl> - } <nl> + MTPDphotos_photosSlice ( ) = default ; <nl> MTPDphotos_photosSlice ( MTPint _count , const MTPVector < MTPPhoto > & _photos , const MTPVector < MTPUser > & _users ) : vcount ( _count ) , vphotos ( _photos ) , vusers ( _users ) { <nl> } <nl> <nl> class MTPDphotos_photosSlice : public mtpData { <nl> <nl> class MTPDphotos_photo : public mtpData { <nl> public : <nl> - MTPDphotos_photo ( ) { <nl> - } <nl> + MTPDphotos_photo ( ) = default ; <nl> MTPDphotos_photo ( const MTPPhoto & _photo , const MTPVector < MTPUser > & _users ) : vphoto ( _photo ) , vusers ( _users ) { <nl> } <nl> <nl> class MTPDphotos_photo : public mtpData { <nl> <nl> class MTPDupload_file : public mtpData { <nl> public : <nl> - MTPDupload_file ( ) { <nl> - } <nl> + MTPDupload_file ( ) = default ; <nl> MTPDupload_file ( const MTPstorage_FileType & _type , MTPint _mtime , const MTPbytes & _bytes ) : vtype ( _type ) , vmtime ( _mtime ) , vbytes ( _bytes ) { <nl> } <nl> <nl> class MTPDdcOption : public mtpData { <nl> bool is_media_only ( ) const { return vflags . v & Flag : : f_media_only ; } <nl> bool is_tcpo_only ( ) const { return vflags . v & Flag : : f_tcpo_only ; } <nl> <nl> - MTPDdcOption ( ) { <nl> - } <nl> + MTPDdcOption ( ) = default ; <nl> MTPDdcOption ( const MTPflags < MTPDdcOption : : Flags > & _flags , MTPint _id , const MTPstring & _ip_address , MTPint _port ) : vflags ( _flags ) , vid ( _id ) , vip_address ( _ip_address ) , vport ( _port ) { <nl> } <nl> <nl> class MTPDconfig : public mtpData { <nl> bool is_phonecalls_enabled ( ) const { return vflags . v & Flag : : f_phonecalls_enabled ; } <nl> bool has_tmp_sessions ( ) const { return vflags . v & Flag : : f_tmp_sessions ; } <nl> <nl> - MTPDconfig ( ) { <nl> - } <nl> + MTPDconfig ( ) = default ; <nl> MTPDconfig ( const MTPflags < MTPDconfig : : Flags > & _flags , MTPint _date , MTPint _expires , MTPBool _test_mode , MTPint _this_dc , const MTPVector < MTPDcOption > & _dc_options , MTPint _chat_size_max , MTPint _megagroup_size_max , MTPint _forwarded_count_max , MTPint _online_update_period_ms , MTPint _offline_blur_timeout_ms , MTPint _offline_idle_timeout_ms , MTPint _online_cloud_timeout_ms , MTPint _notify_cloud_delay_ms , MTPint _notify_default_delay_ms , MTPint _chat_big_size , MTPint _push_chat_period_ms , MTPint _push_chat_limit , MTPint _saved_gifs_limit , MTPint _edit_time_limit , MTPint _rating_e_decay , MTPint _stickers_recent_limit , MTPint _tmp_sessions , MTPint _pinned_dialogs_count_max , MTPint _call_receive_timeout_ms , MTPint _call_ring_timeout_ms , MTPint _call_connect_timeout_ms , MTPint _call_packet_timeout_ms , const MTPVector < MTPDisabledFeature > & _disabled_features ) : vflags ( _flags ) , vdate ( _date ) , vexpires ( _expires ) , vtest_mode ( _test_mode ) , vthis_dc ( _this_dc ) , vdc_options ( _dc_options ) , vchat_size_max ( _chat_size_max ) , vmegagroup_size_max ( _megagroup_size_max ) , vforwarded_count_max ( _forwarded_count_max ) , vonline_update_period_ms ( _online_update_period_ms ) , voffline_blur_timeout_ms ( _offline_blur_timeout_ms ) , voffline_idle_timeout_ms ( _offline_idle_timeout_ms ) , vonline_cloud_timeout_ms ( _online_cloud_timeout_ms ) , vnotify_cloud_delay_ms ( _notify_cloud_delay_ms ) , vnotify_default_delay_ms ( _notify_default_delay_ms ) , vchat_big_size ( _chat_big_size ) , vpush_chat_period_ms ( _push_chat_period_ms ) , vpush_chat_limit ( _push_chat_limit ) , vsaved_gifs_limit ( _saved_gifs_limit ) , vedit_time_limit ( _edit_time_limit ) , vrating_e_decay ( _rating_e_decay ) , vstickers_recent_limit ( _stickers_recent_limit ) , vtmp_sessions ( _tmp_sessions ) , vpinned_dialogs_count_max ( _pinned_dialogs_count_max ) , vcall_receive_timeout_ms ( _call_receive_timeout_ms ) , vcall_ring_timeout_ms ( _call_ring_timeout_ms ) , vcall_connect_timeout_ms ( _call_connect_timeout_ms ) , vcall_packet_timeout_ms ( _call_packet_timeout_ms ) , vdisabled_features ( _disabled_features ) { <nl> } <nl> <nl> class MTPDconfig : public mtpData { <nl> <nl> class MTPDnearestDc : public mtpData { <nl> public : <nl> - MTPDnearestDc ( ) { <nl> - } <nl> + MTPDnearestDc ( ) = default ; <nl> MTPDnearestDc ( const MTPstring & _country , MTPint _this_dc , MTPint _nearest_dc ) : vcountry ( _country ) , vthis_dc ( _this_dc ) , vnearest_dc ( _nearest_dc ) { <nl> } <nl> <nl> class MTPDnearestDc : public mtpData { <nl> <nl> class MTPDhelp_appUpdate : public mtpData { <nl> public : <nl> - MTPDhelp_appUpdate ( ) { <nl> - } <nl> + MTPDhelp_appUpdate ( ) = default ; <nl> MTPDhelp_appUpdate ( MTPint _id , MTPBool _critical , const MTPstring & _url , const MTPstring & _text ) : vid ( _id ) , vcritical ( _critical ) , vurl ( _url ) , vtext ( _text ) { <nl> } <nl> <nl> class MTPDhelp_appUpdate : public mtpData { <nl> <nl> class MTPDhelp_inviteText : public mtpData { <nl> public : <nl> - MTPDhelp_inviteText ( ) { <nl> - } <nl> + MTPDhelp_inviteText ( ) = default ; <nl> MTPDhelp_inviteText ( const MTPstring & _message ) : vmessage ( _message ) { <nl> } <nl> <nl> class MTPDhelp_inviteText : public mtpData { <nl> <nl> class MTPDencryptedChatEmpty : public mtpData { <nl> public : <nl> - MTPDencryptedChatEmpty ( ) { <nl> - } <nl> + MTPDencryptedChatEmpty ( ) = default ; <nl> MTPDencryptedChatEmpty ( MTPint _id ) : vid ( _id ) { <nl> } <nl> <nl> class MTPDencryptedChatEmpty : public mtpData { <nl> <nl> class MTPDencryptedChatWaiting : public mtpData { <nl> public : <nl> - MTPDencryptedChatWaiting ( ) { <nl> - } <nl> + MTPDencryptedChatWaiting ( ) = default ; <nl> MTPDencryptedChatWaiting ( MTPint _id , const MTPlong & _access_hash , MTPint _date , MTPint _admin_id , MTPint _participant_id ) : vid ( _id ) , vaccess_hash ( _access_hash ) , vdate ( _date ) , vadmin_id ( _admin_id ) , vparticipant_id ( _participant_id ) { <nl> } <nl> <nl> class MTPDencryptedChatWaiting : public mtpData { <nl> <nl> class MTPDencryptedChatRequested : public mtpData { <nl> public : <nl> - MTPDencryptedChatRequested ( ) { <nl> - } <nl> + MTPDencryptedChatRequested ( ) = default ; <nl> MTPDencryptedChatRequested ( MTPint _id , const MTPlong & _access_hash , MTPint _date , MTPint _admin_id , MTPint _participant_id , const MTPbytes & _g_a ) : vid ( _id ) , vaccess_hash ( _access_hash ) , vdate ( _date ) , vadmin_id ( _admin_id ) , vparticipant_id ( _participant_id ) , vg_a ( _g_a ) { <nl> } <nl> <nl> class MTPDencryptedChatRequested : public mtpData { <nl> <nl> class MTPDencryptedChat : public mtpData { <nl> public : <nl> - MTPDencryptedChat ( ) { <nl> - } <nl> + MTPDencryptedChat ( ) = default ; <nl> MTPDencryptedChat ( MTPint _id , const MTPlong & _access_hash , MTPint _date , MTPint _admin_id , MTPint _participant_id , const MTPbytes & _g_a_or_b , const MTPlong & _key_fingerprint ) : vid ( _id ) , vaccess_hash ( _access_hash ) , vdate ( _date ) , vadmin_id ( _admin_id ) , vparticipant_id ( _participant_id ) , vg_a_or_b ( _g_a_or_b ) , vkey_fingerprint ( _key_fingerprint ) { <nl> } <nl> <nl> class MTPDencryptedChat : public mtpData { <nl> <nl> class MTPDencryptedChatDiscarded : public mtpData { <nl> public : <nl> - MTPDencryptedChatDiscarded ( ) { <nl> - } <nl> + MTPDencryptedChatDiscarded ( ) = default ; <nl> MTPDencryptedChatDiscarded ( MTPint _id ) : vid ( _id ) { <nl> } <nl> <nl> class MTPDencryptedChatDiscarded : public mtpData { <nl> <nl> class MTPDinputEncryptedChat : public mtpData { <nl> public : <nl> - MTPDinputEncryptedChat ( ) { <nl> - } <nl> + MTPDinputEncryptedChat ( ) = default ; <nl> MTPDinputEncryptedChat ( MTPint _chat_id , const MTPlong & _access_hash ) : vchat_id ( _chat_id ) , vaccess_hash ( _access_hash ) { <nl> } <nl> <nl> class MTPDinputEncryptedChat : public mtpData { <nl> <nl> class MTPDencryptedFile : public mtpData { <nl> public : <nl> - MTPDencryptedFile ( ) { <nl> - } <nl> + MTPDencryptedFile ( ) = default ; <nl> MTPDencryptedFile ( const MTPlong & _id , const MTPlong & _access_hash , MTPint _size , MTPint _dc_id , MTPint _key_fingerprint ) : vid ( _id ) , vaccess_hash ( _access_hash ) , vsize ( _size ) , vdc_id ( _dc_id ) , vkey_fingerprint ( _key_fingerprint ) { <nl> } <nl> <nl> class MTPDencryptedFile : public mtpData { <nl> <nl> class MTPDinputEncryptedFileUploaded : public mtpData { <nl> public : <nl> - MTPDinputEncryptedFileUploaded ( ) { <nl> - } <nl> + MTPDinputEncryptedFileUploaded ( ) = default ; <nl> MTPDinputEncryptedFileUploaded ( const MTPlong & _id , MTPint _parts , const MTPstring & _md5_checksum , MTPint _key_fingerprint ) : vid ( _id ) , vparts ( _parts ) , vmd5_checksum ( _md5_checksum ) , vkey_fingerprint ( _key_fingerprint ) { <nl> } <nl> <nl> class MTPDinputEncryptedFileUploaded : public mtpData { <nl> <nl> class MTPDinputEncryptedFile : public mtpData { <nl> public : <nl> - MTPDinputEncryptedFile ( ) { <nl> - } <nl> + MTPDinputEncryptedFile ( ) = default ; <nl> MTPDinputEncryptedFile ( const MTPlong & _id , const MTPlong & _access_hash ) : vid ( _id ) , vaccess_hash ( _access_hash ) { <nl> } <nl> <nl> class MTPDinputEncryptedFile : public mtpData { <nl> <nl> class MTPDinputEncryptedFileBigUploaded : public mtpData { <nl> public : <nl> - MTPDinputEncryptedFileBigUploaded ( ) { <nl> - } <nl> + MTPDinputEncryptedFileBigUploaded ( ) = default ; <nl> MTPDinputEncryptedFileBigUploaded ( const MTPlong & _id , MTPint _parts , MTPint _key_fingerprint ) : vid ( _id ) , vparts ( _parts ) , vkey_fingerprint ( _key_fingerprint ) { <nl> } <nl> <nl> class MTPDinputEncryptedFileBigUploaded : public mtpData { <nl> <nl> class MTPDencryptedMessage : public mtpData { <nl> public : <nl> - MTPDencryptedMessage ( ) { <nl> - } <nl> + MTPDencryptedMessage ( ) = default ; <nl> MTPDencryptedMessage ( const MTPlong & _random_id , MTPint _chat_id , MTPint _date , const MTPbytes & _bytes , const MTPEncryptedFile & _file ) : vrandom_id ( _random_id ) , vchat_id ( _chat_id ) , vdate ( _date ) , vbytes ( _bytes ) , vfile ( _file ) { <nl> } <nl> <nl> class MTPDencryptedMessage : public mtpData { <nl> <nl> class MTPDencryptedMessageService : public mtpData { <nl> public : <nl> - MTPDencryptedMessageService ( ) { <nl> - } <nl> + MTPDencryptedMessageService ( ) = default ; <nl> MTPDencryptedMessageService ( const MTPlong & _random_id , MTPint _chat_id , MTPint _date , const MTPbytes & _bytes ) : vrandom_id ( _random_id ) , vchat_id ( _chat_id ) , vdate ( _date ) , vbytes ( _bytes ) { <nl> } <nl> <nl> class MTPDencryptedMessageService : public mtpData { <nl> <nl> class MTPDmessages_dhConfigNotModified : public mtpData { <nl> public : <nl> - MTPDmessages_dhConfigNotModified ( ) { <nl> - } <nl> + MTPDmessages_dhConfigNotModified ( ) = default ; <nl> MTPDmessages_dhConfigNotModified ( const MTPbytes & _random ) : vrandom ( _random ) { <nl> } <nl> <nl> class MTPDmessages_dhConfigNotModified : public mtpData { <nl> <nl> class MTPDmessages_dhConfig : public mtpData { <nl> public : <nl> - MTPDmessages_dhConfig ( ) { <nl> - } <nl> + MTPDmessages_dhConfig ( ) = default ; <nl> MTPDmessages_dhConfig ( MTPint _g , const MTPbytes & _p , MTPint _version , const MTPbytes & _random ) : vg ( _g ) , vp ( _p ) , vversion ( _version ) , vrandom ( _random ) { <nl> } <nl> <nl> class MTPDmessages_dhConfig : public mtpData { <nl> <nl> class MTPDmessages_sentEncryptedMessage : public mtpData { <nl> public : <nl> - MTPDmessages_sentEncryptedMessage ( ) { <nl> - } <nl> + MTPDmessages_sentEncryptedMessage ( ) = default ; <nl> MTPDmessages_sentEncryptedMessage ( MTPint _date ) : vdate ( _date ) { <nl> } <nl> <nl> class MTPDmessages_sentEncryptedMessage : public mtpData { <nl> <nl> class MTPDmessages_sentEncryptedFile : public mtpData { <nl> public : <nl> - MTPDmessages_sentEncryptedFile ( ) { <nl> - } <nl> + MTPDmessages_sentEncryptedFile ( ) = default ; <nl> MTPDmessages_sentEncryptedFile ( MTPint _date , const MTPEncryptedFile & _file ) : vdate ( _date ) , vfile ( _file ) { <nl> } <nl> <nl> class MTPDmessages_sentEncryptedFile : public mtpData { <nl> <nl> class MTPDinputDocument : public mtpData { <nl> public : <nl> - MTPDinputDocument ( ) { <nl> - } <nl> + MTPDinputDocument ( ) = default ; <nl> MTPDinputDocument ( const MTPlong & _id , const MTPlong & _access_hash ) : vid ( _id ) , vaccess_hash ( _access_hash ) { <nl> } <nl> <nl> class MTPDinputDocument : public mtpData { <nl> <nl> class MTPDdocumentEmpty : public mtpData { <nl> public : <nl> - MTPDdocumentEmpty ( ) { <nl> - } <nl> + MTPDdocumentEmpty ( ) = default ; <nl> MTPDdocumentEmpty ( const MTPlong & _id ) : vid ( _id ) { <nl> } <nl> <nl> class MTPDdocumentEmpty : public mtpData { <nl> <nl> class MTPDdocument : public mtpData { <nl> public : <nl> - MTPDdocument ( ) { <nl> - } <nl> + MTPDdocument ( ) = default ; <nl> MTPDdocument ( const MTPlong & _id , const MTPlong & _access_hash , MTPint _date , const MTPstring & _mime_type , MTPint _size , const MTPPhotoSize & _thumb , MTPint _dc_id , MTPint _version , const MTPVector < MTPDocumentAttribute > & _attributes ) : vid ( _id ) , vaccess_hash ( _access_hash ) , vdate ( _date ) , vmime_type ( _mime_type ) , vsize ( _size ) , vthumb ( _thumb ) , vdc_id ( _dc_id ) , vversion ( _version ) , vattributes ( _attributes ) { <nl> } <nl> <nl> class MTPDdocument : public mtpData { <nl> <nl> class MTPDhelp_support : public mtpData { <nl> public : <nl> - MTPDhelp_support ( ) { <nl> - } <nl> + MTPDhelp_support ( ) = default ; <nl> MTPDhelp_support ( const MTPstring & _phone_number , const MTPUser & _user ) : vphone_number ( _phone_number ) , vuser ( _user ) { <nl> } <nl> <nl> class MTPDhelp_support : public mtpData { <nl> <nl> class MTPDnotifyPeer : public mtpData { <nl> public : <nl> - MTPDnotifyPeer ( ) { <nl> - } <nl> + MTPDnotifyPeer ( ) = default ; <nl> MTPDnotifyPeer ( const MTPPeer & _peer ) : vpeer ( _peer ) { <nl> } <nl> <nl> class MTPDnotifyPeer : public mtpData { <nl> <nl> class MTPDsendMessageUploadVideoAction : public mtpData { <nl> public : <nl> - MTPDsendMessageUploadVideoAction ( ) { <nl> - } <nl> + MTPDsendMessageUploadVideoAction ( ) = default ; <nl> MTPDsendMessageUploadVideoAction ( MTPint _progress ) : vprogress ( _progress ) { <nl> } <nl> <nl> class MTPDsendMessageUploadVideoAction : public mtpData { <nl> <nl> class MTPDsendMessageUploadAudioAction : public mtpData { <nl> public : <nl> - MTPDsendMessageUploadAudioAction ( ) { <nl> - } <nl> + MTPDsendMessageUploadAudioAction ( ) = default ; <nl> MTPDsendMessageUploadAudioAction ( MTPint _progress ) : vprogress ( _progress ) { <nl> } <nl> <nl> class MTPDsendMessageUploadAudioAction : public mtpData { <nl> <nl> class MTPDsendMessageUploadPhotoAction : public mtpData { <nl> public : <nl> - MTPDsendMessageUploadPhotoAction ( ) { <nl> - } <nl> + MTPDsendMessageUploadPhotoAction ( ) = default ; <nl> MTPDsendMessageUploadPhotoAction ( MTPint _progress ) : vprogress ( _progress ) { <nl> } <nl> <nl> class MTPDsendMessageUploadPhotoAction : public mtpData { <nl> <nl> class MTPDsendMessageUploadDocumentAction : public mtpData { <nl> public : <nl> - MTPDsendMessageUploadDocumentAction ( ) { <nl> - } <nl> + MTPDsendMessageUploadDocumentAction ( ) = default ; <nl> MTPDsendMessageUploadDocumentAction ( MTPint _progress ) : vprogress ( _progress ) { <nl> } <nl> <nl> class MTPDsendMessageUploadDocumentAction : public mtpData { <nl> <nl> class MTPDcontacts_found : public mtpData { <nl> public : <nl> - MTPDcontacts_found ( ) { <nl> - } <nl> + MTPDcontacts_found ( ) = default ; <nl> MTPDcontacts_found ( const MTPVector < MTPPeer > & _results , const MTPVector < MTPChat > & _chats , const MTPVector < MTPUser > & _users ) : vresults ( _results ) , vchats ( _chats ) , vusers ( _users ) { <nl> } <nl> <nl> class MTPDcontacts_found : public mtpData { <nl> <nl> class MTPDinputPrivacyValueAllowUsers : public mtpData { <nl> public : <nl> - MTPDinputPrivacyValueAllowUsers ( ) { <nl> - } <nl> + MTPDinputPrivacyValueAllowUsers ( ) = default ; <nl> MTPDinputPrivacyValueAllowUsers ( const MTPVector < MTPInputUser > & _users ) : vusers ( _users ) { <nl> } <nl> <nl> class MTPDinputPrivacyValueAllowUsers : public mtpData { <nl> <nl> class MTPDinputPrivacyValueDisallowUsers : public mtpData { <nl> public : <nl> - MTPDinputPrivacyValueDisallowUsers ( ) { <nl> - } <nl> + MTPDinputPrivacyValueDisallowUsers ( ) = default ; <nl> MTPDinputPrivacyValueDisallowUsers ( const MTPVector < MTPInputUser > & _users ) : vusers ( _users ) { <nl> } <nl> <nl> class MTPDinputPrivacyValueDisallowUsers : public mtpData { <nl> <nl> class MTPDprivacyValueAllowUsers : public mtpData { <nl> public : <nl> - MTPDprivacyValueAllowUsers ( ) { <nl> - } <nl> + MTPDprivacyValueAllowUsers ( ) = default ; <nl> MTPDprivacyValueAllowUsers ( const MTPVector < MTPint > & _users ) : vusers ( _users ) { <nl> } <nl> <nl> class MTPDprivacyValueAllowUsers : public mtpData { <nl> <nl> class MTPDprivacyValueDisallowUsers : public mtpData { <nl> public : <nl> - MTPDprivacyValueDisallowUsers ( ) { <nl> - } <nl> + MTPDprivacyValueDisallowUsers ( ) = default ; <nl> MTPDprivacyValueDisallowUsers ( const MTPVector < MTPint > & _users ) : vusers ( _users ) { <nl> } <nl> <nl> class MTPDprivacyValueDisallowUsers : public mtpData { <nl> <nl> class MTPDaccount_privacyRules : public mtpData { <nl> public : <nl> - MTPDaccount_privacyRules ( ) { <nl> - } <nl> + MTPDaccount_privacyRules ( ) = default ; <nl> MTPDaccount_privacyRules ( const MTPVector < MTPPrivacyRule > & _rules , const MTPVector < MTPUser > & _users ) : vrules ( _rules ) , vusers ( _users ) { <nl> } <nl> <nl> class MTPDaccount_privacyRules : public mtpData { <nl> <nl> class MTPDaccountDaysTTL : public mtpData { <nl> public : <nl> - MTPDaccountDaysTTL ( ) { <nl> - } <nl> + MTPDaccountDaysTTL ( ) = default ; <nl> MTPDaccountDaysTTL ( MTPint _days ) : vdays ( _days ) { <nl> } <nl> <nl> class MTPDaccountDaysTTL : public mtpData { <nl> <nl> class MTPDdocumentAttributeImageSize : public mtpData { <nl> public : <nl> - MTPDdocumentAttributeImageSize ( ) { <nl> - } <nl> + MTPDdocumentAttributeImageSize ( ) = default ; <nl> MTPDdocumentAttributeImageSize ( MTPint _w , MTPint _h ) : vw ( _w ) , vh ( _h ) { <nl> } <nl> <nl> class MTPDdocumentAttributeSticker : public mtpData { <nl> bool is_mask ( ) const { return vflags . v & Flag : : f_mask ; } <nl> bool has_mask_coords ( ) const { return vflags . v & Flag : : f_mask_coords ; } <nl> <nl> - MTPDdocumentAttributeSticker ( ) { <nl> - } <nl> + MTPDdocumentAttributeSticker ( ) = default ; <nl> MTPDdocumentAttributeSticker ( const MTPflags < MTPDdocumentAttributeSticker : : Flags > & _flags , const MTPstring & _alt , const MTPInputStickerSet & _stickerset , const MTPMaskCoords & _mask_coords ) : vflags ( _flags ) , valt ( _alt ) , vstickerset ( _stickerset ) , vmask_coords ( _mask_coords ) { <nl> } <nl> <nl> class MTPDdocumentAttributeSticker : public mtpData { <nl> <nl> class MTPDdocumentAttributeVideo : public mtpData { <nl> public : <nl> - MTPDdocumentAttributeVideo ( ) { <nl> - } <nl> + MTPDdocumentAttributeVideo ( ) = default ; <nl> MTPDdocumentAttributeVideo ( MTPint _duration , MTPint _w , MTPint _h ) : vduration ( _duration ) , vw ( _w ) , vh ( _h ) { <nl> } <nl> <nl> class MTPDdocumentAttributeAudio : public mtpData { <nl> bool has_performer ( ) const { return vflags . v & Flag : : f_performer ; } <nl> bool has_waveform ( ) const { return vflags . v & Flag : : f_waveform ; } <nl> <nl> - MTPDdocumentAttributeAudio ( ) { <nl> - } <nl> + MTPDdocumentAttributeAudio ( ) = default ; <nl> MTPDdocumentAttributeAudio ( const MTPflags < MTPDdocumentAttributeAudio : : Flags > & _flags , MTPint _duration , const MTPstring & _title , const MTPstring & _performer , const MTPbytes & _waveform ) : vflags ( _flags ) , vduration ( _duration ) , vtitle ( _title ) , vperformer ( _performer ) , vwaveform ( _waveform ) { <nl> } <nl> <nl> class MTPDdocumentAttributeAudio : public mtpData { <nl> <nl> class MTPDdocumentAttributeFilename : public mtpData { <nl> public : <nl> - MTPDdocumentAttributeFilename ( ) { <nl> - } <nl> + MTPDdocumentAttributeFilename ( ) = default ; <nl> MTPDdocumentAttributeFilename ( const MTPstring & _file_name ) : vfile_name ( _file_name ) { <nl> } <nl> <nl> class MTPDdocumentAttributeFilename : public mtpData { <nl> <nl> class MTPDmessages_stickers : public mtpData { <nl> public : <nl> - MTPDmessages_stickers ( ) { <nl> - } <nl> + MTPDmessages_stickers ( ) = default ; <nl> MTPDmessages_stickers ( const MTPstring & _hash , const MTPVector < MTPDocument > & _stickers ) : vhash ( _hash ) , vstickers ( _stickers ) { <nl> } <nl> <nl> class MTPDmessages_stickers : public mtpData { <nl> <nl> class MTPDstickerPack : public mtpData { <nl> public : <nl> - MTPDstickerPack ( ) { <nl> - } <nl> + MTPDstickerPack ( ) = default ; <nl> MTPDstickerPack ( const MTPstring & _emoticon , const MTPVector < MTPlong > & _documents ) : vemoticon ( _emoticon ) , vdocuments ( _documents ) { <nl> } <nl> <nl> class MTPDstickerPack : public mtpData { <nl> <nl> class MTPDmessages_allStickers : public mtpData { <nl> public : <nl> - MTPDmessages_allStickers ( ) { <nl> - } <nl> + MTPDmessages_allStickers ( ) = default ; <nl> MTPDmessages_allStickers ( MTPint _hash , const MTPVector < MTPStickerSet > & _sets ) : vhash ( _hash ) , vsets ( _sets ) { <nl> } <nl> <nl> class MTPDmessages_allStickers : public mtpData { <nl> <nl> class MTPDdisabledFeature : public mtpData { <nl> public : <nl> - MTPDdisabledFeature ( ) { <nl> - } <nl> + MTPDdisabledFeature ( ) = default ; <nl> MTPDdisabledFeature ( const MTPstring & _feature , const MTPstring & _description ) : vfeature ( _feature ) , vdescription ( _description ) { <nl> } <nl> <nl> class MTPDdisabledFeature : public mtpData { <nl> <nl> class MTPDmessages_affectedMessages : public mtpData { <nl> public : <nl> - MTPDmessages_affectedMessages ( ) { <nl> - } <nl> + MTPDmessages_affectedMessages ( ) = default ; <nl> MTPDmessages_affectedMessages ( MTPint _pts , MTPint _pts_count ) : vpts ( _pts ) , vpts_count ( _pts_count ) { <nl> } <nl> <nl> class MTPDmessages_affectedMessages : public mtpData { <nl> <nl> class MTPDwebPageEmpty : public mtpData { <nl> public : <nl> - MTPDwebPageEmpty ( ) { <nl> - } <nl> + MTPDwebPageEmpty ( ) = default ; <nl> MTPDwebPageEmpty ( const MTPlong & _id ) : vid ( _id ) { <nl> } <nl> <nl> class MTPDwebPageEmpty : public mtpData { <nl> <nl> class MTPDwebPagePending : public mtpData { <nl> public : <nl> - MTPDwebPagePending ( ) { <nl> - } <nl> + MTPDwebPagePending ( ) = default ; <nl> MTPDwebPagePending ( const MTPlong & _id , MTPint _date ) : vid ( _id ) , vdate ( _date ) { <nl> } <nl> <nl> class MTPDwebPage : public mtpData { <nl> bool has_document ( ) const { return vflags . v & Flag : : f_document ; } <nl> bool has_cached_page ( ) const { return vflags . v & Flag : : f_cached_page ; } <nl> <nl> - MTPDwebPage ( ) { <nl> - } <nl> + MTPDwebPage ( ) = default ; <nl> MTPDwebPage ( const MTPflags < MTPDwebPage : : Flags > & _flags , const MTPlong & _id , const MTPstring & _url , const MTPstring & _display_url , MTPint _hash , const MTPstring & _type , const MTPstring & _site_name , const MTPstring & _title , const MTPstring & _description , const MTPPhoto & _photo , const MTPstring & _embed_url , const MTPstring & _embed_type , MTPint _embed_width , MTPint _embed_height , MTPint _duration , const MTPstring & _author , const MTPDocument & _document , const MTPPage & _cached_page ) : vflags ( _flags ) , vid ( _id ) , vurl ( _url ) , vdisplay_url ( _display_url ) , vhash ( _hash ) , vtype ( _type ) , vsite_name ( _site_name ) , vtitle ( _title ) , vdescription ( _description ) , vphoto ( _photo ) , vembed_url ( _embed_url ) , vembed_type ( _embed_type ) , vembed_width ( _embed_width ) , vembed_height ( _embed_height ) , vduration ( _duration ) , vauthor ( _author ) , vdocument ( _document ) , vcached_page ( _cached_page ) { <nl> } <nl> <nl> class MTPDwebPage : public mtpData { <nl> <nl> class MTPDauthorization : public mtpData { <nl> public : <nl> - MTPDauthorization ( ) { <nl> - } <nl> + MTPDauthorization ( ) = default ; <nl> MTPDauthorization ( const MTPlong & _hash , MTPint _flags , const MTPstring & _device_model , const MTPstring & _platform , const MTPstring & _system_version , MTPint _api_id , const MTPstring & _app_name , const MTPstring & _app_version , MTPint _date_created , MTPint _date_active , const MTPstring & _ip , const MTPstring & _country , const MTPstring & _region ) : vhash ( _hash ) , vflags ( _flags ) , vdevice_model ( _device_model ) , vplatform ( _platform ) , vsystem_version ( _system_version ) , vapi_id ( _api_id ) , vapp_name ( _app_name ) , vapp_version ( _app_version ) , vdate_created ( _date_created ) , vdate_active ( _date_active ) , vip ( _ip ) , vcountry ( _country ) , vregion ( _region ) { <nl> } <nl> <nl> class MTPDauthorization : public mtpData { <nl> <nl> class MTPDaccount_authorizations : public mtpData { <nl> public : <nl> - MTPDaccount_authorizations ( ) { <nl> - } <nl> + MTPDaccount_authorizations ( ) = default ; <nl> MTPDaccount_authorizations ( const MTPVector < MTPAuthorization > & _authorizations ) : vauthorizations ( _authorizations ) { <nl> } <nl> <nl> class MTPDaccount_authorizations : public mtpData { <nl> <nl> class MTPDaccount_noPassword : public mtpData { <nl> public : <nl> - MTPDaccount_noPassword ( ) { <nl> - } <nl> + MTPDaccount_noPassword ( ) = default ; <nl> MTPDaccount_noPassword ( const MTPbytes & _new_salt , const MTPstring & _email_unconfirmed_pattern ) : vnew_salt ( _new_salt ) , vemail_unconfirmed_pattern ( _email_unconfirmed_pattern ) { <nl> } <nl> <nl> class MTPDaccount_noPassword : public mtpData { <nl> <nl> class MTPDaccount_password : public mtpData { <nl> public : <nl> - MTPDaccount_password ( ) { <nl> - } <nl> + MTPDaccount_password ( ) = default ; <nl> MTPDaccount_password ( const MTPbytes & _current_salt , const MTPbytes & _new_salt , const MTPstring & _hint , MTPBool _has_recovery , const MTPstring & _email_unconfirmed_pattern ) : vcurrent_salt ( _current_salt ) , vnew_salt ( _new_salt ) , vhint ( _hint ) , vhas_recovery ( _has_recovery ) , vemail_unconfirmed_pattern ( _email_unconfirmed_pattern ) { <nl> } <nl> <nl> class MTPDaccount_password : public mtpData { <nl> <nl> class MTPDaccount_passwordSettings : public mtpData { <nl> public : <nl> - MTPDaccount_passwordSettings ( ) { <nl> - } <nl> + MTPDaccount_passwordSettings ( ) = default ; <nl> MTPDaccount_passwordSettings ( const MTPstring & _email ) : vemail ( _email ) { <nl> } <nl> <nl> class MTPDaccount_passwordInputSettings : public mtpData { <nl> bool has_hint ( ) const { return vflags . v & Flag : : f_hint ; } <nl> bool has_email ( ) const { return vflags . v & Flag : : f_email ; } <nl> <nl> - MTPDaccount_passwordInputSettings ( ) { <nl> - } <nl> + MTPDaccount_passwordInputSettings ( ) = default ; <nl> MTPDaccount_passwordInputSettings ( const MTPflags < MTPDaccount_passwordInputSettings : : Flags > & _flags , const MTPbytes & _new_salt , const MTPbytes & _new_password_hash , const MTPstring & _hint , const MTPstring & _email ) : vflags ( _flags ) , vnew_salt ( _new_salt ) , vnew_password_hash ( _new_password_hash ) , vhint ( _hint ) , vemail ( _email ) { <nl> } <nl> <nl> class MTPDaccount_passwordInputSettings : public mtpData { <nl> <nl> class MTPDauth_passwordRecovery : public mtpData { <nl> public : <nl> - MTPDauth_passwordRecovery ( ) { <nl> - } <nl> + MTPDauth_passwordRecovery ( ) = default ; <nl> MTPDauth_passwordRecovery ( const MTPstring & _email_pattern ) : vemail_pattern ( _email_pattern ) { <nl> } <nl> <nl> class MTPDauth_passwordRecovery : public mtpData { <nl> <nl> class MTPDreceivedNotifyMessage : public mtpData { <nl> public : <nl> - MTPDreceivedNotifyMessage ( ) { <nl> - } <nl> + MTPDreceivedNotifyMessage ( ) = default ; <nl> MTPDreceivedNotifyMessage ( MTPint _id , MTPint _flags ) : vid ( _id ) , vflags ( _flags ) { <nl> } <nl> <nl> class MTPDreceivedNotifyMessage : public mtpData { <nl> <nl> class MTPDchatInviteExported : public mtpData { <nl> public : <nl> - MTPDchatInviteExported ( ) { <nl> - } <nl> + MTPDchatInviteExported ( ) = default ; <nl> MTPDchatInviteExported ( const MTPstring & _link ) : vlink ( _link ) { <nl> } <nl> <nl> class MTPDchatInviteExported : public mtpData { <nl> <nl> class MTPDchatInviteAlready : public mtpData { <nl> public : <nl> - MTPDchatInviteAlready ( ) { <nl> - } <nl> + MTPDchatInviteAlready ( ) = default ; <nl> MTPDchatInviteAlready ( const MTPChat & _chat ) : vchat ( _chat ) { <nl> } <nl> <nl> class MTPDchatInvite : public mtpData { <nl> bool is_megagroup ( ) const { return vflags . v & Flag : : f_megagroup ; } <nl> bool has_participants ( ) const { return vflags . v & Flag : : f_participants ; } <nl> <nl> - MTPDchatInvite ( ) { <nl> - } <nl> + MTPDchatInvite ( ) = default ; <nl> MTPDchatInvite ( const MTPflags < MTPDchatInvite : : Flags > & _flags , const MTPstring & _title , const MTPChatPhoto & _photo , MTPint _participants_count , const MTPVector < MTPUser > & _participants ) : vflags ( _flags ) , vtitle ( _title ) , vphoto ( _photo ) , vparticipants_count ( _participants_count ) , vparticipants ( _participants ) { <nl> } <nl> <nl> class MTPDchatInvite : public mtpData { <nl> <nl> class MTPDinputStickerSetID : public mtpData { <nl> public : <nl> - MTPDinputStickerSetID ( ) { <nl> - } <nl> + MTPDinputStickerSetID ( ) = default ; <nl> MTPDinputStickerSetID ( const MTPlong & _id , const MTPlong & _access_hash ) : vid ( _id ) , vaccess_hash ( _access_hash ) { <nl> } <nl> <nl> class MTPDinputStickerSetID : public mtpData { <nl> <nl> class MTPDinputStickerSetShortName : public mtpData { <nl> public : <nl> - MTPDinputStickerSetShortName ( ) { <nl> - } <nl> + MTPDinputStickerSetShortName ( ) = default ; <nl> MTPDinputStickerSetShortName ( const MTPstring & _short_name ) : vshort_name ( _short_name ) { <nl> } <nl> <nl> class MTPDstickerSet : public mtpData { <nl> bool is_official ( ) const { return vflags . v & Flag : : f_official ; } <nl> bool is_masks ( ) const { return vflags . v & Flag : : f_masks ; } <nl> <nl> - MTPDstickerSet ( ) { <nl> - } <nl> + MTPDstickerSet ( ) = default ; <nl> MTPDstickerSet ( const MTPflags < MTPDstickerSet : : Flags > & _flags , const MTPlong & _id , const MTPlong & _access_hash , const MTPstring & _title , const MTPstring & _short_name , MTPint _count , MTPint _hash ) : vflags ( _flags ) , vid ( _id ) , vaccess_hash ( _access_hash ) , vtitle ( _title ) , vshort_name ( _short_name ) , vcount ( _count ) , vhash ( _hash ) { <nl> } <nl> <nl> class MTPDstickerSet : public mtpData { <nl> <nl> class MTPDmessages_stickerSet : public mtpData { <nl> public : <nl> - MTPDmessages_stickerSet ( ) { <nl> - } <nl> + MTPDmessages_stickerSet ( ) = default ; <nl> MTPDmessages_stickerSet ( const MTPStickerSet & _set , const MTPVector < MTPStickerPack > & _packs , const MTPVector < MTPDocument > & _documents ) : vset ( _set ) , vpacks ( _packs ) , vdocuments ( _documents ) { <nl> } <nl> <nl> class MTPDmessages_stickerSet : public mtpData { <nl> <nl> class MTPDbotCommand : public mtpData { <nl> public : <nl> - MTPDbotCommand ( ) { <nl> - } <nl> + MTPDbotCommand ( ) = default ; <nl> MTPDbotCommand ( const MTPstring & _command , const MTPstring & _description ) : vcommand ( _command ) , vdescription ( _description ) { <nl> } <nl> <nl> class MTPDbotCommand : public mtpData { <nl> <nl> class MTPDbotInfo : public mtpData { <nl> public : <nl> - MTPDbotInfo ( ) { <nl> - } <nl> + MTPDbotInfo ( ) = default ; <nl> MTPDbotInfo ( MTPint _user_id , const MTPstring & _description , const MTPVector < MTPBotCommand > & _commands ) : vuser_id ( _user_id ) , vdescription ( _description ) , vcommands ( _commands ) { <nl> } <nl> <nl> class MTPDbotInfo : public mtpData { <nl> <nl> class MTPDkeyboardButton : public mtpData { <nl> public : <nl> - MTPDkeyboardButton ( ) { <nl> - } <nl> + MTPDkeyboardButton ( ) = default ; <nl> MTPDkeyboardButton ( const MTPstring & _text ) : vtext ( _text ) { <nl> } <nl> <nl> class MTPDkeyboardButton : public mtpData { <nl> <nl> class MTPDkeyboardButtonUrl : public mtpData { <nl> public : <nl> - MTPDkeyboardButtonUrl ( ) { <nl> - } <nl> + MTPDkeyboardButtonUrl ( ) = default ; <nl> MTPDkeyboardButtonUrl ( const MTPstring & _text , const MTPstring & _url ) : vtext ( _text ) , vurl ( _url ) { <nl> } <nl> <nl> class MTPDkeyboardButtonUrl : public mtpData { <nl> <nl> class MTPDkeyboardButtonCallback : public mtpData { <nl> public : <nl> - MTPDkeyboardButtonCallback ( ) { <nl> - } <nl> + MTPDkeyboardButtonCallback ( ) = default ; <nl> MTPDkeyboardButtonCallback ( const MTPstring & _text , const MTPbytes & _data ) : vtext ( _text ) , vdata ( _data ) { <nl> } <nl> <nl> class MTPDkeyboardButtonCallback : public mtpData { <nl> <nl> class MTPDkeyboardButtonRequestPhone : public mtpData { <nl> public : <nl> - MTPDkeyboardButtonRequestPhone ( ) { <nl> - } <nl> + MTPDkeyboardButtonRequestPhone ( ) = default ; <nl> MTPDkeyboardButtonRequestPhone ( const MTPstring & _text ) : vtext ( _text ) { <nl> } <nl> <nl> class MTPDkeyboardButtonRequestPhone : public mtpData { <nl> <nl> class MTPDkeyboardButtonRequestGeoLocation : public mtpData { <nl> public : <nl> - MTPDkeyboardButtonRequestGeoLocation ( ) { <nl> - } <nl> + MTPDkeyboardButtonRequestGeoLocation ( ) = default ; <nl> MTPDkeyboardButtonRequestGeoLocation ( const MTPstring & _text ) : vtext ( _text ) { <nl> } <nl> <nl> class MTPDkeyboardButtonSwitchInline : public mtpData { <nl> <nl> bool is_same_peer ( ) const { return vflags . v & Flag : : f_same_peer ; } <nl> <nl> - MTPDkeyboardButtonSwitchInline ( ) { <nl> - } <nl> + MTPDkeyboardButtonSwitchInline ( ) = default ; <nl> MTPDkeyboardButtonSwitchInline ( const MTPflags < MTPDkeyboardButtonSwitchInline : : Flags > & _flags , const MTPstring & _text , const MTPstring & _query ) : vflags ( _flags ) , vtext ( _text ) , vquery ( _query ) { <nl> } <nl> <nl> class MTPDkeyboardButtonSwitchInline : public mtpData { <nl> <nl> class MTPDkeyboardButtonGame : public mtpData { <nl> public : <nl> - MTPDkeyboardButtonGame ( ) { <nl> - } <nl> + MTPDkeyboardButtonGame ( ) = default ; <nl> MTPDkeyboardButtonGame ( const MTPstring & _text ) : vtext ( _text ) { <nl> } <nl> <nl> class MTPDkeyboardButtonGame : public mtpData { <nl> <nl> class MTPDkeyboardButtonRow : public mtpData { <nl> public : <nl> - MTPDkeyboardButtonRow ( ) { <nl> - } <nl> + MTPDkeyboardButtonRow ( ) = default ; <nl> MTPDkeyboardButtonRow ( const MTPVector < MTPKeyboardButton > & _buttons ) : vbuttons ( _buttons ) { <nl> } <nl> <nl> class MTPDreplyKeyboardHide : public mtpData { <nl> <nl> bool is_selective ( ) const { return vflags . v & Flag : : f_selective ; } <nl> <nl> - MTPDreplyKeyboardHide ( ) { <nl> - } <nl> + MTPDreplyKeyboardHide ( ) = default ; <nl> MTPDreplyKeyboardHide ( const MTPflags < MTPDreplyKeyboardHide : : Flags > & _flags ) : vflags ( _flags ) { <nl> } <nl> <nl> class MTPDreplyKeyboardForceReply : public mtpData { <nl> bool is_single_use ( ) const { return vflags . v & Flag : : f_single_use ; } <nl> bool is_selective ( ) const { return vflags . v & Flag : : f_selective ; } <nl> <nl> - MTPDreplyKeyboardForceReply ( ) { <nl> - } <nl> + MTPDreplyKeyboardForceReply ( ) = default ; <nl> MTPDreplyKeyboardForceReply ( const MTPflags < MTPDreplyKeyboardForceReply : : Flags > & _flags ) : vflags ( _flags ) { <nl> } <nl> <nl> class MTPDreplyKeyboardMarkup : public mtpData { <nl> bool is_single_use ( ) const { return vflags . v & Flag : : f_single_use ; } <nl> bool is_selective ( ) const { return vflags . v & Flag : : f_selective ; } <nl> <nl> - MTPDreplyKeyboardMarkup ( ) { <nl> - } <nl> + MTPDreplyKeyboardMarkup ( ) = default ; <nl> MTPDreplyKeyboardMarkup ( const MTPflags < MTPDreplyKeyboardMarkup : : Flags > & _flags , const MTPVector < MTPKeyboardButtonRow > & _rows ) : vflags ( _flags ) , vrows ( _rows ) { <nl> } <nl> <nl> class MTPDreplyKeyboardMarkup : public mtpData { <nl> <nl> class MTPDreplyInlineMarkup : public mtpData { <nl> public : <nl> - MTPDreplyInlineMarkup ( ) { <nl> - } <nl> + MTPDreplyInlineMarkup ( ) = default ; <nl> MTPDreplyInlineMarkup ( const MTPVector < MTPKeyboardButtonRow > & _rows ) : vrows ( _rows ) { <nl> } <nl> <nl> class MTPDreplyInlineMarkup : public mtpData { <nl> <nl> class MTPDhelp_appChangelog : public mtpData { <nl> public : <nl> - MTPDhelp_appChangelog ( ) { <nl> - } <nl> + MTPDhelp_appChangelog ( ) = default ; <nl> MTPDhelp_appChangelog ( const MTPstring & _message , const MTPMessageMedia & _media , const MTPVector < MTPMessageEntity > & _entities ) : vmessage ( _message ) , vmedia ( _media ) , ventities ( _entities ) { <nl> } <nl> <nl> class MTPDhelp_appChangelog : public mtpData { <nl> <nl> class MTPDmessageEntityUnknown : public mtpData { <nl> public : <nl> - MTPDmessageEntityUnknown ( ) { <nl> - } <nl> + MTPDmessageEntityUnknown ( ) = default ; <nl> MTPDmessageEntityUnknown ( MTPint _offset , MTPint _length ) : voffset ( _offset ) , vlength ( _length ) { <nl> } <nl> <nl> class MTPDmessageEntityUnknown : public mtpData { <nl> <nl> class MTPDmessageEntityMention : public mtpData { <nl> public : <nl> - MTPDmessageEntityMention ( ) { <nl> - } <nl> + MTPDmessageEntityMention ( ) = default ; <nl> MTPDmessageEntityMention ( MTPint _offset , MTPint _length ) : voffset ( _offset ) , vlength ( _length ) { <nl> } <nl> <nl> class MTPDmessageEntityMention : public mtpData { <nl> <nl> class MTPDmessageEntityHashtag : public mtpData { <nl> public : <nl> - MTPDmessageEntityHashtag ( ) { <nl> - } <nl> + MTPDmessageEntityHashtag ( ) = default ; <nl> MTPDmessageEntityHashtag ( MTPint _offset , MTPint _length ) : voffset ( _offset ) , vlength ( _length ) { <nl> } <nl> <nl> class MTPDmessageEntityHashtag : public mtpData { <nl> <nl> class MTPDmessageEntityBotCommand : public mtpData { <nl> public : <nl> - MTPDmessageEntityBotCommand ( ) { <nl> - } <nl> + MTPDmessageEntityBotCommand ( ) = default ; <nl> MTPDmessageEntityBotCommand ( MTPint _offset , MTPint _length ) : voffset ( _offset ) , vlength ( _length ) { <nl> } <nl> <nl> class MTPDmessageEntityBotCommand : public mtpData { <nl> <nl> class MTPDmessageEntityUrl : public mtpData { <nl> public : <nl> - MTPDmessageEntityUrl ( ) { <nl> - } <nl> + MTPDmessageEntityUrl ( ) = default ; <nl> MTPDmessageEntityUrl ( MTPint _offset , MTPint _length ) : voffset ( _offset ) , vlength ( _length ) { <nl> } <nl> <nl> class MTPDmessageEntityUrl : public mtpData { <nl> <nl> class MTPDmessageEntityEmail : public mtpData { <nl> public : <nl> - MTPDmessageEntityEmail ( ) { <nl> - } <nl> + MTPDmessageEntityEmail ( ) = default ; <nl> MTPDmessageEntityEmail ( MTPint _offset , MTPint _length ) : voffset ( _offset ) , vlength ( _length ) { <nl> } <nl> <nl> class MTPDmessageEntityEmail : public mtpData { <nl> <nl> class MTPDmessageEntityBold : public mtpData { <nl> public : <nl> - MTPDmessageEntityBold ( ) { <nl> - } <nl> + MTPDmessageEntityBold ( ) = default ; <nl> MTPDmessageEntityBold ( MTPint _offset , MTPint _length ) : voffset ( _offset ) , vlength ( _length ) { <nl> } <nl> <nl> class MTPDmessageEntityBold : public mtpData { <nl> <nl> class MTPDmessageEntityItalic : public mtpData { <nl> public : <nl> - MTPDmessageEntityItalic ( ) { <nl> - } <nl> + MTPDmessageEntityItalic ( ) = default ; <nl> MTPDmessageEntityItalic ( MTPint _offset , MTPint _length ) : voffset ( _offset ) , vlength ( _length ) { <nl> } <nl> <nl> class MTPDmessageEntityItalic : public mtpData { <nl> <nl> class MTPDmessageEntityCode : public mtpData { <nl> public : <nl> - MTPDmessageEntityCode ( ) { <nl> - } <nl> + MTPDmessageEntityCode ( ) = default ; <nl> MTPDmessageEntityCode ( MTPint _offset , MTPint _length ) : voffset ( _offset ) , vlength ( _length ) { <nl> } <nl> <nl> class MTPDmessageEntityCode : public mtpData { <nl> <nl> class MTPDmessageEntityPre : public mtpData { <nl> public : <nl> - MTPDmessageEntityPre ( ) { <nl> - } <nl> + MTPDmessageEntityPre ( ) = default ; <nl> MTPDmessageEntityPre ( MTPint _offset , MTPint _length , const MTPstring & _language ) : voffset ( _offset ) , vlength ( _length ) , vlanguage ( _language ) { <nl> } <nl> <nl> class MTPDmessageEntityPre : public mtpData { <nl> <nl> class MTPDmessageEntityTextUrl : public mtpData { <nl> public : <nl> - MTPDmessageEntityTextUrl ( ) { <nl> - } <nl> + MTPDmessageEntityTextUrl ( ) = default ; <nl> MTPDmessageEntityTextUrl ( MTPint _offset , MTPint _length , const MTPstring & _url ) : voffset ( _offset ) , vlength ( _length ) , vurl ( _url ) { <nl> } <nl> <nl> class MTPDmessageEntityTextUrl : public mtpData { <nl> <nl> class MTPDmessageEntityMentionName : public mtpData { <nl> public : <nl> - MTPDmessageEntityMentionName ( ) { <nl> - } <nl> + MTPDmessageEntityMentionName ( ) = default ; <nl> MTPDmessageEntityMentionName ( MTPint _offset , MTPint _length , MTPint _user_id ) : voffset ( _offset ) , vlength ( _length ) , vuser_id ( _user_id ) { <nl> } <nl> <nl> class MTPDmessageEntityMentionName : public mtpData { <nl> <nl> class MTPDinputMessageEntityMentionName : public mtpData { <nl> public : <nl> - MTPDinputMessageEntityMentionName ( ) { <nl> - } <nl> + MTPDinputMessageEntityMentionName ( ) = default ; <nl> MTPDinputMessageEntityMentionName ( MTPint _offset , MTPint _length , const MTPInputUser & _user_id ) : voffset ( _offset ) , vlength ( _length ) , vuser_id ( _user_id ) { <nl> } <nl> <nl> class MTPDinputMessageEntityMentionName : public mtpData { <nl> <nl> class MTPDinputChannel : public mtpData { <nl> public : <nl> - MTPDinputChannel ( ) { <nl> - } <nl> + MTPDinputChannel ( ) = default ; <nl> MTPDinputChannel ( MTPint _channel_id , const MTPlong & _access_hash ) : vchannel_id ( _channel_id ) , vaccess_hash ( _access_hash ) { <nl> } <nl> <nl> class MTPDinputChannel : public mtpData { <nl> <nl> class MTPDcontacts_resolvedPeer : public mtpData { <nl> public : <nl> - MTPDcontacts_resolvedPeer ( ) { <nl> - } <nl> + MTPDcontacts_resolvedPeer ( ) = default ; <nl> MTPDcontacts_resolvedPeer ( const MTPPeer & _peer , const MTPVector < MTPChat > & _chats , const MTPVector < MTPUser > & _users ) : vpeer ( _peer ) , vchats ( _chats ) , vusers ( _users ) { <nl> } <nl> <nl> class MTPDcontacts_resolvedPeer : public mtpData { <nl> <nl> class MTPDmessageRange : public mtpData { <nl> public : <nl> - MTPDmessageRange ( ) { <nl> - } <nl> + MTPDmessageRange ( ) = default ; <nl> MTPDmessageRange ( MTPint _min_id , MTPint _max_id ) : vmin_id ( _min_id ) , vmax_id ( _max_id ) { <nl> } <nl> <nl> class MTPDupdates_channelDifferenceEmpty : public mtpData { <nl> bool is_final ( ) const { return vflags . v & Flag : : f_final ; } <nl> bool has_timeout ( ) const { return vflags . v & Flag : : f_timeout ; } <nl> <nl> - MTPDupdates_channelDifferenceEmpty ( ) { <nl> - } <nl> + MTPDupdates_channelDifferenceEmpty ( ) = default ; <nl> MTPDupdates_channelDifferenceEmpty ( const MTPflags < MTPDupdates_channelDifferenceEmpty : : Flags > & _flags , MTPint _pts , MTPint _timeout ) : vflags ( _flags ) , vpts ( _pts ) , vtimeout ( _timeout ) { <nl> } <nl> <nl> class MTPDupdates_channelDifferenceTooLong : public mtpData { <nl> bool is_final ( ) const { return vflags . v & Flag : : f_final ; } <nl> bool has_timeout ( ) const { return vflags . v & Flag : : f_timeout ; } <nl> <nl> - MTPDupdates_channelDifferenceTooLong ( ) { <nl> - } <nl> + MTPDupdates_channelDifferenceTooLong ( ) = default ; <nl> MTPDupdates_channelDifferenceTooLong ( const MTPflags < MTPDupdates_channelDifferenceTooLong : : Flags > & _flags , MTPint _pts , MTPint _timeout , MTPint _top_message , MTPint _read_inbox_max_id , MTPint _read_outbox_max_id , MTPint _unread_count , const MTPVector < MTPMessage > & _messages , const MTPVector < MTPChat > & _chats , const MTPVector < MTPUser > & _users ) : vflags ( _flags ) , vpts ( _pts ) , vtimeout ( _timeout ) , vtop_message ( _top_message ) , vread_inbox_max_id ( _read_inbox_max_id ) , vread_outbox_max_id ( _read_outbox_max_id ) , vunread_count ( _unread_count ) , vmessages ( _messages ) , vchats ( _chats ) , vusers ( _users ) { <nl> } <nl> <nl> class MTPDupdates_channelDifference : public mtpData { <nl> bool is_final ( ) const { return vflags . v & Flag : : f_final ; } <nl> bool has_timeout ( ) const { return vflags . v & Flag : : f_timeout ; } <nl> <nl> - MTPDupdates_channelDifference ( ) { <nl> - } <nl> + MTPDupdates_channelDifference ( ) = default ; <nl> MTPDupdates_channelDifference ( const MTPflags < MTPDupdates_channelDifference : : Flags > & _flags , MTPint _pts , MTPint _timeout , const MTPVector < MTPMessage > & _new_messages , const MTPVector < MTPUpdate > & _other_updates , const MTPVector < MTPChat > & _chats , const MTPVector < MTPUser > & _users ) : vflags ( _flags ) , vpts ( _pts ) , vtimeout ( _timeout ) , vnew_messages ( _new_messages ) , vother_updates ( _other_updates ) , vchats ( _chats ) , vusers ( _users ) { <nl> } <nl> <nl> class MTPDchannelMessagesFilter : public mtpData { <nl> <nl> bool is_exclude_new_messages ( ) const { return vflags . v & Flag : : f_exclude_new_messages ; } <nl> <nl> - MTPDchannelMessagesFilter ( ) { <nl> - } <nl> + MTPDchannelMessagesFilter ( ) = default ; <nl> MTPDchannelMessagesFilter ( const MTPflags < MTPDchannelMessagesFilter : : Flags > & _flags , const MTPVector < MTPMessageRange > & _ranges ) : vflags ( _flags ) , vranges ( _ranges ) { <nl> } <nl> <nl> class MTPDchannelMessagesFilter : public mtpData { <nl> <nl> class MTPDchannelParticipant : public mtpData { <nl> public : <nl> - MTPDchannelParticipant ( ) { <nl> - } <nl> + MTPDchannelParticipant ( ) = default ; <nl> MTPDchannelParticipant ( MTPint _user_id , MTPint _date ) : vuser_id ( _user_id ) , vdate ( _date ) { <nl> } <nl> <nl> class MTPDchannelParticipant : public mtpData { <nl> <nl> class MTPDchannelParticipantSelf : public mtpData { <nl> public : <nl> - MTPDchannelParticipantSelf ( ) { <nl> - } <nl> + MTPDchannelParticipantSelf ( ) = default ; <nl> MTPDchannelParticipantSelf ( MTPint _user_id , MTPint _inviter_id , MTPint _date ) : vuser_id ( _user_id ) , vinviter_id ( _inviter_id ) , vdate ( _date ) { <nl> } <nl> <nl> class MTPDchannelParticipantSelf : public mtpData { <nl> <nl> class MTPDchannelParticipantModerator : public mtpData { <nl> public : <nl> - MTPDchannelParticipantModerator ( ) { <nl> - } <nl> + MTPDchannelParticipantModerator ( ) = default ; <nl> MTPDchannelParticipantModerator ( MTPint _user_id , MTPint _inviter_id , MTPint _date ) : vuser_id ( _user_id ) , vinviter_id ( _inviter_id ) , vdate ( _date ) { <nl> } <nl> <nl> class MTPDchannelParticipantModerator : public mtpData { <nl> <nl> class MTPDchannelParticipantEditor : public mtpData { <nl> public : <nl> - MTPDchannelParticipantEditor ( ) { <nl> - } <nl> + MTPDchannelParticipantEditor ( ) = default ; <nl> MTPDchannelParticipantEditor ( MTPint _user_id , MTPint _inviter_id , MTPint _date ) : vuser_id ( _user_id ) , vinviter_id ( _inviter_id ) , vdate ( _date ) { <nl> } <nl> <nl> class MTPDchannelParticipantEditor : public mtpData { <nl> <nl> class MTPDchannelParticipantKicked : public mtpData { <nl> public : <nl> - MTPDchannelParticipantKicked ( ) { <nl> - } <nl> + MTPDchannelParticipantKicked ( ) = default ; <nl> MTPDchannelParticipantKicked ( MTPint _user_id , MTPint _kicked_by , MTPint _date ) : vuser_id ( _user_id ) , vkicked_by ( _kicked_by ) , vdate ( _date ) { <nl> } <nl> <nl> class MTPDchannelParticipantKicked : public mtpData { <nl> <nl> class MTPDchannelParticipantCreator : public mtpData { <nl> public : <nl> - MTPDchannelParticipantCreator ( ) { <nl> - } <nl> + MTPDchannelParticipantCreator ( ) = default ; <nl> MTPDchannelParticipantCreator ( MTPint _user_id ) : vuser_id ( _user_id ) { <nl> } <nl> <nl> class MTPDchannelParticipantCreator : public mtpData { <nl> <nl> class MTPDchannels_channelParticipants : public mtpData { <nl> public : <nl> - MTPDchannels_channelParticipants ( ) { <nl> - } <nl> + MTPDchannels_channelParticipants ( ) = default ; <nl> MTPDchannels_channelParticipants ( MTPint _count , const MTPVector < MTPChannelParticipant > & _participants , const MTPVector < MTPUser > & _users ) : vcount ( _count ) , vparticipants ( _participants ) , vusers ( _users ) { <nl> } <nl> <nl> class MTPDchannels_channelParticipants : public mtpData { <nl> <nl> class MTPDchannels_channelParticipant : public mtpData { <nl> public : <nl> - MTPDchannels_channelParticipant ( ) { <nl> - } <nl> + MTPDchannels_channelParticipant ( ) = default ; <nl> MTPDchannels_channelParticipant ( const MTPChannelParticipant & _participant , const MTPVector < MTPUser > & _users ) : vparticipant ( _participant ) , vusers ( _users ) { <nl> } <nl> <nl> class MTPDchannels_channelParticipant : public mtpData { <nl> <nl> class MTPDhelp_termsOfService : public mtpData { <nl> public : <nl> - MTPDhelp_termsOfService ( ) { <nl> - } <nl> + MTPDhelp_termsOfService ( ) = default ; <nl> MTPDhelp_termsOfService ( const MTPstring & _text ) : vtext ( _text ) { <nl> } <nl> <nl> class MTPDhelp_termsOfService : public mtpData { <nl> <nl> class MTPDfoundGif : public mtpData { <nl> public : <nl> - MTPDfoundGif ( ) { <nl> - } <nl> + MTPDfoundGif ( ) = default ; <nl> MTPDfoundGif ( const MTPstring & _url , const MTPstring & _thumb_url , const MTPstring & _content_url , const MTPstring & _content_type , MTPint _w , MTPint _h ) : vurl ( _url ) , vthumb_url ( _thumb_url ) , vcontent_url ( _content_url ) , vcontent_type ( _content_type ) , vw ( _w ) , vh ( _h ) { <nl> } <nl> <nl> class MTPDfoundGif : public mtpData { <nl> <nl> class MTPDfoundGifCached : public mtpData { <nl> public : <nl> - MTPDfoundGifCached ( ) { <nl> - } <nl> + MTPDfoundGifCached ( ) = default ; <nl> MTPDfoundGifCached ( const MTPstring & _url , const MTPPhoto & _photo , const MTPDocument & _document ) : vurl ( _url ) , vphoto ( _photo ) , vdocument ( _document ) { <nl> } <nl> <nl> class MTPDfoundGifCached : public mtpData { <nl> <nl> class MTPDmessages_foundGifs : public mtpData { <nl> public : <nl> - MTPDmessages_foundGifs ( ) { <nl> - } <nl> + MTPDmessages_foundGifs ( ) = default ; <nl> MTPDmessages_foundGifs ( MTPint _next_offset , const MTPVector < MTPFoundGif > & _results ) : vnext_offset ( _next_offset ) , vresults ( _results ) { <nl> } <nl> <nl> class MTPDmessages_foundGifs : public mtpData { <nl> <nl> class MTPDmessages_savedGifs : public mtpData { <nl> public : <nl> - MTPDmessages_savedGifs ( ) { <nl> - } <nl> + MTPDmessages_savedGifs ( ) = default ; <nl> MTPDmessages_savedGifs ( MTPint _hash , const MTPVector < MTPDocument > & _gifs ) : vhash ( _hash ) , vgifs ( _gifs ) { <nl> } <nl> <nl> class MTPDinputBotInlineMessageMediaAuto : public mtpData { <nl> <nl> bool has_reply_markup ( ) const { return vflags . v & Flag : : f_reply_markup ; } <nl> <nl> - MTPDinputBotInlineMessageMediaAuto ( ) { <nl> - } <nl> + MTPDinputBotInlineMessageMediaAuto ( ) = default ; <nl> MTPDinputBotInlineMessageMediaAuto ( const MTPflags < MTPDinputBotInlineMessageMediaAuto : : Flags > & _flags , const MTPstring & _caption , const MTPReplyMarkup & _reply_markup ) : vflags ( _flags ) , vcaption ( _caption ) , vreply_markup ( _reply_markup ) { <nl> } <nl> <nl> class MTPDinputBotInlineMessageText : public mtpData { <nl> bool has_entities ( ) const { return vflags . v & Flag : : f_entities ; } <nl> bool has_reply_markup ( ) const { return vflags . v & Flag : : f_reply_markup ; } <nl> <nl> - MTPDinputBotInlineMessageText ( ) { <nl> - } <nl> + MTPDinputBotInlineMessageText ( ) = default ; <nl> MTPDinputBotInlineMessageText ( const MTPflags < MTPDinputBotInlineMessageText : : Flags > & _flags , const MTPstring & _message , const MTPVector < MTPMessageEntity > & _entities , const MTPReplyMarkup & _reply_markup ) : vflags ( _flags ) , vmessage ( _message ) , ventities ( _entities ) , vreply_markup ( _reply_markup ) { <nl> } <nl> <nl> class MTPDinputBotInlineMessageMediaGeo : public mtpData { <nl> <nl> bool has_reply_markup ( ) const { return vflags . v & Flag : : f_reply_markup ; } <nl> <nl> - MTPDinputBotInlineMessageMediaGeo ( ) { <nl> - } <nl> + MTPDinputBotInlineMessageMediaGeo ( ) = default ; <nl> MTPDinputBotInlineMessageMediaGeo ( const MTPflags < MTPDinputBotInlineMessageMediaGeo : : Flags > & _flags , const MTPInputGeoPoint & _geo_point , const MTPReplyMarkup & _reply_markup ) : vflags ( _flags ) , vgeo_point ( _geo_point ) , vreply_markup ( _reply_markup ) { <nl> } <nl> <nl> class MTPDinputBotInlineMessageMediaVenue : public mtpData { <nl> <nl> bool has_reply_markup ( ) const { return vflags . v & Flag : : f_reply_markup ; } <nl> <nl> - MTPDinputBotInlineMessageMediaVenue ( ) { <nl> - } <nl> + MTPDinputBotInlineMessageMediaVenue ( ) = default ; <nl> MTPDinputBotInlineMessageMediaVenue ( const MTPflags < MTPDinputBotInlineMessageMediaVenue : : Flags > & _flags , const MTPInputGeoPoint & _geo_point , const MTPstring & _title , const MTPstring & _address , const MTPstring & _provider , const MTPstring & _venue_id , const MTPReplyMarkup & _reply_markup ) : vflags ( _flags ) , vgeo_point ( _geo_point ) , vtitle ( _title ) , vaddress ( _address ) , vprovider ( _provider ) , vvenue_id ( _venue_id ) , vreply_markup ( _reply_markup ) { <nl> } <nl> <nl> class MTPDinputBotInlineMessageMediaContact : public mtpData { <nl> <nl> bool has_reply_markup ( ) const { return vflags . v & Flag : : f_reply_markup ; } <nl> <nl> - MTPDinputBotInlineMessageMediaContact ( ) { <nl> - } <nl> + MTPDinputBotInlineMessageMediaContact ( ) = default ; <nl> MTPDinputBotInlineMessageMediaContact ( const MTPflags < MTPDinputBotInlineMessageMediaContact : : Flags > & _flags , const MTPstring & _phone_number , const MTPstring & _first_name , const MTPstring & _last_name , const MTPReplyMarkup & _reply_markup ) : vflags ( _flags ) , vphone_number ( _phone_number ) , vfirst_name ( _first_name ) , vlast_name ( _last_name ) , vreply_markup ( _reply_markup ) { <nl> } <nl> <nl> class MTPDinputBotInlineMessageGame : public mtpData { <nl> <nl> bool has_reply_markup ( ) const { return vflags . v & Flag : : f_reply_markup ; } <nl> <nl> - MTPDinputBotInlineMessageGame ( ) { <nl> - } <nl> + MTPDinputBotInlineMessageGame ( ) = default ; <nl> MTPDinputBotInlineMessageGame ( const MTPflags < MTPDinputBotInlineMessageGame : : Flags > & _flags , const MTPReplyMarkup & _reply_markup ) : vflags ( _flags ) , vreply_markup ( _reply_markup ) { <nl> } <nl> <nl> class MTPDinputBotInlineResult : public mtpData { <nl> bool has_h ( ) const { return vflags . v & Flag : : f_h ; } <nl> bool has_duration ( ) const { return vflags . v & Flag : : f_duration ; } <nl> <nl> - MTPDinputBotInlineResult ( ) { <nl> - } <nl> + MTPDinputBotInlineResult ( ) = default ; <nl> MTPDinputBotInlineResult ( const MTPflags < MTPDinputBotInlineResult : : Flags > & _flags , const MTPstring & _id , const MTPstring & _type , const MTPstring & _title , const MTPstring & _description , const MTPstring & _url , const MTPstring & _thumb_url , const MTPstring & _content_url , const MTPstring & _content_type , MTPint _w , MTPint _h , MTPint _duration , const MTPInputBotInlineMessage & _send_message ) : vflags ( _flags ) , vid ( _id ) , vtype ( _type ) , vtitle ( _title ) , vdescription ( _description ) , vurl ( _url ) , vthumb_url ( _thumb_url ) , vcontent_url ( _content_url ) , vcontent_type ( _content_type ) , vw ( _w ) , vh ( _h ) , vduration ( _duration ) , vsend_message ( _send_message ) { <nl> } <nl> <nl> class MTPDinputBotInlineResult : public mtpData { <nl> <nl> class MTPDinputBotInlineResultPhoto : public mtpData { <nl> public : <nl> - MTPDinputBotInlineResultPhoto ( ) { <nl> - } <nl> + MTPDinputBotInlineResultPhoto ( ) = default ; <nl> MTPDinputBotInlineResultPhoto ( const MTPstring & _id , const MTPstring & _type , const MTPInputPhoto & _photo , const MTPInputBotInlineMessage & _send_message ) : vid ( _id ) , vtype ( _type ) , vphoto ( _photo ) , vsend_message ( _send_message ) { <nl> } <nl> <nl> class MTPDinputBotInlineResultDocument : public mtpData { <nl> bool has_title ( ) const { return vflags . v & Flag : : f_title ; } <nl> bool has_description ( ) const { return vflags . v & Flag : : f_description ; } <nl> <nl> - MTPDinputBotInlineResultDocument ( ) { <nl> - } <nl> + MTPDinputBotInlineResultDocument ( ) = default ; <nl> MTPDinputBotInlineResultDocument ( const MTPflags < MTPDinputBotInlineResultDocument : : Flags > & _flags , const MTPstring & _id , const MTPstring & _type , const MTPstring & _title , const MTPstring & _description , const MTPInputDocument & _document , const MTPInputBotInlineMessage & _send_message ) : vflags ( _flags ) , vid ( _id ) , vtype ( _type ) , vtitle ( _title ) , vdescription ( _description ) , vdocument ( _document ) , vsend_message ( _send_message ) { <nl> } <nl> <nl> class MTPDinputBotInlineResultDocument : public mtpData { <nl> <nl> class MTPDinputBotInlineResultGame : public mtpData { <nl> public : <nl> - MTPDinputBotInlineResultGame ( ) { <nl> - } <nl> + MTPDinputBotInlineResultGame ( ) = default ; <nl> MTPDinputBotInlineResultGame ( const MTPstring & _id , const MTPstring & _short_name , const MTPInputBotInlineMessage & _send_message ) : vid ( _id ) , vshort_name ( _short_name ) , vsend_message ( _send_message ) { <nl> } <nl> <nl> class MTPDbotInlineMessageMediaAuto : public mtpData { <nl> <nl> bool has_reply_markup ( ) const { return vflags . v & Flag : : f_reply_markup ; } <nl> <nl> - MTPDbotInlineMessageMediaAuto ( ) { <nl> - } <nl> + MTPDbotInlineMessageMediaAuto ( ) = default ; <nl> MTPDbotInlineMessageMediaAuto ( const MTPflags < MTPDbotInlineMessageMediaAuto : : Flags > & _flags , const MTPstring & _caption , const MTPReplyMarkup & _reply_markup ) : vflags ( _flags ) , vcaption ( _caption ) , vreply_markup ( _reply_markup ) { <nl> } <nl> <nl> class MTPDbotInlineMessageText : public mtpData { <nl> bool has_entities ( ) const { return vflags . v & Flag : : f_entities ; } <nl> bool has_reply_markup ( ) const { return vflags . v & Flag : : f_reply_markup ; } <nl> <nl> - MTPDbotInlineMessageText ( ) { <nl> - } <nl> + MTPDbotInlineMessageText ( ) = default ; <nl> MTPDbotInlineMessageText ( const MTPflags < MTPDbotInlineMessageText : : Flags > & _flags , const MTPstring & _message , const MTPVector < MTPMessageEntity > & _entities , const MTPReplyMarkup & _reply_markup ) : vflags ( _flags ) , vmessage ( _message ) , ventities ( _entities ) , vreply_markup ( _reply_markup ) { <nl> } <nl> <nl> class MTPDbotInlineMessageMediaGeo : public mtpData { <nl> <nl> bool has_reply_markup ( ) const { return vflags . v & Flag : : f_reply_markup ; } <nl> <nl> - MTPDbotInlineMessageMediaGeo ( ) { <nl> - } <nl> + MTPDbotInlineMessageMediaGeo ( ) = default ; <nl> MTPDbotInlineMessageMediaGeo ( const MTPflags < MTPDbotInlineMessageMediaGeo : : Flags > & _flags , const MTPGeoPoint & _geo , const MTPReplyMarkup & _reply_markup ) : vflags ( _flags ) , vgeo ( _geo ) , vreply_markup ( _reply_markup ) { <nl> } <nl> <nl> class MTPDbotInlineMessageMediaVenue : public mtpData { <nl> <nl> bool has_reply_markup ( ) const { return vflags . v & Flag : : f_reply_markup ; } <nl> <nl> - MTPDbotInlineMessageMediaVenue ( ) { <nl> - } <nl> + MTPDbotInlineMessageMediaVenue ( ) = default ; <nl> MTPDbotInlineMessageMediaVenue ( const MTPflags < MTPDbotInlineMessageMediaVenue : : Flags > & _flags , const MTPGeoPoint & _geo , const MTPstring & _title , const MTPstring & _address , const MTPstring & _provider , const MTPstring & _venue_id , const MTPReplyMarkup & _reply_markup ) : vflags ( _flags ) , vgeo ( _geo ) , vtitle ( _title ) , vaddress ( _address ) , vprovider ( _provider ) , vvenue_id ( _venue_id ) , vreply_markup ( _reply_markup ) { <nl> } <nl> <nl> class MTPDbotInlineMessageMediaContact : public mtpData { <nl> <nl> bool has_reply_markup ( ) const { return vflags . v & Flag : : f_reply_markup ; } <nl> <nl> - MTPDbotInlineMessageMediaContact ( ) { <nl> - } <nl> + MTPDbotInlineMessageMediaContact ( ) = default ; <nl> MTPDbotInlineMessageMediaContact ( const MTPflags < MTPDbotInlineMessageMediaContact : : Flags > & _flags , const MTPstring & _phone_number , const MTPstring & _first_name , const MTPstring & _last_name , const MTPReplyMarkup & _reply_markup ) : vflags ( _flags ) , vphone_number ( _phone_number ) , vfirst_name ( _first_name ) , vlast_name ( _last_name ) , vreply_markup ( _reply_markup ) { <nl> } <nl> <nl> class MTPDbotInlineResult : public mtpData { <nl> bool has_h ( ) const { return vflags . v & Flag : : f_h ; } <nl> bool has_duration ( ) const { return vflags . v & Flag : : f_duration ; } <nl> <nl> - MTPDbotInlineResult ( ) { <nl> - } <nl> + MTPDbotInlineResult ( ) = default ; <nl> MTPDbotInlineResult ( const MTPflags < MTPDbotInlineResult : : Flags > & _flags , const MTPstring & _id , const MTPstring & _type , const MTPstring & _title , const MTPstring & _description , const MTPstring & _url , const MTPstring & _thumb_url , const MTPstring & _content_url , const MTPstring & _content_type , MTPint _w , MTPint _h , MTPint _duration , const MTPBotInlineMessage & _send_message ) : vflags ( _flags ) , vid ( _id ) , vtype ( _type ) , vtitle ( _title ) , vdescription ( _description ) , vurl ( _url ) , vthumb_url ( _thumb_url ) , vcontent_url ( _content_url ) , vcontent_type ( _content_type ) , vw ( _w ) , vh ( _h ) , vduration ( _duration ) , vsend_message ( _send_message ) { <nl> } <nl> <nl> class MTPDbotInlineMediaResult : public mtpData { <nl> bool has_title ( ) const { return vflags . v & Flag : : f_title ; } <nl> bool has_description ( ) const { return vflags . v & Flag : : f_description ; } <nl> <nl> - MTPDbotInlineMediaResult ( ) { <nl> - } <nl> + MTPDbotInlineMediaResult ( ) = default ; <nl> MTPDbotInlineMediaResult ( const MTPflags < MTPDbotInlineMediaResult : : Flags > & _flags , const MTPstring & _id , const MTPstring & _type , const MTPPhoto & _photo , const MTPDocument & _document , const MTPstring & _title , const MTPstring & _description , const MTPBotInlineMessage & _send_message ) : vflags ( _flags ) , vid ( _id ) , vtype ( _type ) , vphoto ( _photo ) , vdocument ( _document ) , vtitle ( _title ) , vdescription ( _description ) , vsend_message ( _send_message ) { <nl> } <nl> <nl> class MTPDmessages_botResults : public mtpData { <nl> bool has_next_offset ( ) const { return vflags . v & Flag : : f_next_offset ; } <nl> bool has_switch_pm ( ) const { return vflags . v & Flag : : f_switch_pm ; } <nl> <nl> - MTPDmessages_botResults ( ) { <nl> - } <nl> + MTPDmessages_botResults ( ) = default ; <nl> MTPDmessages_botResults ( const MTPflags < MTPDmessages_botResults : : Flags > & _flags , const MTPlong & _query_id , const MTPstring & _next_offset , const MTPInlineBotSwitchPM & _switch_pm , const MTPVector < MTPBotInlineResult > & _results , MTPint _cache_time ) : vflags ( _flags ) , vquery_id ( _query_id ) , vnext_offset ( _next_offset ) , vswitch_pm ( _switch_pm ) , vresults ( _results ) , vcache_time ( _cache_time ) { <nl> } <nl> <nl> class MTPDmessages_botResults : public mtpData { <nl> <nl> class MTPDexportedMessageLink : public mtpData { <nl> public : <nl> - MTPDexportedMessageLink ( ) { <nl> - } <nl> + MTPDexportedMessageLink ( ) = default ; <nl> MTPDexportedMessageLink ( const MTPstring & _link ) : vlink ( _link ) { <nl> } <nl> <nl> class MTPDmessageFwdHeader : public mtpData { <nl> bool has_channel_id ( ) const { return vflags . v & Flag : : f_channel_id ; } <nl> bool has_channel_post ( ) const { return vflags . v & Flag : : f_channel_post ; } <nl> <nl> - MTPDmessageFwdHeader ( ) { <nl> - } <nl> + MTPDmessageFwdHeader ( ) = default ; <nl> MTPDmessageFwdHeader ( const MTPflags < MTPDmessageFwdHeader : : Flags > & _flags , MTPint _from_id , MTPint _date , MTPint _channel_id , MTPint _channel_post ) : vflags ( _flags ) , vfrom_id ( _from_id ) , vdate ( _date ) , vchannel_id ( _channel_id ) , vchannel_post ( _channel_post ) { <nl> } <nl> <nl> class MTPDmessageFwdHeader : public mtpData { <nl> <nl> class MTPDauth_sentCodeTypeApp : public mtpData { <nl> public : <nl> - MTPDauth_sentCodeTypeApp ( ) { <nl> - } <nl> + MTPDauth_sentCodeTypeApp ( ) = default ; <nl> MTPDauth_sentCodeTypeApp ( MTPint _length ) : vlength ( _length ) { <nl> } <nl> <nl> class MTPDauth_sentCodeTypeApp : public mtpData { <nl> <nl> class MTPDauth_sentCodeTypeSms : public mtpData { <nl> public : <nl> - MTPDauth_sentCodeTypeSms ( ) { <nl> - } <nl> + MTPDauth_sentCodeTypeSms ( ) = default ; <nl> MTPDauth_sentCodeTypeSms ( MTPint _length ) : vlength ( _length ) { <nl> } <nl> <nl> class MTPDauth_sentCodeTypeSms : public mtpData { <nl> <nl> class MTPDauth_sentCodeTypeCall : public mtpData { <nl> public : <nl> - MTPDauth_sentCodeTypeCall ( ) { <nl> - } <nl> + MTPDauth_sentCodeTypeCall ( ) = default ; <nl> MTPDauth_sentCodeTypeCall ( MTPint _length ) : vlength ( _length ) { <nl> } <nl> <nl> class MTPDauth_sentCodeTypeCall : public mtpData { <nl> <nl> class MTPDauth_sentCodeTypeFlashCall : public mtpData { <nl> public : <nl> - MTPDauth_sentCodeTypeFlashCall ( ) { <nl> - } <nl> + MTPDauth_sentCodeTypeFlashCall ( ) = default ; <nl> MTPDauth_sentCodeTypeFlashCall ( const MTPstring & _pattern ) : vpattern ( _pattern ) { <nl> } <nl> <nl> class MTPDmessages_botCallbackAnswer : public mtpData { <nl> bool has_message ( ) const { return vflags . v & Flag : : f_message ; } <nl> bool has_url ( ) const { return vflags . v & Flag : : f_url ; } <nl> <nl> - MTPDmessages_botCallbackAnswer ( ) { <nl> - } <nl> + MTPDmessages_botCallbackAnswer ( ) = default ; <nl> MTPDmessages_botCallbackAnswer ( const MTPflags < MTPDmessages_botCallbackAnswer : : Flags > & _flags , const MTPstring & _message , const MTPstring & _url , MTPint _cache_time ) : vflags ( _flags ) , vmessage ( _message ) , vurl ( _url ) , vcache_time ( _cache_time ) { <nl> } <nl> <nl> class MTPDmessages_messageEditData : public mtpData { <nl> <nl> bool is_caption ( ) const { return vflags . v & Flag : : f_caption ; } <nl> <nl> - MTPDmessages_messageEditData ( ) { <nl> - } <nl> + MTPDmessages_messageEditData ( ) = default ; <nl> MTPDmessages_messageEditData ( const MTPflags < MTPDmessages_messageEditData : : Flags > & _flags ) : vflags ( _flags ) { <nl> } <nl> <nl> class MTPDmessages_messageEditData : public mtpData { <nl> <nl> class MTPDinputBotInlineMessageID : public mtpData { <nl> public : <nl> - MTPDinputBotInlineMessageID ( ) { <nl> - } <nl> + MTPDinputBotInlineMessageID ( ) = default ; <nl> MTPDinputBotInlineMessageID ( MTPint _dc_id , const MTPlong & _id , const MTPlong & _access_hash ) : vdc_id ( _dc_id ) , vid ( _id ) , vaccess_hash ( _access_hash ) { <nl> } <nl> <nl> class MTPDinputBotInlineMessageID : public mtpData { <nl> <nl> class MTPDinlineBotSwitchPM : public mtpData { <nl> public : <nl> - MTPDinlineBotSwitchPM ( ) { <nl> - } <nl> + MTPDinlineBotSwitchPM ( ) = default ; <nl> MTPDinlineBotSwitchPM ( const MTPstring & _text , const MTPstring & _start_param ) : vtext ( _text ) , vstart_param ( _start_param ) { <nl> } <nl> <nl> class MTPDinlineBotSwitchPM : public mtpData { <nl> <nl> class MTPDmessages_peerDialogs : public mtpData { <nl> public : <nl> - MTPDmessages_peerDialogs ( ) { <nl> - } <nl> + MTPDmessages_peerDialogs ( ) = default ; <nl> MTPDmessages_peerDialogs ( const MTPVector < MTPDialog > & _dialogs , const MTPVector < MTPMessage > & _messages , const MTPVector < MTPChat > & _chats , const MTPVector < MTPUser > & _users , const MTPupdates_State & _state ) : vdialogs ( _dialogs ) , vmessages ( _messages ) , vchats ( _chats ) , vusers ( _users ) , vstate ( _state ) { <nl> } <nl> <nl> class MTPDmessages_peerDialogs : public mtpData { <nl> <nl> class MTPDtopPeer : public mtpData { <nl> public : <nl> - MTPDtopPeer ( ) { <nl> - } <nl> + MTPDtopPeer ( ) = default ; <nl> MTPDtopPeer ( const MTPPeer & _peer , const MTPdouble & _rating ) : vpeer ( _peer ) , vrating ( _rating ) { <nl> } <nl> <nl> class MTPDtopPeer : public mtpData { <nl> <nl> class MTPDtopPeerCategoryPeers : public mtpData { <nl> public : <nl> - MTPDtopPeerCategoryPeers ( ) { <nl> - } <nl> + MTPDtopPeerCategoryPeers ( ) = default ; <nl> MTPDtopPeerCategoryPeers ( const MTPTopPeerCategory & _category , MTPint _count , const MTPVector < MTPTopPeer > & _peers ) : vcategory ( _category ) , vcount ( _count ) , vpeers ( _peers ) { <nl> } <nl> <nl> class MTPDtopPeerCategoryPeers : public mtpData { <nl> <nl> class MTPDcontacts_topPeers : public mtpData { <nl> public : <nl> - MTPDcontacts_topPeers ( ) { <nl> - } <nl> + MTPDcontacts_topPeers ( ) = default ; <nl> MTPDcontacts_topPeers ( const MTPVector < MTPTopPeerCategoryPeers > & _categories , const MTPVector < MTPChat > & _chats , const MTPVector < MTPUser > & _users ) : vcategories ( _categories ) , vchats ( _chats ) , vusers ( _users ) { <nl> } <nl> <nl> class MTPDdraftMessage : public mtpData { <nl> bool has_reply_to_msg_id ( ) const { return vflags . v & Flag : : f_reply_to_msg_id ; } <nl> bool has_entities ( ) const { return vflags . v & Flag : : f_entities ; } <nl> <nl> - MTPDdraftMessage ( ) { <nl> - } <nl> + MTPDdraftMessage ( ) = default ; <nl> MTPDdraftMessage ( const MTPflags < MTPDdraftMessage : : Flags > & _flags , MTPint _reply_to_msg_id , const MTPstring & _message , const MTPVector < MTPMessageEntity > & _entities , MTPint _date ) : vflags ( _flags ) , vreply_to_msg_id ( _reply_to_msg_id ) , vmessage ( _message ) , ventities ( _entities ) , vdate ( _date ) { <nl> } <nl> <nl> class MTPDdraftMessage : public mtpData { <nl> <nl> class MTPDmessages_featuredStickers : public mtpData { <nl> public : <nl> - MTPDmessages_featuredStickers ( ) { <nl> - } <nl> + MTPDmessages_featuredStickers ( ) = default ; <nl> MTPDmessages_featuredStickers ( MTPint _hash , const MTPVector < MTPStickerSetCovered > & _sets , const MTPVector < MTPlong > & _unread ) : vhash ( _hash ) , vsets ( _sets ) , vunread ( _unread ) { <nl> } <nl> <nl> class MTPDmessages_featuredStickers : public mtpData { <nl> <nl> class MTPDmessages_recentStickers : public mtpData { <nl> public : <nl> - MTPDmessages_recentStickers ( ) { <nl> - } <nl> + MTPDmessages_recentStickers ( ) = default ; <nl> MTPDmessages_recentStickers ( MTPint _hash , const MTPVector < MTPDocument > & _stickers ) : vhash ( _hash ) , vstickers ( _stickers ) { <nl> } <nl> <nl> class MTPDmessages_recentStickers : public mtpData { <nl> <nl> class MTPDmessages_archivedStickers : public mtpData { <nl> public : <nl> - MTPDmessages_archivedStickers ( ) { <nl> - } <nl> + MTPDmessages_archivedStickers ( ) = default ; <nl> MTPDmessages_archivedStickers ( MTPint _count , const MTPVector < MTPStickerSetCovered > & _sets ) : vcount ( _count ) , vsets ( _sets ) { <nl> } <nl> <nl> class MTPDmessages_archivedStickers : public mtpData { <nl> <nl> class MTPDmessages_stickerSetInstallResultArchive : public mtpData { <nl> public : <nl> - MTPDmessages_stickerSetInstallResultArchive ( ) { <nl> - } <nl> + MTPDmessages_stickerSetInstallResultArchive ( ) = default ; <nl> MTPDmessages_stickerSetInstallResultArchive ( const MTPVector < MTPStickerSetCovered > & _sets ) : vsets ( _sets ) { <nl> } <nl> <nl> class MTPDmessages_stickerSetInstallResultArchive : public mtpData { <nl> <nl> class MTPDstickerSetCovered : public mtpData { <nl> public : <nl> - MTPDstickerSetCovered ( ) { <nl> - } <nl> + MTPDstickerSetCovered ( ) = default ; <nl> MTPDstickerSetCovered ( const MTPStickerSet & _set , const MTPDocument & _cover ) : vset ( _set ) , vcover ( _cover ) { <nl> } <nl> <nl> class MTPDstickerSetCovered : public mtpData { <nl> <nl> class MTPDstickerSetMultiCovered : public mtpData { <nl> public : <nl> - MTPDstickerSetMultiCovered ( ) { <nl> - } <nl> + MTPDstickerSetMultiCovered ( ) = default ; <nl> MTPDstickerSetMultiCovered ( const MTPStickerSet & _set , const MTPVector < MTPDocument > & _covers ) : vset ( _set ) , vcovers ( _covers ) { <nl> } <nl> <nl> class MTPDstickerSetMultiCovered : public mtpData { <nl> <nl> class MTPDmaskCoords : public mtpData { <nl> public : <nl> - MTPDmaskCoords ( ) { <nl> - } <nl> + MTPDmaskCoords ( ) = default ; <nl> MTPDmaskCoords ( MTPint _n , const MTPdouble & _x , const MTPdouble & _y , const MTPdouble & _zoom ) : vn ( _n ) , vx ( _x ) , vy ( _y ) , vzoom ( _zoom ) { <nl> } <nl> <nl> class MTPDmaskCoords : public mtpData { <nl> <nl> class MTPDinputStickeredMediaPhoto : public mtpData { <nl> public : <nl> - MTPDinputStickeredMediaPhoto ( ) { <nl> - } <nl> + MTPDinputStickeredMediaPhoto ( ) = default ; <nl> MTPDinputStickeredMediaPhoto ( const MTPInputPhoto & _id ) : vid ( _id ) { <nl> } <nl> <nl> class MTPDinputStickeredMediaPhoto : public mtpData { <nl> <nl> class MTPDinputStickeredMediaDocument : public mtpData { <nl> public : <nl> - MTPDinputStickeredMediaDocument ( ) { <nl> - } <nl> + MTPDinputStickeredMediaDocument ( ) = default ; <nl> MTPDinputStickeredMediaDocument ( const MTPInputDocument & _id ) : vid ( _id ) { <nl> } <nl> <nl> class MTPDgame : public mtpData { <nl> <nl> bool has_document ( ) const { return vflags . v & Flag : : f_document ; } <nl> <nl> - MTPDgame ( ) { <nl> - } <nl> + MTPDgame ( ) = default ; <nl> MTPDgame ( const MTPflags < MTPDgame : : Flags > & _flags , const MTPlong & _id , const MTPlong & _access_hash , const MTPstring & _short_name , const MTPstring & _title , const MTPstring & _description , const MTPPhoto & _photo , const MTPDocument & _document ) : vflags ( _flags ) , vid ( _id ) , vaccess_hash ( _access_hash ) , vshort_name ( _short_name ) , vtitle ( _title ) , vdescription ( _description ) , vphoto ( _photo ) , vdocument ( _document ) { <nl> } <nl> <nl> class MTPDgame : public mtpData { <nl> <nl> class MTPDinputGameID : public mtpData { <nl> public : <nl> - MTPDinputGameID ( ) { <nl> - } <nl> + MTPDinputGameID ( ) = default ; <nl> MTPDinputGameID ( const MTPlong & _id , const MTPlong & _access_hash ) : vid ( _id ) , vaccess_hash ( _access_hash ) { <nl> } <nl> <nl> class MTPDinputGameID : public mtpData { <nl> <nl> class MTPDinputGameShortName : public mtpData { <nl> public : <nl> - MTPDinputGameShortName ( ) { <nl> - } <nl> + MTPDinputGameShortName ( ) = default ; <nl> MTPDinputGameShortName ( const MTPInputUser & _bot_id , const MTPstring & _short_name ) : vbot_id ( _bot_id ) , vshort_name ( _short_name ) { <nl> } <nl> <nl> class MTPDinputGameShortName : public mtpData { <nl> <nl> class MTPDhighScore : public mtpData { <nl> public : <nl> - MTPDhighScore ( ) { <nl> - } <nl> + MTPDhighScore ( ) = default ; <nl> MTPDhighScore ( MTPint _pos , MTPint _user_id , MTPint _score ) : vpos ( _pos ) , vuser_id ( _user_id ) , vscore ( _score ) { <nl> } <nl> <nl> class MTPDhighScore : public mtpData { <nl> <nl> class MTPDmessages_highScores : public mtpData { <nl> public : <nl> - MTPDmessages_highScores ( ) { <nl> - } <nl> + MTPDmessages_highScores ( ) = default ; <nl> MTPDmessages_highScores ( const MTPVector < MTPHighScore > & _scores , const MTPVector < MTPUser > & _users ) : vscores ( _scores ) , vusers ( _users ) { <nl> } <nl> <nl> class MTPDmessages_highScores : public mtpData { <nl> <nl> class MTPDtextPlain : public mtpData { <nl> public : <nl> - MTPDtextPlain ( ) { <nl> - } <nl> + MTPDtextPlain ( ) = default ; <nl> MTPDtextPlain ( const MTPstring & _text ) : vtext ( _text ) { <nl> } <nl> <nl> class MTPDtextPlain : public mtpData { <nl> <nl> class MTPDtextBold : public mtpData { <nl> public : <nl> - MTPDtextBold ( ) { <nl> - } <nl> + MTPDtextBold ( ) = default ; <nl> MTPDtextBold ( const MTPRichText & _text ) : vtext ( _text ) { <nl> } <nl> <nl> class MTPDtextBold : public mtpData { <nl> <nl> class MTPDtextItalic : public mtpData { <nl> public : <nl> - MTPDtextItalic ( ) { <nl> - } <nl> + MTPDtextItalic ( ) = default ; <nl> MTPDtextItalic ( const MTPRichText & _text ) : vtext ( _text ) { <nl> } <nl> <nl> class MTPDtextItalic : public mtpData { <nl> <nl> class MTPDtextUnderline : public mtpData { <nl> public : <nl> - MTPDtextUnderline ( ) { <nl> - } <nl> + MTPDtextUnderline ( ) = default ; <nl> MTPDtextUnderline ( const MTPRichText & _text ) : vtext ( _text ) { <nl> } <nl> <nl> class MTPDtextUnderline : public mtpData { <nl> <nl> class MTPDtextStrike : public mtpData { <nl> public : <nl> - MTPDtextStrike ( ) { <nl> - } <nl> + MTPDtextStrike ( ) = default ; <nl> MTPDtextStrike ( const MTPRichText & _text ) : vtext ( _text ) { <nl> } <nl> <nl> class MTPDtextStrike : public mtpData { <nl> <nl> class MTPDtextFixed : public mtpData { <nl> public : <nl> - MTPDtextFixed ( ) { <nl> - } <nl> + MTPDtextFixed ( ) = default ; <nl> MTPDtextFixed ( const MTPRichText & _text ) : vtext ( _text ) { <nl> } <nl> <nl> class MTPDtextFixed : public mtpData { <nl> <nl> class MTPDtextUrl : public mtpData { <nl> public : <nl> - MTPDtextUrl ( ) { <nl> - } <nl> + MTPDtextUrl ( ) = default ; <nl> MTPDtextUrl ( const MTPRichText & _text , const MTPstring & _url , const MTPlong & _webpage_id ) : vtext ( _text ) , vurl ( _url ) , vwebpage_id ( _webpage_id ) { <nl> } <nl> <nl> class MTPDtextUrl : public mtpData { <nl> <nl> class MTPDtextEmail : public mtpData { <nl> public : <nl> - MTPDtextEmail ( ) { <nl> - } <nl> + MTPDtextEmail ( ) = default ; <nl> MTPDtextEmail ( const MTPRichText & _text , const MTPstring & _email ) : vtext ( _text ) , vemail ( _email ) { <nl> } <nl> <nl> class MTPDtextEmail : public mtpData { <nl> <nl> class MTPDtextConcat : public mtpData { <nl> public : <nl> - MTPDtextConcat ( ) { <nl> - } <nl> + MTPDtextConcat ( ) = default ; <nl> MTPDtextConcat ( const MTPVector < MTPRichText > & _texts ) : vtexts ( _texts ) { <nl> } <nl> <nl> class MTPDtextConcat : public mtpData { <nl> <nl> class MTPDpageBlockTitle : public mtpData { <nl> public : <nl> - MTPDpageBlockTitle ( ) { <nl> - } <nl> + MTPDpageBlockTitle ( ) = default ; <nl> MTPDpageBlockTitle ( const MTPRichText & _text ) : vtext ( _text ) { <nl> } <nl> <nl> class MTPDpageBlockTitle : public mtpData { <nl> <nl> class MTPDpageBlockSubtitle : public mtpData { <nl> public : <nl> - MTPDpageBlockSubtitle ( ) { <nl> - } <nl> + MTPDpageBlockSubtitle ( ) = default ; <nl> MTPDpageBlockSubtitle ( const MTPRichText & _text ) : vtext ( _text ) { <nl> } <nl> <nl> class MTPDpageBlockSubtitle : public mtpData { <nl> <nl> class MTPDpageBlockAuthorDate : public mtpData { <nl> public : <nl> - MTPDpageBlockAuthorDate ( ) { <nl> - } <nl> + MTPDpageBlockAuthorDate ( ) = default ; <nl> MTPDpageBlockAuthorDate ( const MTPRichText & _author , MTPint _published_date ) : vauthor ( _author ) , vpublished_date ( _published_date ) { <nl> } <nl> <nl> class MTPDpageBlockAuthorDate : public mtpData { <nl> <nl> class MTPDpageBlockHeader : public mtpData { <nl> public : <nl> - MTPDpageBlockHeader ( ) { <nl> - } <nl> + MTPDpageBlockHeader ( ) = default ; <nl> MTPDpageBlockHeader ( const MTPRichText & _text ) : vtext ( _text ) { <nl> } <nl> <nl> class MTPDpageBlockHeader : public mtpData { <nl> <nl> class MTPDpageBlockSubheader : public mtpData { <nl> public : <nl> - MTPDpageBlockSubheader ( ) { <nl> - } <nl> + MTPDpageBlockSubheader ( ) = default ; <nl> MTPDpageBlockSubheader ( const MTPRichText & _text ) : vtext ( _text ) { <nl> } <nl> <nl> class MTPDpageBlockSubheader : public mtpData { <nl> <nl> class MTPDpageBlockParagraph : public mtpData { <nl> public : <nl> - MTPDpageBlockParagraph ( ) { <nl> - } <nl> + MTPDpageBlockParagraph ( ) = default ; <nl> MTPDpageBlockParagraph ( const MTPRichText & _text ) : vtext ( _text ) { <nl> } <nl> <nl> class MTPDpageBlockParagraph : public mtpData { <nl> <nl> class MTPDpageBlockPreformatted : public mtpData { <nl> public : <nl> - MTPDpageBlockPreformatted ( ) { <nl> - } <nl> + MTPDpageBlockPreformatted ( ) = default ; <nl> MTPDpageBlockPreformatted ( const MTPRichText & _text , const MTPstring & _language ) : vtext ( _text ) , vlanguage ( _language ) { <nl> } <nl> <nl> class MTPDpageBlockPreformatted : public mtpData { <nl> <nl> class MTPDpageBlockFooter : public mtpData { <nl> public : <nl> - MTPDpageBlockFooter ( ) { <nl> - } <nl> + MTPDpageBlockFooter ( ) = default ; <nl> MTPDpageBlockFooter ( const MTPRichText & _text ) : vtext ( _text ) { <nl> } <nl> <nl> class MTPDpageBlockFooter : public mtpData { <nl> <nl> class MTPDpageBlockAnchor : public mtpData { <nl> public : <nl> - MTPDpageBlockAnchor ( ) { <nl> - } <nl> + MTPDpageBlockAnchor ( ) = default ; <nl> MTPDpageBlockAnchor ( const MTPstring & _name ) : vname ( _name ) { <nl> } <nl> <nl> class MTPDpageBlockAnchor : public mtpData { <nl> <nl> class MTPDpageBlockList : public mtpData { <nl> public : <nl> - MTPDpageBlockList ( ) { <nl> - } <nl> + MTPDpageBlockList ( ) = default ; <nl> MTPDpageBlockList ( MTPBool _ordered , const MTPVector < MTPRichText > & _items ) : vordered ( _ordered ) , vitems ( _items ) { <nl> } <nl> <nl> class MTPDpageBlockList : public mtpData { <nl> <nl> class MTPDpageBlockBlockquote : public mtpData { <nl> public : <nl> - MTPDpageBlockBlockquote ( ) { <nl> - } <nl> + MTPDpageBlockBlockquote ( ) = default ; <nl> MTPDpageBlockBlockquote ( const MTPRichText & _text , const MTPRichText & _caption ) : vtext ( _text ) , vcaption ( _caption ) { <nl> } <nl> <nl> class MTPDpageBlockBlockquote : public mtpData { <nl> <nl> class MTPDpageBlockPullquote : public mtpData { <nl> public : <nl> - MTPDpageBlockPullquote ( ) { <nl> - } <nl> + MTPDpageBlockPullquote ( ) = default ; <nl> MTPDpageBlockPullquote ( const MTPRichText & _text , const MTPRichText & _caption ) : vtext ( _text ) , vcaption ( _caption ) { <nl> } <nl> <nl> class MTPDpageBlockPullquote : public mtpData { <nl> <nl> class MTPDpageBlockPhoto : public mtpData { <nl> public : <nl> - MTPDpageBlockPhoto ( ) { <nl> - } <nl> + MTPDpageBlockPhoto ( ) = default ; <nl> MTPDpageBlockPhoto ( const MTPlong & _photo_id , const MTPRichText & _caption ) : vphoto_id ( _photo_id ) , vcaption ( _caption ) { <nl> } <nl> <nl> class MTPDpageBlockVideo : public mtpData { <nl> bool is_autoplay ( ) const { return vflags . v & Flag : : f_autoplay ; } <nl> bool is_loop ( ) const { return vflags . v & Flag : : f_loop ; } <nl> <nl> - MTPDpageBlockVideo ( ) { <nl> - } <nl> + MTPDpageBlockVideo ( ) = default ; <nl> MTPDpageBlockVideo ( const MTPflags < MTPDpageBlockVideo : : Flags > & _flags , const MTPlong & _video_id , const MTPRichText & _caption ) : vflags ( _flags ) , vvideo_id ( _video_id ) , vcaption ( _caption ) { <nl> } <nl> <nl> class MTPDpageBlockVideo : public mtpData { <nl> <nl> class MTPDpageBlockCover : public mtpData { <nl> public : <nl> - MTPDpageBlockCover ( ) { <nl> - } <nl> + MTPDpageBlockCover ( ) = default ; <nl> MTPDpageBlockCover ( const MTPPageBlock & _cover ) : vcover ( _cover ) { <nl> } <nl> <nl> class MTPDpageBlockEmbed : public mtpData { <nl> bool has_html ( ) const { return vflags . v & Flag : : f_html ; } <nl> bool has_poster_photo_id ( ) const { return vflags . v & Flag : : f_poster_photo_id ; } <nl> <nl> - MTPDpageBlockEmbed ( ) { <nl> - } <nl> + MTPDpageBlockEmbed ( ) = default ; <nl> MTPDpageBlockEmbed ( const MTPflags < MTPDpageBlockEmbed : : Flags > & _flags , const MTPstring & _url , const MTPstring & _html , const MTPlong & _poster_photo_id , MTPint _w , MTPint _h , const MTPRichText & _caption ) : vflags ( _flags ) , vurl ( _url ) , vhtml ( _html ) , vposter_photo_id ( _poster_photo_id ) , vw ( _w ) , vh ( _h ) , vcaption ( _caption ) { <nl> } <nl> <nl> class MTPDpageBlockEmbed : public mtpData { <nl> <nl> class MTPDpageBlockEmbedPost : public mtpData { <nl> public : <nl> - MTPDpageBlockEmbedPost ( ) { <nl> - } <nl> + MTPDpageBlockEmbedPost ( ) = default ; <nl> MTPDpageBlockEmbedPost ( const MTPstring & _url , const MTPlong & _webpage_id , const MTPlong & _author_photo_id , const MTPstring & _author , MTPint _date , const MTPVector < MTPPageBlock > & _blocks , const MTPRichText & _caption ) : vurl ( _url ) , vwebpage_id ( _webpage_id ) , vauthor_photo_id ( _author_photo_id ) , vauthor ( _author ) , vdate ( _date ) , vblocks ( _blocks ) , vcaption ( _caption ) { <nl> } <nl> <nl> class MTPDpageBlockEmbedPost : public mtpData { <nl> <nl> class MTPDpageBlockCollage : public mtpData { <nl> public : <nl> - MTPDpageBlockCollage ( ) { <nl> - } <nl> + MTPDpageBlockCollage ( ) = default ; <nl> MTPDpageBlockCollage ( const MTPVector < MTPPageBlock > & _items , const MTPRichText & _caption ) : vitems ( _items ) , vcaption ( _caption ) { <nl> } <nl> <nl> class MTPDpageBlockCollage : public mtpData { <nl> <nl> class MTPDpageBlockSlideshow : public mtpData { <nl> public : <nl> - MTPDpageBlockSlideshow ( ) { <nl> - } <nl> + MTPDpageBlockSlideshow ( ) = default ; <nl> MTPDpageBlockSlideshow ( const MTPVector < MTPPageBlock > & _items , const MTPRichText & _caption ) : vitems ( _items ) , vcaption ( _caption ) { <nl> } <nl> <nl> class MTPDpageBlockSlideshow : public mtpData { <nl> <nl> class MTPDpagePart : public mtpData { <nl> public : <nl> - MTPDpagePart ( ) { <nl> - } <nl> + MTPDpagePart ( ) = default ; <nl> MTPDpagePart ( const MTPVector < MTPPageBlock > & _blocks , const MTPVector < MTPPhoto > & _photos , const MTPVector < MTPDocument > & _videos ) : vblocks ( _blocks ) , vphotos ( _photos ) , vvideos ( _videos ) { <nl> } <nl> <nl> class MTPDpagePart : public mtpData { <nl> <nl> class MTPDpageFull : public mtpData { <nl> public : <nl> - MTPDpageFull ( ) { <nl> - } <nl> + MTPDpageFull ( ) = default ; <nl> MTPDpageFull ( const MTPVector < MTPPageBlock > & _blocks , const MTPVector < MTPPhoto > & _photos , const MTPVector < MTPDocument > & _videos ) : vblocks ( _blocks ) , vphotos ( _photos ) , vvideos ( _videos ) { <nl> } <nl> <nl> class MTPDpageFull : public mtpData { <nl> <nl> class MTPDinputPhoneCall : public mtpData { <nl> public : <nl> - MTPDinputPhoneCall ( ) { <nl> - } <nl> + MTPDinputPhoneCall ( ) = default ; <nl> MTPDinputPhoneCall ( const MTPlong & _id , const MTPlong & _access_hash ) : vid ( _id ) , vaccess_hash ( _access_hash ) { <nl> } <nl> <nl> class MTPDinputPhoneCall : public mtpData { <nl> <nl> class MTPDphoneCallEmpty : public mtpData { <nl> public : <nl> - MTPDphoneCallEmpty ( ) { <nl> - } <nl> + MTPDphoneCallEmpty ( ) = default ; <nl> MTPDphoneCallEmpty ( const MTPlong & _id ) : vid ( _id ) { <nl> } <nl> <nl> class MTPDphoneCallWaiting : public mtpData { <nl> <nl> bool has_receive_date ( ) const { return vflags . v & Flag : : f_receive_date ; } <nl> <nl> - MTPDphoneCallWaiting ( ) { <nl> - } <nl> + MTPDphoneCallWaiting ( ) = default ; <nl> MTPDphoneCallWaiting ( const MTPflags < MTPDphoneCallWaiting : : Flags > & _flags , const MTPlong & _id , const MTPlong & _access_hash , MTPint _date , MTPint _admin_id , MTPint _participant_id , const MTPPhoneCallProtocol & _protocol , MTPint _receive_date ) : vflags ( _flags ) , vid ( _id ) , vaccess_hash ( _access_hash ) , vdate ( _date ) , vadmin_id ( _admin_id ) , vparticipant_id ( _participant_id ) , vprotocol ( _protocol ) , vreceive_date ( _receive_date ) { <nl> } <nl> <nl> class MTPDphoneCallWaiting : public mtpData { <nl> <nl> class MTPDphoneCallRequested : public mtpData { <nl> public : <nl> - MTPDphoneCallRequested ( ) { <nl> - } <nl> + MTPDphoneCallRequested ( ) = default ; <nl> MTPDphoneCallRequested ( const MTPlong & _id , const MTPlong & _access_hash , MTPint _date , MTPint _admin_id , MTPint _participant_id , const MTPbytes & _g_a , const MTPPhoneCallProtocol & _protocol ) : vid ( _id ) , vaccess_hash ( _access_hash ) , vdate ( _date ) , vadmin_id ( _admin_id ) , vparticipant_id ( _participant_id ) , vg_a ( _g_a ) , vprotocol ( _protocol ) { <nl> } <nl> <nl> class MTPDphoneCallRequested : public mtpData { <nl> <nl> class MTPDphoneCall : public mtpData { <nl> public : <nl> - MTPDphoneCall ( ) { <nl> - } <nl> + MTPDphoneCall ( ) = default ; <nl> MTPDphoneCall ( const MTPlong & _id , const MTPlong & _access_hash , MTPint _date , MTPint _admin_id , MTPint _participant_id , const MTPbytes & _g_a_or_b , const MTPlong & _key_fingerprint , const MTPPhoneCallProtocol & _protocol , const MTPPhoneConnection & _connection , const MTPVector < MTPPhoneConnection > & _alternative_connections , MTPint _start_date ) : vid ( _id ) , vaccess_hash ( _access_hash ) , vdate ( _date ) , vadmin_id ( _admin_id ) , vparticipant_id ( _participant_id ) , vg_a_or_b ( _g_a_or_b ) , vkey_fingerprint ( _key_fingerprint ) , vprotocol ( _protocol ) , vconnection ( _connection ) , valternative_connections ( _alternative_connections ) , vstart_date ( _start_date ) { <nl> } <nl> <nl> class MTPDphoneCallDiscarded : public mtpData { <nl> bool has_reason ( ) const { return vflags . v & Flag : : f_reason ; } <nl> bool has_duration ( ) const { return vflags . v & Flag : : f_duration ; } <nl> <nl> - MTPDphoneCallDiscarded ( ) { <nl> - } <nl> + MTPDphoneCallDiscarded ( ) = default ; <nl> MTPDphoneCallDiscarded ( const MTPflags < MTPDphoneCallDiscarded : : Flags > & _flags , const MTPlong & _id , const MTPPhoneCallDiscardReason & _reason , MTPint _duration ) : vflags ( _flags ) , vid ( _id ) , vreason ( _reason ) , vduration ( _duration ) { <nl> } <nl> <nl> class MTPDphoneCallDiscarded : public mtpData { <nl> <nl> class MTPDphoneConnection : public mtpData { <nl> public : <nl> - MTPDphoneConnection ( ) { <nl> - } <nl> + MTPDphoneConnection ( ) = default ; <nl> MTPDphoneConnection ( const MTPlong & _id , const MTPstring & _ip , const MTPstring & _ipv6 , MTPint _port , const MTPbytes & _peer_tag ) : vid ( _id ) , vip ( _ip ) , vipv6 ( _ipv6 ) , vport ( _port ) , vpeer_tag ( _peer_tag ) { <nl> } <nl> <nl> class MTPDphoneCallProtocol : public mtpData { <nl> bool is_udp_p2p ( ) const { return vflags . v & Flag : : f_udp_p2p ; } <nl> bool is_udp_reflector ( ) const { return vflags . v & Flag : : f_udp_reflector ; } <nl> <nl> - MTPDphoneCallProtocol ( ) { <nl> - } <nl> + MTPDphoneCallProtocol ( ) = default ; <nl> MTPDphoneCallProtocol ( const MTPflags < MTPDphoneCallProtocol : : Flags > & _flags , MTPint _min_layer , MTPint _max_layer ) : vflags ( _flags ) , vmin_layer ( _min_layer ) , vmax_layer ( _max_layer ) { <nl> } <nl> <nl> class MTPDphoneCallProtocol : public mtpData { <nl> <nl> class MTPDphone_phoneCall : public mtpData { <nl> public : <nl> - MTPDphone_phoneCall ( ) { <nl> - } <nl> + MTPDphone_phoneCall ( ) = default ; <nl> MTPDphone_phoneCall ( const MTPPhoneCall & _phone_call , const MTPVector < MTPUser > & _users ) : vphone_call ( _phone_call ) , vusers ( _users ) { <nl> } <nl> <nl> class MTPreq_pq { / / RPC method ' req_pq ' <nl> public : <nl> MTPint128 vnonce ; <nl> <nl> - MTPreq_pq ( ) { <nl> - } <nl> - MTPreq_pq ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_req_pq ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPreq_pq ( ) = default ; <nl> MTPreq_pq ( const MTPint128 & _nonce ) : vnonce ( _nonce ) { <nl> } <nl> <nl> class MTPreq_pq { / / RPC method ' req_pq ' <nl> } ; <nl> class MTPReq_pq : public MTPBoxed < MTPreq_pq > { <nl> public : <nl> - MTPReq_pq ( ) { <nl> - } <nl> + MTPReq_pq ( ) = default ; <nl> MTPReq_pq ( const MTPreq_pq & v ) : MTPBoxed < MTPreq_pq > ( v ) { <nl> } <nl> - MTPReq_pq ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPreq_pq > ( from , end , cons ) { <nl> - } <nl> MTPReq_pq ( const MTPint128 & _nonce ) : MTPBoxed < MTPreq_pq > ( MTPreq_pq ( _nonce ) ) { <nl> } <nl> } ; <nl> class MTPreq_DH_params { / / RPC method ' req_DH_params ' <nl> MTPlong vpublic_key_fingerprint ; <nl> MTPstring vencrypted_data ; <nl> <nl> - MTPreq_DH_params ( ) { <nl> - } <nl> - MTPreq_DH_params ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_req_DH_params ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPreq_DH_params ( ) = default ; <nl> MTPreq_DH_params ( const MTPint128 & _nonce , const MTPint128 & _server_nonce , const MTPstring & _p , const MTPstring & _q , const MTPlong & _public_key_fingerprint , const MTPstring & _encrypted_data ) : vnonce ( _nonce ) , vserver_nonce ( _server_nonce ) , vp ( _p ) , vq ( _q ) , vpublic_key_fingerprint ( _public_key_fingerprint ) , vencrypted_data ( _encrypted_data ) { <nl> } <nl> <nl> class MTPreq_DH_params { / / RPC method ' req_DH_params ' <nl> } ; <nl> class MTPReq_DH_params : public MTPBoxed < MTPreq_DH_params > { <nl> public : <nl> - MTPReq_DH_params ( ) { <nl> - } <nl> + MTPReq_DH_params ( ) = default ; <nl> MTPReq_DH_params ( const MTPreq_DH_params & v ) : MTPBoxed < MTPreq_DH_params > ( v ) { <nl> } <nl> - MTPReq_DH_params ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPreq_DH_params > ( from , end , cons ) { <nl> - } <nl> MTPReq_DH_params ( const MTPint128 & _nonce , const MTPint128 & _server_nonce , const MTPstring & _p , const MTPstring & _q , const MTPlong & _public_key_fingerprint , const MTPstring & _encrypted_data ) : MTPBoxed < MTPreq_DH_params > ( MTPreq_DH_params ( _nonce , _server_nonce , _p , _q , _public_key_fingerprint , _encrypted_data ) ) { <nl> } <nl> } ; <nl> class MTPset_client_DH_params { / / RPC method ' set_client_DH_params ' <nl> MTPint128 vserver_nonce ; <nl> MTPstring vencrypted_data ; <nl> <nl> - MTPset_client_DH_params ( ) { <nl> - } <nl> - MTPset_client_DH_params ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_set_client_DH_params ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPset_client_DH_params ( ) = default ; <nl> MTPset_client_DH_params ( const MTPint128 & _nonce , const MTPint128 & _server_nonce , const MTPstring & _encrypted_data ) : vnonce ( _nonce ) , vserver_nonce ( _server_nonce ) , vencrypted_data ( _encrypted_data ) { <nl> } <nl> <nl> class MTPset_client_DH_params { / / RPC method ' set_client_DH_params ' <nl> } ; <nl> class MTPSet_client_DH_params : public MTPBoxed < MTPset_client_DH_params > { <nl> public : <nl> - MTPSet_client_DH_params ( ) { <nl> - } <nl> + MTPSet_client_DH_params ( ) = default ; <nl> MTPSet_client_DH_params ( const MTPset_client_DH_params & v ) : MTPBoxed < MTPset_client_DH_params > ( v ) { <nl> } <nl> - MTPSet_client_DH_params ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPset_client_DH_params > ( from , end , cons ) { <nl> - } <nl> MTPSet_client_DH_params ( const MTPint128 & _nonce , const MTPint128 & _server_nonce , const MTPstring & _encrypted_data ) : MTPBoxed < MTPset_client_DH_params > ( MTPset_client_DH_params ( _nonce , _server_nonce , _encrypted_data ) ) { <nl> } <nl> } ; <nl> <nl> class MTPdestroy_auth_key { / / RPC method ' destroy_auth_key ' <nl> public : <nl> - MTPdestroy_auth_key ( ) { <nl> - } <nl> - MTPdestroy_auth_key ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_destroy_auth_key ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPdestroy_auth_key ( ) = default ; <nl> <nl> uint32 innerLength ( ) const { <nl> return 0 ; <nl> class MTPdestroy_auth_key { / / RPC method ' destroy_auth_key ' <nl> } ; <nl> class MTPDestroy_auth_key : public MTPBoxed < MTPdestroy_auth_key > { <nl> public : <nl> - MTPDestroy_auth_key ( ) { <nl> - } <nl> + MTPDestroy_auth_key ( ) = default ; <nl> MTPDestroy_auth_key ( const MTPdestroy_auth_key & v ) : MTPBoxed < MTPdestroy_auth_key > ( v ) { <nl> } <nl> - MTPDestroy_auth_key ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPdestroy_auth_key > ( from , end , cons ) { <nl> - } <nl> } ; <nl> <nl> class MTPrpc_drop_answer { / / RPC method ' rpc_drop_answer ' <nl> public : <nl> MTPlong vreq_msg_id ; <nl> <nl> - MTPrpc_drop_answer ( ) { <nl> - } <nl> - MTPrpc_drop_answer ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_rpc_drop_answer ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPrpc_drop_answer ( ) = default ; <nl> MTPrpc_drop_answer ( const MTPlong & _req_msg_id ) : vreq_msg_id ( _req_msg_id ) { <nl> } <nl> <nl> class MTPrpc_drop_answer { / / RPC method ' rpc_drop_answer ' <nl> } ; <nl> class MTPRpc_drop_answer : public MTPBoxed < MTPrpc_drop_answer > { <nl> public : <nl> - MTPRpc_drop_answer ( ) { <nl> - } <nl> + MTPRpc_drop_answer ( ) = default ; <nl> MTPRpc_drop_answer ( const MTPrpc_drop_answer & v ) : MTPBoxed < MTPrpc_drop_answer > ( v ) { <nl> } <nl> - MTPRpc_drop_answer ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPrpc_drop_answer > ( from , end , cons ) { <nl> - } <nl> MTPRpc_drop_answer ( const MTPlong & _req_msg_id ) : MTPBoxed < MTPrpc_drop_answer > ( MTPrpc_drop_answer ( _req_msg_id ) ) { <nl> } <nl> } ; <nl> class MTPget_future_salts { / / RPC method ' get_future_salts ' <nl> public : <nl> MTPint vnum ; <nl> <nl> - MTPget_future_salts ( ) { <nl> - } <nl> - MTPget_future_salts ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_get_future_salts ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPget_future_salts ( ) = default ; <nl> MTPget_future_salts ( MTPint _num ) : vnum ( _num ) { <nl> } <nl> <nl> class MTPget_future_salts { / / RPC method ' get_future_salts ' <nl> } ; <nl> class MTPGet_future_salts : public MTPBoxed < MTPget_future_salts > { <nl> public : <nl> - MTPGet_future_salts ( ) { <nl> - } <nl> + MTPGet_future_salts ( ) = default ; <nl> MTPGet_future_salts ( const MTPget_future_salts & v ) : MTPBoxed < MTPget_future_salts > ( v ) { <nl> } <nl> - MTPGet_future_salts ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPget_future_salts > ( from , end , cons ) { <nl> - } <nl> MTPGet_future_salts ( MTPint _num ) : MTPBoxed < MTPget_future_salts > ( MTPget_future_salts ( _num ) ) { <nl> } <nl> } ; <nl> class MTPping { / / RPC method ' ping ' <nl> public : <nl> MTPlong vping_id ; <nl> <nl> - MTPping ( ) { <nl> - } <nl> - MTPping ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_ping ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPping ( ) = default ; <nl> MTPping ( const MTPlong & _ping_id ) : vping_id ( _ping_id ) { <nl> } <nl> <nl> class MTPping { / / RPC method ' ping ' <nl> } ; <nl> class MTPPing : public MTPBoxed < MTPping > { <nl> public : <nl> - MTPPing ( ) { <nl> - } <nl> + MTPPing ( ) = default ; <nl> MTPPing ( const MTPping & v ) : MTPBoxed < MTPping > ( v ) { <nl> } <nl> - MTPPing ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPping > ( from , end , cons ) { <nl> - } <nl> MTPPing ( const MTPlong & _ping_id ) : MTPBoxed < MTPping > ( MTPping ( _ping_id ) ) { <nl> } <nl> } ; <nl> class MTPping_delay_disconnect { / / RPC method ' ping_delay_disconnect ' <nl> MTPlong vping_id ; <nl> MTPint vdisconnect_delay ; <nl> <nl> - MTPping_delay_disconnect ( ) { <nl> - } <nl> - MTPping_delay_disconnect ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_ping_delay_disconnect ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPping_delay_disconnect ( ) = default ; <nl> MTPping_delay_disconnect ( const MTPlong & _ping_id , MTPint _disconnect_delay ) : vping_id ( _ping_id ) , vdisconnect_delay ( _disconnect_delay ) { <nl> } <nl> <nl> class MTPping_delay_disconnect { / / RPC method ' ping_delay_disconnect ' <nl> } ; <nl> class MTPPing_delay_disconnect : public MTPBoxed < MTPping_delay_disconnect > { <nl> public : <nl> - MTPPing_delay_disconnect ( ) { <nl> - } <nl> + MTPPing_delay_disconnect ( ) = default ; <nl> MTPPing_delay_disconnect ( const MTPping_delay_disconnect & v ) : MTPBoxed < MTPping_delay_disconnect > ( v ) { <nl> } <nl> - MTPPing_delay_disconnect ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPping_delay_disconnect > ( from , end , cons ) { <nl> - } <nl> MTPPing_delay_disconnect ( const MTPlong & _ping_id , MTPint _disconnect_delay ) : MTPBoxed < MTPping_delay_disconnect > ( MTPping_delay_disconnect ( _ping_id , _disconnect_delay ) ) { <nl> } <nl> } ; <nl> class MTPdestroy_session { / / RPC method ' destroy_session ' <nl> public : <nl> MTPlong vsession_id ; <nl> <nl> - MTPdestroy_session ( ) { <nl> - } <nl> - MTPdestroy_session ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_destroy_session ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPdestroy_session ( ) = default ; <nl> MTPdestroy_session ( const MTPlong & _session_id ) : vsession_id ( _session_id ) { <nl> } <nl> <nl> class MTPdestroy_session { / / RPC method ' destroy_session ' <nl> } ; <nl> class MTPDestroy_session : public MTPBoxed < MTPdestroy_session > { <nl> public : <nl> - MTPDestroy_session ( ) { <nl> - } <nl> + MTPDestroy_session ( ) = default ; <nl> MTPDestroy_session ( const MTPdestroy_session & v ) : MTPBoxed < MTPdestroy_session > ( v ) { <nl> } <nl> - MTPDestroy_session ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPdestroy_session > ( from , end , cons ) { <nl> - } <nl> MTPDestroy_session ( const MTPlong & _session_id ) : MTPBoxed < MTPdestroy_session > ( MTPdestroy_session ( _session_id ) ) { <nl> } <nl> } ; <nl> class MTPcontest_saveDeveloperInfo { / / RPC method ' contest . saveDeveloperInfo ' <nl> MTPint vage ; <nl> MTPstring vcity ; <nl> <nl> - MTPcontest_saveDeveloperInfo ( ) { <nl> - } <nl> - MTPcontest_saveDeveloperInfo ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_contest_saveDeveloperInfo ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPcontest_saveDeveloperInfo ( ) = default ; <nl> MTPcontest_saveDeveloperInfo ( MTPint _vk_id , const MTPstring & _name , const MTPstring & _phone_number , MTPint _age , const MTPstring & _city ) : vvk_id ( _vk_id ) , vname ( _name ) , vphone_number ( _phone_number ) , vage ( _age ) , vcity ( _city ) { <nl> } <nl> <nl> class MTPcontest_saveDeveloperInfo { / / RPC method ' contest . saveDeveloperInfo ' <nl> } ; <nl> class MTPcontest_SaveDeveloperInfo : public MTPBoxed < MTPcontest_saveDeveloperInfo > { <nl> public : <nl> - MTPcontest_SaveDeveloperInfo ( ) { <nl> - } <nl> + MTPcontest_SaveDeveloperInfo ( ) = default ; <nl> MTPcontest_SaveDeveloperInfo ( const MTPcontest_saveDeveloperInfo & v ) : MTPBoxed < MTPcontest_saveDeveloperInfo > ( v ) { <nl> } <nl> - MTPcontest_SaveDeveloperInfo ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPcontest_saveDeveloperInfo > ( from , end , cons ) { <nl> - } <nl> MTPcontest_SaveDeveloperInfo ( MTPint _vk_id , const MTPstring & _name , const MTPstring & _phone_number , MTPint _age , const MTPstring & _city ) : MTPBoxed < MTPcontest_saveDeveloperInfo > ( MTPcontest_saveDeveloperInfo ( _vk_id , _name , _phone_number , _age , _city ) ) { <nl> } <nl> } ; <nl> class MTPinvokeAfterMsg { / / RPC method ' invokeAfterMsg ' <nl> MTPlong vmsg_id ; <nl> TQueryType vquery ; <nl> <nl> - MTPinvokeAfterMsg ( ) { <nl> - } <nl> - MTPinvokeAfterMsg ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_invokeAfterMsg ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPinvokeAfterMsg ( ) = default ; <nl> MTPinvokeAfterMsg ( const MTPlong & _msg_id , const TQueryType & _query ) : vmsg_id ( _msg_id ) , vquery ( _query ) { <nl> } <nl> <nl> class MTPinvokeAfterMsg { / / RPC method ' invokeAfterMsg ' <nl> template < typename TQueryType > <nl> class MTPInvokeAfterMsg : public MTPBoxed < MTPinvokeAfterMsg < TQueryType > > { <nl> public : <nl> - MTPInvokeAfterMsg ( ) { <nl> - } <nl> + MTPInvokeAfterMsg ( ) = default ; <nl> MTPInvokeAfterMsg ( const MTPinvokeAfterMsg < TQueryType > & v ) : MTPBoxed < MTPinvokeAfterMsg < TQueryType > > ( v ) { <nl> } <nl> MTPInvokeAfterMsg ( const MTPlong & _msg_id , const TQueryType & _query ) : MTPBoxed < MTPinvokeAfterMsg < TQueryType > > ( MTPinvokeAfterMsg < TQueryType > ( _msg_id , _query ) ) { <nl> class MTPinvokeAfterMsgs { / / RPC method ' invokeAfterMsgs ' <nl> MTPVector < MTPlong > vmsg_ids ; <nl> TQueryType vquery ; <nl> <nl> - MTPinvokeAfterMsgs ( ) { <nl> - } <nl> - MTPinvokeAfterMsgs ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_invokeAfterMsgs ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPinvokeAfterMsgs ( ) = default ; <nl> MTPinvokeAfterMsgs ( const MTPVector < MTPlong > & _msg_ids , const TQueryType & _query ) : vmsg_ids ( _msg_ids ) , vquery ( _query ) { <nl> } <nl> <nl> class MTPinvokeAfterMsgs { / / RPC method ' invokeAfterMsgs ' <nl> template < typename TQueryType > <nl> class MTPInvokeAfterMsgs : public MTPBoxed < MTPinvokeAfterMsgs < TQueryType > > { <nl> public : <nl> - MTPInvokeAfterMsgs ( ) { <nl> - } <nl> + MTPInvokeAfterMsgs ( ) = default ; <nl> MTPInvokeAfterMsgs ( const MTPinvokeAfterMsgs < TQueryType > & v ) : MTPBoxed < MTPinvokeAfterMsgs < TQueryType > > ( v ) { <nl> } <nl> MTPInvokeAfterMsgs ( const MTPVector < MTPlong > & _msg_ids , const TQueryType & _query ) : MTPBoxed < MTPinvokeAfterMsgs < TQueryType > > ( MTPinvokeAfterMsgs < TQueryType > ( _msg_ids , _query ) ) { <nl> class MTPinitConnection { / / RPC method ' initConnection ' <nl> MTPstring vlang_code ; <nl> TQueryType vquery ; <nl> <nl> - MTPinitConnection ( ) { <nl> - } <nl> - MTPinitConnection ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_initConnection ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPinitConnection ( ) = default ; <nl> MTPinitConnection ( MTPint _api_id , const MTPstring & _device_model , const MTPstring & _system_version , const MTPstring & _app_version , const MTPstring & _lang_code , const TQueryType & _query ) : vapi_id ( _api_id ) , vdevice_model ( _device_model ) , vsystem_version ( _system_version ) , vapp_version ( _app_version ) , vlang_code ( _lang_code ) , vquery ( _query ) { <nl> } <nl> <nl> class MTPinitConnection { / / RPC method ' initConnection ' <nl> template < typename TQueryType > <nl> class MTPInitConnection : public MTPBoxed < MTPinitConnection < TQueryType > > { <nl> public : <nl> - MTPInitConnection ( ) { <nl> - } <nl> + MTPInitConnection ( ) = default ; <nl> MTPInitConnection ( const MTPinitConnection < TQueryType > & v ) : MTPBoxed < MTPinitConnection < TQueryType > > ( v ) { <nl> } <nl> MTPInitConnection ( MTPint _api_id , const MTPstring & _device_model , const MTPstring & _system_version , const MTPstring & _app_version , const MTPstring & _lang_code , const TQueryType & _query ) : MTPBoxed < MTPinitConnection < TQueryType > > ( MTPinitConnection < TQueryType > ( _api_id , _device_model , _system_version , _app_version , _lang_code , _query ) ) { <nl> class MTPinvokeWithLayer { / / RPC method ' invokeWithLayer ' <nl> MTPint vlayer ; <nl> TQueryType vquery ; <nl> <nl> - MTPinvokeWithLayer ( ) { <nl> - } <nl> - MTPinvokeWithLayer ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_invokeWithLayer ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPinvokeWithLayer ( ) = default ; <nl> MTPinvokeWithLayer ( MTPint _layer , const TQueryType & _query ) : vlayer ( _layer ) , vquery ( _query ) { <nl> } <nl> <nl> class MTPinvokeWithLayer { / / RPC method ' invokeWithLayer ' <nl> template < typename TQueryType > <nl> class MTPInvokeWithLayer : public MTPBoxed < MTPinvokeWithLayer < TQueryType > > { <nl> public : <nl> - MTPInvokeWithLayer ( ) { <nl> - } <nl> + MTPInvokeWithLayer ( ) = default ; <nl> MTPInvokeWithLayer ( const MTPinvokeWithLayer < TQueryType > & v ) : MTPBoxed < MTPinvokeWithLayer < TQueryType > > ( v ) { <nl> } <nl> MTPInvokeWithLayer ( MTPint _layer , const TQueryType & _query ) : MTPBoxed < MTPinvokeWithLayer < TQueryType > > ( MTPinvokeWithLayer < TQueryType > ( _layer , _query ) ) { <nl> class MTPinvokeWithoutUpdates { / / RPC method ' invokeWithoutUpdates ' <nl> public : <nl> TQueryType vquery ; <nl> <nl> - MTPinvokeWithoutUpdates ( ) { <nl> - } <nl> - MTPinvokeWithoutUpdates ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_invokeWithoutUpdates ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPinvokeWithoutUpdates ( ) = default ; <nl> MTPinvokeWithoutUpdates ( const TQueryType & _query ) : vquery ( _query ) { <nl> } <nl> <nl> class MTPinvokeWithoutUpdates { / / RPC method ' invokeWithoutUpdates ' <nl> template < typename TQueryType > <nl> class MTPInvokeWithoutUpdates : public MTPBoxed < MTPinvokeWithoutUpdates < TQueryType > > { <nl> public : <nl> - MTPInvokeWithoutUpdates ( ) { <nl> - } <nl> + MTPInvokeWithoutUpdates ( ) = default ; <nl> MTPInvokeWithoutUpdates ( const MTPinvokeWithoutUpdates < TQueryType > & v ) : MTPBoxed < MTPinvokeWithoutUpdates < TQueryType > > ( v ) { <nl> } <nl> MTPInvokeWithoutUpdates ( const TQueryType & _query ) : MTPBoxed < MTPinvokeWithoutUpdates < TQueryType > > ( MTPinvokeWithoutUpdates < TQueryType > ( _query ) ) { <nl> class MTPauth_checkPhone { / / RPC method ' auth . checkPhone ' <nl> public : <nl> MTPstring vphone_number ; <nl> <nl> - MTPauth_checkPhone ( ) { <nl> - } <nl> - MTPauth_checkPhone ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_auth_checkPhone ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPauth_checkPhone ( ) = default ; <nl> MTPauth_checkPhone ( const MTPstring & _phone_number ) : vphone_number ( _phone_number ) { <nl> } <nl> <nl> class MTPauth_checkPhone { / / RPC method ' auth . checkPhone ' <nl> } ; <nl> class MTPauth_CheckPhone : public MTPBoxed < MTPauth_checkPhone > { <nl> public : <nl> - MTPauth_CheckPhone ( ) { <nl> - } <nl> + MTPauth_CheckPhone ( ) = default ; <nl> MTPauth_CheckPhone ( const MTPauth_checkPhone & v ) : MTPBoxed < MTPauth_checkPhone > ( v ) { <nl> } <nl> - MTPauth_CheckPhone ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPauth_checkPhone > ( from , end , cons ) { <nl> - } <nl> MTPauth_CheckPhone ( const MTPstring & _phone_number ) : MTPBoxed < MTPauth_checkPhone > ( MTPauth_checkPhone ( _phone_number ) ) { <nl> } <nl> } ; <nl> class MTPauth_sendCode { / / RPC method ' auth . sendCode ' <nl> MTPint vapi_id ; <nl> MTPstring vapi_hash ; <nl> <nl> - MTPauth_sendCode ( ) { <nl> - } <nl> - MTPauth_sendCode ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_auth_sendCode ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPauth_sendCode ( ) = default ; <nl> MTPauth_sendCode ( const MTPflags < MTPauth_sendCode : : Flags > & _flags , const MTPstring & _phone_number , MTPBool _current_number , MTPint _api_id , const MTPstring & _api_hash ) : vflags ( _flags ) , vphone_number ( _phone_number ) , vcurrent_number ( _current_number ) , vapi_id ( _api_id ) , vapi_hash ( _api_hash ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPauth_sendCode : : Flags ) <nl> <nl> class MTPauth_SendCode : public MTPBoxed < MTPauth_sendCode > { <nl> public : <nl> - MTPauth_SendCode ( ) { <nl> - } <nl> + MTPauth_SendCode ( ) = default ; <nl> MTPauth_SendCode ( const MTPauth_sendCode & v ) : MTPBoxed < MTPauth_sendCode > ( v ) { <nl> } <nl> - MTPauth_SendCode ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPauth_sendCode > ( from , end , cons ) { <nl> - } <nl> MTPauth_SendCode ( const MTPflags < MTPauth_sendCode : : Flags > & _flags , const MTPstring & _phone_number , MTPBool _current_number , MTPint _api_id , const MTPstring & _api_hash ) : MTPBoxed < MTPauth_sendCode > ( MTPauth_sendCode ( _flags , _phone_number , _current_number , _api_id , _api_hash ) ) { <nl> } <nl> } ; <nl> class MTPauth_signUp { / / RPC method ' auth . signUp ' <nl> MTPstring vfirst_name ; <nl> MTPstring vlast_name ; <nl> <nl> - MTPauth_signUp ( ) { <nl> - } <nl> - MTPauth_signUp ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_auth_signUp ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPauth_signUp ( ) = default ; <nl> MTPauth_signUp ( const MTPstring & _phone_number , const MTPstring & _phone_code_hash , const MTPstring & _phone_code , const MTPstring & _first_name , const MTPstring & _last_name ) : vphone_number ( _phone_number ) , vphone_code_hash ( _phone_code_hash ) , vphone_code ( _phone_code ) , vfirst_name ( _first_name ) , vlast_name ( _last_name ) { <nl> } <nl> <nl> class MTPauth_signUp { / / RPC method ' auth . signUp ' <nl> } ; <nl> class MTPauth_SignUp : public MTPBoxed < MTPauth_signUp > { <nl> public : <nl> - MTPauth_SignUp ( ) { <nl> - } <nl> + MTPauth_SignUp ( ) = default ; <nl> MTPauth_SignUp ( const MTPauth_signUp & v ) : MTPBoxed < MTPauth_signUp > ( v ) { <nl> } <nl> - MTPauth_SignUp ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPauth_signUp > ( from , end , cons ) { <nl> - } <nl> MTPauth_SignUp ( const MTPstring & _phone_number , const MTPstring & _phone_code_hash , const MTPstring & _phone_code , const MTPstring & _first_name , const MTPstring & _last_name ) : MTPBoxed < MTPauth_signUp > ( MTPauth_signUp ( _phone_number , _phone_code_hash , _phone_code , _first_name , _last_name ) ) { <nl> } <nl> } ; <nl> class MTPauth_signIn { / / RPC method ' auth . signIn ' <nl> MTPstring vphone_code_hash ; <nl> MTPstring vphone_code ; <nl> <nl> - MTPauth_signIn ( ) { <nl> - } <nl> - MTPauth_signIn ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_auth_signIn ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPauth_signIn ( ) = default ; <nl> MTPauth_signIn ( const MTPstring & _phone_number , const MTPstring & _phone_code_hash , const MTPstring & _phone_code ) : vphone_number ( _phone_number ) , vphone_code_hash ( _phone_code_hash ) , vphone_code ( _phone_code ) { <nl> } <nl> <nl> class MTPauth_signIn { / / RPC method ' auth . signIn ' <nl> } ; <nl> class MTPauth_SignIn : public MTPBoxed < MTPauth_signIn > { <nl> public : <nl> - MTPauth_SignIn ( ) { <nl> - } <nl> + MTPauth_SignIn ( ) = default ; <nl> MTPauth_SignIn ( const MTPauth_signIn & v ) : MTPBoxed < MTPauth_signIn > ( v ) { <nl> } <nl> - MTPauth_SignIn ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPauth_signIn > ( from , end , cons ) { <nl> - } <nl> MTPauth_SignIn ( const MTPstring & _phone_number , const MTPstring & _phone_code_hash , const MTPstring & _phone_code ) : MTPBoxed < MTPauth_signIn > ( MTPauth_signIn ( _phone_number , _phone_code_hash , _phone_code ) ) { <nl> } <nl> } ; <nl> <nl> class MTPauth_logOut { / / RPC method ' auth . logOut ' <nl> public : <nl> - MTPauth_logOut ( ) { <nl> - } <nl> - MTPauth_logOut ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_auth_logOut ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPauth_logOut ( ) = default ; <nl> <nl> uint32 innerLength ( ) const { <nl> return 0 ; <nl> class MTPauth_logOut { / / RPC method ' auth . logOut ' <nl> } ; <nl> class MTPauth_LogOut : public MTPBoxed < MTPauth_logOut > { <nl> public : <nl> - MTPauth_LogOut ( ) { <nl> - } <nl> + MTPauth_LogOut ( ) = default ; <nl> MTPauth_LogOut ( const MTPauth_logOut & v ) : MTPBoxed < MTPauth_logOut > ( v ) { <nl> } <nl> - MTPauth_LogOut ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPauth_logOut > ( from , end , cons ) { <nl> - } <nl> } ; <nl> <nl> class MTPauth_resetAuthorizations { / / RPC method ' auth . resetAuthorizations ' <nl> public : <nl> - MTPauth_resetAuthorizations ( ) { <nl> - } <nl> - MTPauth_resetAuthorizations ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_auth_resetAuthorizations ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPauth_resetAuthorizations ( ) = default ; <nl> <nl> uint32 innerLength ( ) const { <nl> return 0 ; <nl> class MTPauth_resetAuthorizations { / / RPC method ' auth . resetAuthorizations ' <nl> } ; <nl> class MTPauth_ResetAuthorizations : public MTPBoxed < MTPauth_resetAuthorizations > { <nl> public : <nl> - MTPauth_ResetAuthorizations ( ) { <nl> - } <nl> + MTPauth_ResetAuthorizations ( ) = default ; <nl> MTPauth_ResetAuthorizations ( const MTPauth_resetAuthorizations & v ) : MTPBoxed < MTPauth_resetAuthorizations > ( v ) { <nl> } <nl> - MTPauth_ResetAuthorizations ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPauth_resetAuthorizations > ( from , end , cons ) { <nl> - } <nl> } ; <nl> <nl> class MTPauth_sendInvites { / / RPC method ' auth . sendInvites ' <nl> class MTPauth_sendInvites { / / RPC method ' auth . sendInvites ' <nl> MTPVector < MTPstring > vphone_numbers ; <nl> MTPstring vmessage ; <nl> <nl> - MTPauth_sendInvites ( ) { <nl> - } <nl> - MTPauth_sendInvites ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_auth_sendInvites ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPauth_sendInvites ( ) = default ; <nl> MTPauth_sendInvites ( const MTPVector < MTPstring > & _phone_numbers , const MTPstring & _message ) : vphone_numbers ( _phone_numbers ) , vmessage ( _message ) { <nl> } <nl> <nl> class MTPauth_sendInvites { / / RPC method ' auth . sendInvites ' <nl> } ; <nl> class MTPauth_SendInvites : public MTPBoxed < MTPauth_sendInvites > { <nl> public : <nl> - MTPauth_SendInvites ( ) { <nl> - } <nl> + MTPauth_SendInvites ( ) = default ; <nl> MTPauth_SendInvites ( const MTPauth_sendInvites & v ) : MTPBoxed < MTPauth_sendInvites > ( v ) { <nl> } <nl> - MTPauth_SendInvites ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPauth_sendInvites > ( from , end , cons ) { <nl> - } <nl> MTPauth_SendInvites ( const MTPVector < MTPstring > & _phone_numbers , const MTPstring & _message ) : MTPBoxed < MTPauth_sendInvites > ( MTPauth_sendInvites ( _phone_numbers , _message ) ) { <nl> } <nl> } ; <nl> class MTPauth_exportAuthorization { / / RPC method ' auth . exportAuthorization ' <nl> public : <nl> MTPint vdc_id ; <nl> <nl> - MTPauth_exportAuthorization ( ) { <nl> - } <nl> - MTPauth_exportAuthorization ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_auth_exportAuthorization ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPauth_exportAuthorization ( ) = default ; <nl> MTPauth_exportAuthorization ( MTPint _dc_id ) : vdc_id ( _dc_id ) { <nl> } <nl> <nl> class MTPauth_exportAuthorization { / / RPC method ' auth . exportAuthorization ' <nl> } ; <nl> class MTPauth_ExportAuthorization : public MTPBoxed < MTPauth_exportAuthorization > { <nl> public : <nl> - MTPauth_ExportAuthorization ( ) { <nl> - } <nl> + MTPauth_ExportAuthorization ( ) = default ; <nl> MTPauth_ExportAuthorization ( const MTPauth_exportAuthorization & v ) : MTPBoxed < MTPauth_exportAuthorization > ( v ) { <nl> } <nl> - MTPauth_ExportAuthorization ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPauth_exportAuthorization > ( from , end , cons ) { <nl> - } <nl> MTPauth_ExportAuthorization ( MTPint _dc_id ) : MTPBoxed < MTPauth_exportAuthorization > ( MTPauth_exportAuthorization ( _dc_id ) ) { <nl> } <nl> } ; <nl> class MTPauth_importAuthorization { / / RPC method ' auth . importAuthorization ' <nl> MTPint vid ; <nl> MTPbytes vbytes ; <nl> <nl> - MTPauth_importAuthorization ( ) { <nl> - } <nl> - MTPauth_importAuthorization ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_auth_importAuthorization ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPauth_importAuthorization ( ) = default ; <nl> MTPauth_importAuthorization ( MTPint _id , const MTPbytes & _bytes ) : vid ( _id ) , vbytes ( _bytes ) { <nl> } <nl> <nl> class MTPauth_importAuthorization { / / RPC method ' auth . importAuthorization ' <nl> } ; <nl> class MTPauth_ImportAuthorization : public MTPBoxed < MTPauth_importAuthorization > { <nl> public : <nl> - MTPauth_ImportAuthorization ( ) { <nl> - } <nl> + MTPauth_ImportAuthorization ( ) = default ; <nl> MTPauth_ImportAuthorization ( const MTPauth_importAuthorization & v ) : MTPBoxed < MTPauth_importAuthorization > ( v ) { <nl> } <nl> - MTPauth_ImportAuthorization ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPauth_importAuthorization > ( from , end , cons ) { <nl> - } <nl> MTPauth_ImportAuthorization ( MTPint _id , const MTPbytes & _bytes ) : MTPBoxed < MTPauth_importAuthorization > ( MTPauth_importAuthorization ( _id , _bytes ) ) { <nl> } <nl> } ; <nl> class MTPauth_bindTempAuthKey { / / RPC method ' auth . bindTempAuthKey ' <nl> MTPint vexpires_at ; <nl> MTPbytes vencrypted_message ; <nl> <nl> - MTPauth_bindTempAuthKey ( ) { <nl> - } <nl> - MTPauth_bindTempAuthKey ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_auth_bindTempAuthKey ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPauth_bindTempAuthKey ( ) = default ; <nl> MTPauth_bindTempAuthKey ( const MTPlong & _perm_auth_key_id , const MTPlong & _nonce , MTPint _expires_at , const MTPbytes & _encrypted_message ) : vperm_auth_key_id ( _perm_auth_key_id ) , vnonce ( _nonce ) , vexpires_at ( _expires_at ) , vencrypted_message ( _encrypted_message ) { <nl> } <nl> <nl> class MTPauth_bindTempAuthKey { / / RPC method ' auth . bindTempAuthKey ' <nl> } ; <nl> class MTPauth_BindTempAuthKey : public MTPBoxed < MTPauth_bindTempAuthKey > { <nl> public : <nl> - MTPauth_BindTempAuthKey ( ) { <nl> - } <nl> + MTPauth_BindTempAuthKey ( ) = default ; <nl> MTPauth_BindTempAuthKey ( const MTPauth_bindTempAuthKey & v ) : MTPBoxed < MTPauth_bindTempAuthKey > ( v ) { <nl> } <nl> - MTPauth_BindTempAuthKey ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPauth_bindTempAuthKey > ( from , end , cons ) { <nl> - } <nl> MTPauth_BindTempAuthKey ( const MTPlong & _perm_auth_key_id , const MTPlong & _nonce , MTPint _expires_at , const MTPbytes & _encrypted_message ) : MTPBoxed < MTPauth_bindTempAuthKey > ( MTPauth_bindTempAuthKey ( _perm_auth_key_id , _nonce , _expires_at , _encrypted_message ) ) { <nl> } <nl> } ; <nl> class MTPauth_importBotAuthorization { / / RPC method ' auth . importBotAuthorizatio <nl> MTPstring vapi_hash ; <nl> MTPstring vbot_auth_token ; <nl> <nl> - MTPauth_importBotAuthorization ( ) { <nl> - } <nl> - MTPauth_importBotAuthorization ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_auth_importBotAuthorization ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPauth_importBotAuthorization ( ) = default ; <nl> MTPauth_importBotAuthorization ( MTPint _flags , MTPint _api_id , const MTPstring & _api_hash , const MTPstring & _bot_auth_token ) : vflags ( _flags ) , vapi_id ( _api_id ) , vapi_hash ( _api_hash ) , vbot_auth_token ( _bot_auth_token ) { <nl> } <nl> <nl> class MTPauth_importBotAuthorization { / / RPC method ' auth . importBotAuthorizatio <nl> } ; <nl> class MTPauth_ImportBotAuthorization : public MTPBoxed < MTPauth_importBotAuthorization > { <nl> public : <nl> - MTPauth_ImportBotAuthorization ( ) { <nl> - } <nl> + MTPauth_ImportBotAuthorization ( ) = default ; <nl> MTPauth_ImportBotAuthorization ( const MTPauth_importBotAuthorization & v ) : MTPBoxed < MTPauth_importBotAuthorization > ( v ) { <nl> } <nl> - MTPauth_ImportBotAuthorization ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPauth_importBotAuthorization > ( from , end , cons ) { <nl> - } <nl> MTPauth_ImportBotAuthorization ( MTPint _flags , MTPint _api_id , const MTPstring & _api_hash , const MTPstring & _bot_auth_token ) : MTPBoxed < MTPauth_importBotAuthorization > ( MTPauth_importBotAuthorization ( _flags , _api_id , _api_hash , _bot_auth_token ) ) { <nl> } <nl> } ; <nl> class MTPauth_checkPassword { / / RPC method ' auth . checkPassword ' <nl> public : <nl> MTPbytes vpassword_hash ; <nl> <nl> - MTPauth_checkPassword ( ) { <nl> - } <nl> - MTPauth_checkPassword ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_auth_checkPassword ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPauth_checkPassword ( ) = default ; <nl> MTPauth_checkPassword ( const MTPbytes & _password_hash ) : vpassword_hash ( _password_hash ) { <nl> } <nl> <nl> class MTPauth_checkPassword { / / RPC method ' auth . checkPassword ' <nl> } ; <nl> class MTPauth_CheckPassword : public MTPBoxed < MTPauth_checkPassword > { <nl> public : <nl> - MTPauth_CheckPassword ( ) { <nl> - } <nl> + MTPauth_CheckPassword ( ) = default ; <nl> MTPauth_CheckPassword ( const MTPauth_checkPassword & v ) : MTPBoxed < MTPauth_checkPassword > ( v ) { <nl> } <nl> - MTPauth_CheckPassword ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPauth_checkPassword > ( from , end , cons ) { <nl> - } <nl> MTPauth_CheckPassword ( const MTPbytes & _password_hash ) : MTPBoxed < MTPauth_checkPassword > ( MTPauth_checkPassword ( _password_hash ) ) { <nl> } <nl> } ; <nl> <nl> class MTPauth_requestPasswordRecovery { / / RPC method ' auth . requestPasswordRecovery ' <nl> public : <nl> - MTPauth_requestPasswordRecovery ( ) { <nl> - } <nl> - MTPauth_requestPasswordRecovery ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_auth_requestPasswordRecovery ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPauth_requestPasswordRecovery ( ) = default ; <nl> <nl> uint32 innerLength ( ) const { <nl> return 0 ; <nl> class MTPauth_requestPasswordRecovery { / / RPC method ' auth . requestPasswordRecov <nl> } ; <nl> class MTPauth_RequestPasswordRecovery : public MTPBoxed < MTPauth_requestPasswordRecovery > { <nl> public : <nl> - MTPauth_RequestPasswordRecovery ( ) { <nl> - } <nl> + MTPauth_RequestPasswordRecovery ( ) = default ; <nl> MTPauth_RequestPasswordRecovery ( const MTPauth_requestPasswordRecovery & v ) : MTPBoxed < MTPauth_requestPasswordRecovery > ( v ) { <nl> } <nl> - MTPauth_RequestPasswordRecovery ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPauth_requestPasswordRecovery > ( from , end , cons ) { <nl> - } <nl> } ; <nl> <nl> class MTPauth_recoverPassword { / / RPC method ' auth . recoverPassword ' <nl> public : <nl> MTPstring vcode ; <nl> <nl> - MTPauth_recoverPassword ( ) { <nl> - } <nl> - MTPauth_recoverPassword ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_auth_recoverPassword ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPauth_recoverPassword ( ) = default ; <nl> MTPauth_recoverPassword ( const MTPstring & _code ) : vcode ( _code ) { <nl> } <nl> <nl> class MTPauth_recoverPassword { / / RPC method ' auth . recoverPassword ' <nl> } ; <nl> class MTPauth_RecoverPassword : public MTPBoxed < MTPauth_recoverPassword > { <nl> public : <nl> - MTPauth_RecoverPassword ( ) { <nl> - } <nl> + MTPauth_RecoverPassword ( ) = default ; <nl> MTPauth_RecoverPassword ( const MTPauth_recoverPassword & v ) : MTPBoxed < MTPauth_recoverPassword > ( v ) { <nl> } <nl> - MTPauth_RecoverPassword ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPauth_recoverPassword > ( from , end , cons ) { <nl> - } <nl> MTPauth_RecoverPassword ( const MTPstring & _code ) : MTPBoxed < MTPauth_recoverPassword > ( MTPauth_recoverPassword ( _code ) ) { <nl> } <nl> } ; <nl> class MTPauth_resendCode { / / RPC method ' auth . resendCode ' <nl> MTPstring vphone_number ; <nl> MTPstring vphone_code_hash ; <nl> <nl> - MTPauth_resendCode ( ) { <nl> - } <nl> - MTPauth_resendCode ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_auth_resendCode ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPauth_resendCode ( ) = default ; <nl> MTPauth_resendCode ( const MTPstring & _phone_number , const MTPstring & _phone_code_hash ) : vphone_number ( _phone_number ) , vphone_code_hash ( _phone_code_hash ) { <nl> } <nl> <nl> class MTPauth_resendCode { / / RPC method ' auth . resendCode ' <nl> } ; <nl> class MTPauth_ResendCode : public MTPBoxed < MTPauth_resendCode > { <nl> public : <nl> - MTPauth_ResendCode ( ) { <nl> - } <nl> + MTPauth_ResendCode ( ) = default ; <nl> MTPauth_ResendCode ( const MTPauth_resendCode & v ) : MTPBoxed < MTPauth_resendCode > ( v ) { <nl> } <nl> - MTPauth_ResendCode ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPauth_resendCode > ( from , end , cons ) { <nl> - } <nl> MTPauth_ResendCode ( const MTPstring & _phone_number , const MTPstring & _phone_code_hash ) : MTPBoxed < MTPauth_resendCode > ( MTPauth_resendCode ( _phone_number , _phone_code_hash ) ) { <nl> } <nl> } ; <nl> class MTPauth_cancelCode { / / RPC method ' auth . cancelCode ' <nl> MTPstring vphone_number ; <nl> MTPstring vphone_code_hash ; <nl> <nl> - MTPauth_cancelCode ( ) { <nl> - } <nl> - MTPauth_cancelCode ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_auth_cancelCode ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPauth_cancelCode ( ) = default ; <nl> MTPauth_cancelCode ( const MTPstring & _phone_number , const MTPstring & _phone_code_hash ) : vphone_number ( _phone_number ) , vphone_code_hash ( _phone_code_hash ) { <nl> } <nl> <nl> class MTPauth_cancelCode { / / RPC method ' auth . cancelCode ' <nl> } ; <nl> class MTPauth_CancelCode : public MTPBoxed < MTPauth_cancelCode > { <nl> public : <nl> - MTPauth_CancelCode ( ) { <nl> - } <nl> + MTPauth_CancelCode ( ) = default ; <nl> MTPauth_CancelCode ( const MTPauth_cancelCode & v ) : MTPBoxed < MTPauth_cancelCode > ( v ) { <nl> } <nl> - MTPauth_CancelCode ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPauth_cancelCode > ( from , end , cons ) { <nl> - } <nl> MTPauth_CancelCode ( const MTPstring & _phone_number , const MTPstring & _phone_code_hash ) : MTPBoxed < MTPauth_cancelCode > ( MTPauth_cancelCode ( _phone_number , _phone_code_hash ) ) { <nl> } <nl> } ; <nl> class MTPauth_dropTempAuthKeys { / / RPC method ' auth . dropTempAuthKeys ' <nl> public : <nl> MTPVector < MTPlong > vexcept_auth_keys ; <nl> <nl> - MTPauth_dropTempAuthKeys ( ) { <nl> - } <nl> - MTPauth_dropTempAuthKeys ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_auth_dropTempAuthKeys ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPauth_dropTempAuthKeys ( ) = default ; <nl> MTPauth_dropTempAuthKeys ( const MTPVector < MTPlong > & _except_auth_keys ) : vexcept_auth_keys ( _except_auth_keys ) { <nl> } <nl> <nl> class MTPauth_dropTempAuthKeys { / / RPC method ' auth . dropTempAuthKeys ' <nl> } ; <nl> class MTPauth_DropTempAuthKeys : public MTPBoxed < MTPauth_dropTempAuthKeys > { <nl> public : <nl> - MTPauth_DropTempAuthKeys ( ) { <nl> - } <nl> + MTPauth_DropTempAuthKeys ( ) = default ; <nl> MTPauth_DropTempAuthKeys ( const MTPauth_dropTempAuthKeys & v ) : MTPBoxed < MTPauth_dropTempAuthKeys > ( v ) { <nl> } <nl> - MTPauth_DropTempAuthKeys ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPauth_dropTempAuthKeys > ( from , end , cons ) { <nl> - } <nl> MTPauth_DropTempAuthKeys ( const MTPVector < MTPlong > & _except_auth_keys ) : MTPBoxed < MTPauth_dropTempAuthKeys > ( MTPauth_dropTempAuthKeys ( _except_auth_keys ) ) { <nl> } <nl> } ; <nl> class MTPaccount_registerDevice { / / RPC method ' account . registerDevice ' <nl> MTPint vtoken_type ; <nl> MTPstring vtoken ; <nl> <nl> - MTPaccount_registerDevice ( ) { <nl> - } <nl> - MTPaccount_registerDevice ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_account_registerDevice ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPaccount_registerDevice ( ) = default ; <nl> MTPaccount_registerDevice ( MTPint _token_type , const MTPstring & _token ) : vtoken_type ( _token_type ) , vtoken ( _token ) { <nl> } <nl> <nl> class MTPaccount_registerDevice { / / RPC method ' account . registerDevice ' <nl> } ; <nl> class MTPaccount_RegisterDevice : public MTPBoxed < MTPaccount_registerDevice > { <nl> public : <nl> - MTPaccount_RegisterDevice ( ) { <nl> - } <nl> + MTPaccount_RegisterDevice ( ) = default ; <nl> MTPaccount_RegisterDevice ( const MTPaccount_registerDevice & v ) : MTPBoxed < MTPaccount_registerDevice > ( v ) { <nl> } <nl> - MTPaccount_RegisterDevice ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPaccount_registerDevice > ( from , end , cons ) { <nl> - } <nl> MTPaccount_RegisterDevice ( MTPint _token_type , const MTPstring & _token ) : MTPBoxed < MTPaccount_registerDevice > ( MTPaccount_registerDevice ( _token_type , _token ) ) { <nl> } <nl> } ; <nl> class MTPaccount_unregisterDevice { / / RPC method ' account . unregisterDevice ' <nl> MTPint vtoken_type ; <nl> MTPstring vtoken ; <nl> <nl> - MTPaccount_unregisterDevice ( ) { <nl> - } <nl> - MTPaccount_unregisterDevice ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_account_unregisterDevice ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPaccount_unregisterDevice ( ) = default ; <nl> MTPaccount_unregisterDevice ( MTPint _token_type , const MTPstring & _token ) : vtoken_type ( _token_type ) , vtoken ( _token ) { <nl> } <nl> <nl> class MTPaccount_unregisterDevice { / / RPC method ' account . unregisterDevice ' <nl> } ; <nl> class MTPaccount_UnregisterDevice : public MTPBoxed < MTPaccount_unregisterDevice > { <nl> public : <nl> - MTPaccount_UnregisterDevice ( ) { <nl> - } <nl> + MTPaccount_UnregisterDevice ( ) = default ; <nl> MTPaccount_UnregisterDevice ( const MTPaccount_unregisterDevice & v ) : MTPBoxed < MTPaccount_unregisterDevice > ( v ) { <nl> } <nl> - MTPaccount_UnregisterDevice ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPaccount_unregisterDevice > ( from , end , cons ) { <nl> - } <nl> MTPaccount_UnregisterDevice ( MTPint _token_type , const MTPstring & _token ) : MTPBoxed < MTPaccount_unregisterDevice > ( MTPaccount_unregisterDevice ( _token_type , _token ) ) { <nl> } <nl> } ; <nl> class MTPaccount_updateNotifySettings { / / RPC method ' account . updateNotifySetti <nl> MTPInputNotifyPeer vpeer ; <nl> MTPInputPeerNotifySettings vsettings ; <nl> <nl> - MTPaccount_updateNotifySettings ( ) { <nl> - } <nl> - MTPaccount_updateNotifySettings ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_account_updateNotifySettings ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPaccount_updateNotifySettings ( ) = default ; <nl> MTPaccount_updateNotifySettings ( const MTPInputNotifyPeer & _peer , const MTPInputPeerNotifySettings & _settings ) : vpeer ( _peer ) , vsettings ( _settings ) { <nl> } <nl> <nl> class MTPaccount_updateNotifySettings { / / RPC method ' account . updateNotifySetti <nl> } ; <nl> class MTPaccount_UpdateNotifySettings : public MTPBoxed < MTPaccount_updateNotifySettings > { <nl> public : <nl> - MTPaccount_UpdateNotifySettings ( ) { <nl> - } <nl> + MTPaccount_UpdateNotifySettings ( ) = default ; <nl> MTPaccount_UpdateNotifySettings ( const MTPaccount_updateNotifySettings & v ) : MTPBoxed < MTPaccount_updateNotifySettings > ( v ) { <nl> } <nl> - MTPaccount_UpdateNotifySettings ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPaccount_updateNotifySettings > ( from , end , cons ) { <nl> - } <nl> MTPaccount_UpdateNotifySettings ( const MTPInputNotifyPeer & _peer , const MTPInputPeerNotifySettings & _settings ) : MTPBoxed < MTPaccount_updateNotifySettings > ( MTPaccount_updateNotifySettings ( _peer , _settings ) ) { <nl> } <nl> } ; <nl> class MTPaccount_getNotifySettings { / / RPC method ' account . getNotifySettings ' <nl> public : <nl> MTPInputNotifyPeer vpeer ; <nl> <nl> - MTPaccount_getNotifySettings ( ) { <nl> - } <nl> - MTPaccount_getNotifySettings ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_account_getNotifySettings ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPaccount_getNotifySettings ( ) = default ; <nl> MTPaccount_getNotifySettings ( const MTPInputNotifyPeer & _peer ) : vpeer ( _peer ) { <nl> } <nl> <nl> class MTPaccount_getNotifySettings { / / RPC method ' account . getNotifySettings ' <nl> } ; <nl> class MTPaccount_GetNotifySettings : public MTPBoxed < MTPaccount_getNotifySettings > { <nl> public : <nl> - MTPaccount_GetNotifySettings ( ) { <nl> - } <nl> + MTPaccount_GetNotifySettings ( ) = default ; <nl> MTPaccount_GetNotifySettings ( const MTPaccount_getNotifySettings & v ) : MTPBoxed < MTPaccount_getNotifySettings > ( v ) { <nl> } <nl> - MTPaccount_GetNotifySettings ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPaccount_getNotifySettings > ( from , end , cons ) { <nl> - } <nl> MTPaccount_GetNotifySettings ( const MTPInputNotifyPeer & _peer ) : MTPBoxed < MTPaccount_getNotifySettings > ( MTPaccount_getNotifySettings ( _peer ) ) { <nl> } <nl> } ; <nl> <nl> class MTPaccount_resetNotifySettings { / / RPC method ' account . resetNotifySettings ' <nl> public : <nl> - MTPaccount_resetNotifySettings ( ) { <nl> - } <nl> - MTPaccount_resetNotifySettings ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_account_resetNotifySettings ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPaccount_resetNotifySettings ( ) = default ; <nl> <nl> uint32 innerLength ( ) const { <nl> return 0 ; <nl> class MTPaccount_resetNotifySettings { / / RPC method ' account . resetNotifySetting <nl> } ; <nl> class MTPaccount_ResetNotifySettings : public MTPBoxed < MTPaccount_resetNotifySettings > { <nl> public : <nl> - MTPaccount_ResetNotifySettings ( ) { <nl> - } <nl> + MTPaccount_ResetNotifySettings ( ) = default ; <nl> MTPaccount_ResetNotifySettings ( const MTPaccount_resetNotifySettings & v ) : MTPBoxed < MTPaccount_resetNotifySettings > ( v ) { <nl> } <nl> - MTPaccount_ResetNotifySettings ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPaccount_resetNotifySettings > ( from , end , cons ) { <nl> - } <nl> } ; <nl> <nl> class MTPaccount_updateProfile { / / RPC method ' account . updateProfile ' <nl> class MTPaccount_updateProfile { / / RPC method ' account . updateProfile ' <nl> MTPstring vlast_name ; <nl> MTPstring vabout ; <nl> <nl> - MTPaccount_updateProfile ( ) { <nl> - } <nl> - MTPaccount_updateProfile ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_account_updateProfile ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPaccount_updateProfile ( ) = default ; <nl> MTPaccount_updateProfile ( const MTPflags < MTPaccount_updateProfile : : Flags > & _flags , const MTPstring & _first_name , const MTPstring & _last_name , const MTPstring & _about ) : vflags ( _flags ) , vfirst_name ( _first_name ) , vlast_name ( _last_name ) , vabout ( _about ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPaccount_updateProfile : : Flags ) <nl> <nl> class MTPaccount_UpdateProfile : public MTPBoxed < MTPaccount_updateProfile > { <nl> public : <nl> - MTPaccount_UpdateProfile ( ) { <nl> - } <nl> + MTPaccount_UpdateProfile ( ) = default ; <nl> MTPaccount_UpdateProfile ( const MTPaccount_updateProfile & v ) : MTPBoxed < MTPaccount_updateProfile > ( v ) { <nl> } <nl> - MTPaccount_UpdateProfile ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPaccount_updateProfile > ( from , end , cons ) { <nl> - } <nl> MTPaccount_UpdateProfile ( const MTPflags < MTPaccount_updateProfile : : Flags > & _flags , const MTPstring & _first_name , const MTPstring & _last_name , const MTPstring & _about ) : MTPBoxed < MTPaccount_updateProfile > ( MTPaccount_updateProfile ( _flags , _first_name , _last_name , _about ) ) { <nl> } <nl> } ; <nl> class MTPaccount_updateStatus { / / RPC method ' account . updateStatus ' <nl> public : <nl> MTPBool voffline ; <nl> <nl> - MTPaccount_updateStatus ( ) { <nl> - } <nl> - MTPaccount_updateStatus ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_account_updateStatus ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPaccount_updateStatus ( ) = default ; <nl> MTPaccount_updateStatus ( MTPBool _offline ) : voffline ( _offline ) { <nl> } <nl> <nl> class MTPaccount_updateStatus { / / RPC method ' account . updateStatus ' <nl> } ; <nl> class MTPaccount_UpdateStatus : public MTPBoxed < MTPaccount_updateStatus > { <nl> public : <nl> - MTPaccount_UpdateStatus ( ) { <nl> - } <nl> + MTPaccount_UpdateStatus ( ) = default ; <nl> MTPaccount_UpdateStatus ( const MTPaccount_updateStatus & v ) : MTPBoxed < MTPaccount_updateStatus > ( v ) { <nl> } <nl> - MTPaccount_UpdateStatus ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPaccount_updateStatus > ( from , end , cons ) { <nl> - } <nl> MTPaccount_UpdateStatus ( MTPBool _offline ) : MTPBoxed < MTPaccount_updateStatus > ( MTPaccount_updateStatus ( _offline ) ) { <nl> } <nl> } ; <nl> <nl> class MTPaccount_getWallPapers { / / RPC method ' account . getWallPapers ' <nl> public : <nl> - MTPaccount_getWallPapers ( ) { <nl> - } <nl> - MTPaccount_getWallPapers ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_account_getWallPapers ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPaccount_getWallPapers ( ) = default ; <nl> <nl> uint32 innerLength ( ) const { <nl> return 0 ; <nl> class MTPaccount_getWallPapers { / / RPC method ' account . getWallPapers ' <nl> } ; <nl> class MTPaccount_GetWallPapers : public MTPBoxed < MTPaccount_getWallPapers > { <nl> public : <nl> - MTPaccount_GetWallPapers ( ) { <nl> - } <nl> + MTPaccount_GetWallPapers ( ) = default ; <nl> MTPaccount_GetWallPapers ( const MTPaccount_getWallPapers & v ) : MTPBoxed < MTPaccount_getWallPapers > ( v ) { <nl> } <nl> - MTPaccount_GetWallPapers ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPaccount_getWallPapers > ( from , end , cons ) { <nl> - } <nl> } ; <nl> <nl> class MTPaccount_reportPeer { / / RPC method ' account . reportPeer ' <nl> class MTPaccount_reportPeer { / / RPC method ' account . reportPeer ' <nl> MTPInputPeer vpeer ; <nl> MTPReportReason vreason ; <nl> <nl> - MTPaccount_reportPeer ( ) { <nl> - } <nl> - MTPaccount_reportPeer ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_account_reportPeer ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPaccount_reportPeer ( ) = default ; <nl> MTPaccount_reportPeer ( const MTPInputPeer & _peer , const MTPReportReason & _reason ) : vpeer ( _peer ) , vreason ( _reason ) { <nl> } <nl> <nl> class MTPaccount_reportPeer { / / RPC method ' account . reportPeer ' <nl> } ; <nl> class MTPaccount_ReportPeer : public MTPBoxed < MTPaccount_reportPeer > { <nl> public : <nl> - MTPaccount_ReportPeer ( ) { <nl> - } <nl> + MTPaccount_ReportPeer ( ) = default ; <nl> MTPaccount_ReportPeer ( const MTPaccount_reportPeer & v ) : MTPBoxed < MTPaccount_reportPeer > ( v ) { <nl> } <nl> - MTPaccount_ReportPeer ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPaccount_reportPeer > ( from , end , cons ) { <nl> - } <nl> MTPaccount_ReportPeer ( const MTPInputPeer & _peer , const MTPReportReason & _reason ) : MTPBoxed < MTPaccount_reportPeer > ( MTPaccount_reportPeer ( _peer , _reason ) ) { <nl> } <nl> } ; <nl> class MTPaccount_checkUsername { / / RPC method ' account . checkUsername ' <nl> public : <nl> MTPstring vusername ; <nl> <nl> - MTPaccount_checkUsername ( ) { <nl> - } <nl> - MTPaccount_checkUsername ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_account_checkUsername ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPaccount_checkUsername ( ) = default ; <nl> MTPaccount_checkUsername ( const MTPstring & _username ) : vusername ( _username ) { <nl> } <nl> <nl> class MTPaccount_checkUsername { / / RPC method ' account . checkUsername ' <nl> } ; <nl> class MTPaccount_CheckUsername : public MTPBoxed < MTPaccount_checkUsername > { <nl> public : <nl> - MTPaccount_CheckUsername ( ) { <nl> - } <nl> + MTPaccount_CheckUsername ( ) = default ; <nl> MTPaccount_CheckUsername ( const MTPaccount_checkUsername & v ) : MTPBoxed < MTPaccount_checkUsername > ( v ) { <nl> } <nl> - MTPaccount_CheckUsername ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPaccount_checkUsername > ( from , end , cons ) { <nl> - } <nl> MTPaccount_CheckUsername ( const MTPstring & _username ) : MTPBoxed < MTPaccount_checkUsername > ( MTPaccount_checkUsername ( _username ) ) { <nl> } <nl> } ; <nl> class MTPaccount_updateUsername { / / RPC method ' account . updateUsername ' <nl> public : <nl> MTPstring vusername ; <nl> <nl> - MTPaccount_updateUsername ( ) { <nl> - } <nl> - MTPaccount_updateUsername ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_account_updateUsername ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPaccount_updateUsername ( ) = default ; <nl> MTPaccount_updateUsername ( const MTPstring & _username ) : vusername ( _username ) { <nl> } <nl> <nl> class MTPaccount_updateUsername { / / RPC method ' account . updateUsername ' <nl> } ; <nl> class MTPaccount_UpdateUsername : public MTPBoxed < MTPaccount_updateUsername > { <nl> public : <nl> - MTPaccount_UpdateUsername ( ) { <nl> - } <nl> + MTPaccount_UpdateUsername ( ) = default ; <nl> MTPaccount_UpdateUsername ( const MTPaccount_updateUsername & v ) : MTPBoxed < MTPaccount_updateUsername > ( v ) { <nl> } <nl> - MTPaccount_UpdateUsername ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPaccount_updateUsername > ( from , end , cons ) { <nl> - } <nl> MTPaccount_UpdateUsername ( const MTPstring & _username ) : MTPBoxed < MTPaccount_updateUsername > ( MTPaccount_updateUsername ( _username ) ) { <nl> } <nl> } ; <nl> class MTPaccount_getPrivacy { / / RPC method ' account . getPrivacy ' <nl> public : <nl> MTPInputPrivacyKey vkey ; <nl> <nl> - MTPaccount_getPrivacy ( ) { <nl> - } <nl> - MTPaccount_getPrivacy ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_account_getPrivacy ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPaccount_getPrivacy ( ) = default ; <nl> MTPaccount_getPrivacy ( const MTPInputPrivacyKey & _key ) : vkey ( _key ) { <nl> } <nl> <nl> class MTPaccount_getPrivacy { / / RPC method ' account . getPrivacy ' <nl> } ; <nl> class MTPaccount_GetPrivacy : public MTPBoxed < MTPaccount_getPrivacy > { <nl> public : <nl> - MTPaccount_GetPrivacy ( ) { <nl> - } <nl> + MTPaccount_GetPrivacy ( ) = default ; <nl> MTPaccount_GetPrivacy ( const MTPaccount_getPrivacy & v ) : MTPBoxed < MTPaccount_getPrivacy > ( v ) { <nl> } <nl> - MTPaccount_GetPrivacy ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPaccount_getPrivacy > ( from , end , cons ) { <nl> - } <nl> MTPaccount_GetPrivacy ( const MTPInputPrivacyKey & _key ) : MTPBoxed < MTPaccount_getPrivacy > ( MTPaccount_getPrivacy ( _key ) ) { <nl> } <nl> } ; <nl> class MTPaccount_setPrivacy { / / RPC method ' account . setPrivacy ' <nl> MTPInputPrivacyKey vkey ; <nl> MTPVector < MTPInputPrivacyRule > vrules ; <nl> <nl> - MTPaccount_setPrivacy ( ) { <nl> - } <nl> - MTPaccount_setPrivacy ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_account_setPrivacy ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPaccount_setPrivacy ( ) = default ; <nl> MTPaccount_setPrivacy ( const MTPInputPrivacyKey & _key , const MTPVector < MTPInputPrivacyRule > & _rules ) : vkey ( _key ) , vrules ( _rules ) { <nl> } <nl> <nl> class MTPaccount_setPrivacy { / / RPC method ' account . setPrivacy ' <nl> } ; <nl> class MTPaccount_SetPrivacy : public MTPBoxed < MTPaccount_setPrivacy > { <nl> public : <nl> - MTPaccount_SetPrivacy ( ) { <nl> - } <nl> + MTPaccount_SetPrivacy ( ) = default ; <nl> MTPaccount_SetPrivacy ( const MTPaccount_setPrivacy & v ) : MTPBoxed < MTPaccount_setPrivacy > ( v ) { <nl> } <nl> - MTPaccount_SetPrivacy ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPaccount_setPrivacy > ( from , end , cons ) { <nl> - } <nl> MTPaccount_SetPrivacy ( const MTPInputPrivacyKey & _key , const MTPVector < MTPInputPrivacyRule > & _rules ) : MTPBoxed < MTPaccount_setPrivacy > ( MTPaccount_setPrivacy ( _key , _rules ) ) { <nl> } <nl> } ; <nl> class MTPaccount_deleteAccount { / / RPC method ' account . deleteAccount ' <nl> public : <nl> MTPstring vreason ; <nl> <nl> - MTPaccount_deleteAccount ( ) { <nl> - } <nl> - MTPaccount_deleteAccount ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_account_deleteAccount ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPaccount_deleteAccount ( ) = default ; <nl> MTPaccount_deleteAccount ( const MTPstring & _reason ) : vreason ( _reason ) { <nl> } <nl> <nl> class MTPaccount_deleteAccount { / / RPC method ' account . deleteAccount ' <nl> } ; <nl> class MTPaccount_DeleteAccount : public MTPBoxed < MTPaccount_deleteAccount > { <nl> public : <nl> - MTPaccount_DeleteAccount ( ) { <nl> - } <nl> + MTPaccount_DeleteAccount ( ) = default ; <nl> MTPaccount_DeleteAccount ( const MTPaccount_deleteAccount & v ) : MTPBoxed < MTPaccount_deleteAccount > ( v ) { <nl> } <nl> - MTPaccount_DeleteAccount ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPaccount_deleteAccount > ( from , end , cons ) { <nl> - } <nl> MTPaccount_DeleteAccount ( const MTPstring & _reason ) : MTPBoxed < MTPaccount_deleteAccount > ( MTPaccount_deleteAccount ( _reason ) ) { <nl> } <nl> } ; <nl> <nl> class MTPaccount_getAccountTTL { / / RPC method ' account . getAccountTTL ' <nl> public : <nl> - MTPaccount_getAccountTTL ( ) { <nl> - } <nl> - MTPaccount_getAccountTTL ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_account_getAccountTTL ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPaccount_getAccountTTL ( ) = default ; <nl> <nl> uint32 innerLength ( ) const { <nl> return 0 ; <nl> class MTPaccount_getAccountTTL { / / RPC method ' account . getAccountTTL ' <nl> } ; <nl> class MTPaccount_GetAccountTTL : public MTPBoxed < MTPaccount_getAccountTTL > { <nl> public : <nl> - MTPaccount_GetAccountTTL ( ) { <nl> - } <nl> + MTPaccount_GetAccountTTL ( ) = default ; <nl> MTPaccount_GetAccountTTL ( const MTPaccount_getAccountTTL & v ) : MTPBoxed < MTPaccount_getAccountTTL > ( v ) { <nl> } <nl> - MTPaccount_GetAccountTTL ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPaccount_getAccountTTL > ( from , end , cons ) { <nl> - } <nl> } ; <nl> <nl> class MTPaccount_setAccountTTL { / / RPC method ' account . setAccountTTL ' <nl> public : <nl> MTPAccountDaysTTL vttl ; <nl> <nl> - MTPaccount_setAccountTTL ( ) { <nl> - } <nl> - MTPaccount_setAccountTTL ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_account_setAccountTTL ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPaccount_setAccountTTL ( ) = default ; <nl> MTPaccount_setAccountTTL ( const MTPAccountDaysTTL & _ttl ) : vttl ( _ttl ) { <nl> } <nl> <nl> class MTPaccount_setAccountTTL { / / RPC method ' account . setAccountTTL ' <nl> } ; <nl> class MTPaccount_SetAccountTTL : public MTPBoxed < MTPaccount_setAccountTTL > { <nl> public : <nl> - MTPaccount_SetAccountTTL ( ) { <nl> - } <nl> + MTPaccount_SetAccountTTL ( ) = default ; <nl> MTPaccount_SetAccountTTL ( const MTPaccount_setAccountTTL & v ) : MTPBoxed < MTPaccount_setAccountTTL > ( v ) { <nl> } <nl> - MTPaccount_SetAccountTTL ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPaccount_setAccountTTL > ( from , end , cons ) { <nl> - } <nl> MTPaccount_SetAccountTTL ( const MTPAccountDaysTTL & _ttl ) : MTPBoxed < MTPaccount_setAccountTTL > ( MTPaccount_setAccountTTL ( _ttl ) ) { <nl> } <nl> } ; <nl> class MTPaccount_sendChangePhoneCode { / / RPC method ' account . sendChangePhoneCod <nl> MTPstring vphone_number ; <nl> MTPBool vcurrent_number ; <nl> <nl> - MTPaccount_sendChangePhoneCode ( ) { <nl> - } <nl> - MTPaccount_sendChangePhoneCode ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_account_sendChangePhoneCode ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPaccount_sendChangePhoneCode ( ) = default ; <nl> MTPaccount_sendChangePhoneCode ( const MTPflags < MTPaccount_sendChangePhoneCode : : Flags > & _flags , const MTPstring & _phone_number , MTPBool _current_number ) : vflags ( _flags ) , vphone_number ( _phone_number ) , vcurrent_number ( _current_number ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPaccount_sendChangePhoneCode : : Flags ) <nl> <nl> class MTPaccount_SendChangePhoneCode : public MTPBoxed < MTPaccount_sendChangePhoneCode > { <nl> public : <nl> - MTPaccount_SendChangePhoneCode ( ) { <nl> - } <nl> + MTPaccount_SendChangePhoneCode ( ) = default ; <nl> MTPaccount_SendChangePhoneCode ( const MTPaccount_sendChangePhoneCode & v ) : MTPBoxed < MTPaccount_sendChangePhoneCode > ( v ) { <nl> } <nl> - MTPaccount_SendChangePhoneCode ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPaccount_sendChangePhoneCode > ( from , end , cons ) { <nl> - } <nl> MTPaccount_SendChangePhoneCode ( const MTPflags < MTPaccount_sendChangePhoneCode : : Flags > & _flags , const MTPstring & _phone_number , MTPBool _current_number ) : MTPBoxed < MTPaccount_sendChangePhoneCode > ( MTPaccount_sendChangePhoneCode ( _flags , _phone_number , _current_number ) ) { <nl> } <nl> } ; <nl> class MTPaccount_changePhone { / / RPC method ' account . changePhone ' <nl> MTPstring vphone_code_hash ; <nl> MTPstring vphone_code ; <nl> <nl> - MTPaccount_changePhone ( ) { <nl> - } <nl> - MTPaccount_changePhone ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_account_changePhone ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPaccount_changePhone ( ) = default ; <nl> MTPaccount_changePhone ( const MTPstring & _phone_number , const MTPstring & _phone_code_hash , const MTPstring & _phone_code ) : vphone_number ( _phone_number ) , vphone_code_hash ( _phone_code_hash ) , vphone_code ( _phone_code ) { <nl> } <nl> <nl> class MTPaccount_changePhone { / / RPC method ' account . changePhone ' <nl> } ; <nl> class MTPaccount_ChangePhone : public MTPBoxed < MTPaccount_changePhone > { <nl> public : <nl> - MTPaccount_ChangePhone ( ) { <nl> - } <nl> + MTPaccount_ChangePhone ( ) = default ; <nl> MTPaccount_ChangePhone ( const MTPaccount_changePhone & v ) : MTPBoxed < MTPaccount_changePhone > ( v ) { <nl> } <nl> - MTPaccount_ChangePhone ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPaccount_changePhone > ( from , end , cons ) { <nl> - } <nl> MTPaccount_ChangePhone ( const MTPstring & _phone_number , const MTPstring & _phone_code_hash , const MTPstring & _phone_code ) : MTPBoxed < MTPaccount_changePhone > ( MTPaccount_changePhone ( _phone_number , _phone_code_hash , _phone_code ) ) { <nl> } <nl> } ; <nl> class MTPaccount_updateDeviceLocked { / / RPC method ' account . updateDeviceLocked ' <nl> public : <nl> MTPint vperiod ; <nl> <nl> - MTPaccount_updateDeviceLocked ( ) { <nl> - } <nl> - MTPaccount_updateDeviceLocked ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_account_updateDeviceLocked ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPaccount_updateDeviceLocked ( ) = default ; <nl> MTPaccount_updateDeviceLocked ( MTPint _period ) : vperiod ( _period ) { <nl> } <nl> <nl> class MTPaccount_updateDeviceLocked { / / RPC method ' account . updateDeviceLocked ' <nl> } ; <nl> class MTPaccount_UpdateDeviceLocked : public MTPBoxed < MTPaccount_updateDeviceLocked > { <nl> public : <nl> - MTPaccount_UpdateDeviceLocked ( ) { <nl> - } <nl> + MTPaccount_UpdateDeviceLocked ( ) = default ; <nl> MTPaccount_UpdateDeviceLocked ( const MTPaccount_updateDeviceLocked & v ) : MTPBoxed < MTPaccount_updateDeviceLocked > ( v ) { <nl> } <nl> - MTPaccount_UpdateDeviceLocked ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPaccount_updateDeviceLocked > ( from , end , cons ) { <nl> - } <nl> MTPaccount_UpdateDeviceLocked ( MTPint _period ) : MTPBoxed < MTPaccount_updateDeviceLocked > ( MTPaccount_updateDeviceLocked ( _period ) ) { <nl> } <nl> } ; <nl> <nl> class MTPaccount_getAuthorizations { / / RPC method ' account . getAuthorizations ' <nl> public : <nl> - MTPaccount_getAuthorizations ( ) { <nl> - } <nl> - MTPaccount_getAuthorizations ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_account_getAuthorizations ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPaccount_getAuthorizations ( ) = default ; <nl> <nl> uint32 innerLength ( ) const { <nl> return 0 ; <nl> class MTPaccount_getAuthorizations { / / RPC method ' account . getAuthorizations ' <nl> } ; <nl> class MTPaccount_GetAuthorizations : public MTPBoxed < MTPaccount_getAuthorizations > { <nl> public : <nl> - MTPaccount_GetAuthorizations ( ) { <nl> - } <nl> + MTPaccount_GetAuthorizations ( ) = default ; <nl> MTPaccount_GetAuthorizations ( const MTPaccount_getAuthorizations & v ) : MTPBoxed < MTPaccount_getAuthorizations > ( v ) { <nl> } <nl> - MTPaccount_GetAuthorizations ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPaccount_getAuthorizations > ( from , end , cons ) { <nl> - } <nl> } ; <nl> <nl> class MTPaccount_resetAuthorization { / / RPC method ' account . resetAuthorization ' <nl> public : <nl> MTPlong vhash ; <nl> <nl> - MTPaccount_resetAuthorization ( ) { <nl> - } <nl> - MTPaccount_resetAuthorization ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_account_resetAuthorization ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPaccount_resetAuthorization ( ) = default ; <nl> MTPaccount_resetAuthorization ( const MTPlong & _hash ) : vhash ( _hash ) { <nl> } <nl> <nl> class MTPaccount_resetAuthorization { / / RPC method ' account . resetAuthorization ' <nl> } ; <nl> class MTPaccount_ResetAuthorization : public MTPBoxed < MTPaccount_resetAuthorization > { <nl> public : <nl> - MTPaccount_ResetAuthorization ( ) { <nl> - } <nl> + MTPaccount_ResetAuthorization ( ) = default ; <nl> MTPaccount_ResetAuthorization ( const MTPaccount_resetAuthorization & v ) : MTPBoxed < MTPaccount_resetAuthorization > ( v ) { <nl> } <nl> - MTPaccount_ResetAuthorization ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPaccount_resetAuthorization > ( from , end , cons ) { <nl> - } <nl> MTPaccount_ResetAuthorization ( const MTPlong & _hash ) : MTPBoxed < MTPaccount_resetAuthorization > ( MTPaccount_resetAuthorization ( _hash ) ) { <nl> } <nl> } ; <nl> <nl> class MTPaccount_getPassword { / / RPC method ' account . getPassword ' <nl> public : <nl> - MTPaccount_getPassword ( ) { <nl> - } <nl> - MTPaccount_getPassword ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_account_getPassword ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPaccount_getPassword ( ) = default ; <nl> <nl> uint32 innerLength ( ) const { <nl> return 0 ; <nl> class MTPaccount_getPassword { / / RPC method ' account . getPassword ' <nl> } ; <nl> class MTPaccount_GetPassword : public MTPBoxed < MTPaccount_getPassword > { <nl> public : <nl> - MTPaccount_GetPassword ( ) { <nl> - } <nl> + MTPaccount_GetPassword ( ) = default ; <nl> MTPaccount_GetPassword ( const MTPaccount_getPassword & v ) : MTPBoxed < MTPaccount_getPassword > ( v ) { <nl> } <nl> - MTPaccount_GetPassword ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPaccount_getPassword > ( from , end , cons ) { <nl> - } <nl> } ; <nl> <nl> class MTPaccount_getPasswordSettings { / / RPC method ' account . getPasswordSettings ' <nl> public : <nl> MTPbytes vcurrent_password_hash ; <nl> <nl> - MTPaccount_getPasswordSettings ( ) { <nl> - } <nl> - MTPaccount_getPasswordSettings ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_account_getPasswordSettings ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPaccount_getPasswordSettings ( ) = default ; <nl> MTPaccount_getPasswordSettings ( const MTPbytes & _current_password_hash ) : vcurrent_password_hash ( _current_password_hash ) { <nl> } <nl> <nl> class MTPaccount_getPasswordSettings { / / RPC method ' account . getPasswordSetting <nl> } ; <nl> class MTPaccount_GetPasswordSettings : public MTPBoxed < MTPaccount_getPasswordSettings > { <nl> public : <nl> - MTPaccount_GetPasswordSettings ( ) { <nl> - } <nl> + MTPaccount_GetPasswordSettings ( ) = default ; <nl> MTPaccount_GetPasswordSettings ( const MTPaccount_getPasswordSettings & v ) : MTPBoxed < MTPaccount_getPasswordSettings > ( v ) { <nl> } <nl> - MTPaccount_GetPasswordSettings ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPaccount_getPasswordSettings > ( from , end , cons ) { <nl> - } <nl> MTPaccount_GetPasswordSettings ( const MTPbytes & _current_password_hash ) : MTPBoxed < MTPaccount_getPasswordSettings > ( MTPaccount_getPasswordSettings ( _current_password_hash ) ) { <nl> } <nl> } ; <nl> class MTPaccount_updatePasswordSettings { / / RPC method ' account . updatePasswordS <nl> MTPbytes vcurrent_password_hash ; <nl> MTPaccount_PasswordInputSettings vnew_settings ; <nl> <nl> - MTPaccount_updatePasswordSettings ( ) { <nl> - } <nl> - MTPaccount_updatePasswordSettings ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_account_updatePasswordSettings ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPaccount_updatePasswordSettings ( ) = default ; <nl> MTPaccount_updatePasswordSettings ( const MTPbytes & _current_password_hash , const MTPaccount_PasswordInputSettings & _new_settings ) : vcurrent_password_hash ( _current_password_hash ) , vnew_settings ( _new_settings ) { <nl> } <nl> <nl> class MTPaccount_updatePasswordSettings { / / RPC method ' account . updatePasswordS <nl> } ; <nl> class MTPaccount_UpdatePasswordSettings : public MTPBoxed < MTPaccount_updatePasswordSettings > { <nl> public : <nl> - MTPaccount_UpdatePasswordSettings ( ) { <nl> - } <nl> + MTPaccount_UpdatePasswordSettings ( ) = default ; <nl> MTPaccount_UpdatePasswordSettings ( const MTPaccount_updatePasswordSettings & v ) : MTPBoxed < MTPaccount_updatePasswordSettings > ( v ) { <nl> } <nl> - MTPaccount_UpdatePasswordSettings ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPaccount_updatePasswordSettings > ( from , end , cons ) { <nl> - } <nl> MTPaccount_UpdatePasswordSettings ( const MTPbytes & _current_password_hash , const MTPaccount_PasswordInputSettings & _new_settings ) : MTPBoxed < MTPaccount_updatePasswordSettings > ( MTPaccount_updatePasswordSettings ( _current_password_hash , _new_settings ) ) { <nl> } <nl> } ; <nl> class MTPaccount_sendConfirmPhoneCode { / / RPC method ' account . sendConfirmPhoneC <nl> MTPstring vhash ; <nl> MTPBool vcurrent_number ; <nl> <nl> - MTPaccount_sendConfirmPhoneCode ( ) { <nl> - } <nl> - MTPaccount_sendConfirmPhoneCode ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_account_sendConfirmPhoneCode ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPaccount_sendConfirmPhoneCode ( ) = default ; <nl> MTPaccount_sendConfirmPhoneCode ( const MTPflags < MTPaccount_sendConfirmPhoneCode : : Flags > & _flags , const MTPstring & _hash , MTPBool _current_number ) : vflags ( _flags ) , vhash ( _hash ) , vcurrent_number ( _current_number ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPaccount_sendConfirmPhoneCode : : Flags ) <nl> <nl> class MTPaccount_SendConfirmPhoneCode : public MTPBoxed < MTPaccount_sendConfirmPhoneCode > { <nl> public : <nl> - MTPaccount_SendConfirmPhoneCode ( ) { <nl> - } <nl> + MTPaccount_SendConfirmPhoneCode ( ) = default ; <nl> MTPaccount_SendConfirmPhoneCode ( const MTPaccount_sendConfirmPhoneCode & v ) : MTPBoxed < MTPaccount_sendConfirmPhoneCode > ( v ) { <nl> } <nl> - MTPaccount_SendConfirmPhoneCode ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPaccount_sendConfirmPhoneCode > ( from , end , cons ) { <nl> - } <nl> MTPaccount_SendConfirmPhoneCode ( const MTPflags < MTPaccount_sendConfirmPhoneCode : : Flags > & _flags , const MTPstring & _hash , MTPBool _current_number ) : MTPBoxed < MTPaccount_sendConfirmPhoneCode > ( MTPaccount_sendConfirmPhoneCode ( _flags , _hash , _current_number ) ) { <nl> } <nl> } ; <nl> class MTPaccount_confirmPhone { / / RPC method ' account . confirmPhone ' <nl> MTPstring vphone_code_hash ; <nl> MTPstring vphone_code ; <nl> <nl> - MTPaccount_confirmPhone ( ) { <nl> - } <nl> - MTPaccount_confirmPhone ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_account_confirmPhone ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPaccount_confirmPhone ( ) = default ; <nl> MTPaccount_confirmPhone ( const MTPstring & _phone_code_hash , const MTPstring & _phone_code ) : vphone_code_hash ( _phone_code_hash ) , vphone_code ( _phone_code ) { <nl> } <nl> <nl> class MTPaccount_confirmPhone { / / RPC method ' account . confirmPhone ' <nl> } ; <nl> class MTPaccount_ConfirmPhone : public MTPBoxed < MTPaccount_confirmPhone > { <nl> public : <nl> - MTPaccount_ConfirmPhone ( ) { <nl> - } <nl> + MTPaccount_ConfirmPhone ( ) = default ; <nl> MTPaccount_ConfirmPhone ( const MTPaccount_confirmPhone & v ) : MTPBoxed < MTPaccount_confirmPhone > ( v ) { <nl> } <nl> - MTPaccount_ConfirmPhone ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPaccount_confirmPhone > ( from , end , cons ) { <nl> - } <nl> MTPaccount_ConfirmPhone ( const MTPstring & _phone_code_hash , const MTPstring & _phone_code ) : MTPBoxed < MTPaccount_confirmPhone > ( MTPaccount_confirmPhone ( _phone_code_hash , _phone_code ) ) { <nl> } <nl> } ; <nl> class MTPusers_getUsers { / / RPC method ' users . getUsers ' <nl> public : <nl> MTPVector < MTPInputUser > vid ; <nl> <nl> - MTPusers_getUsers ( ) { <nl> - } <nl> - MTPusers_getUsers ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_users_getUsers ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPusers_getUsers ( ) = default ; <nl> MTPusers_getUsers ( const MTPVector < MTPInputUser > & _id ) : vid ( _id ) { <nl> } <nl> <nl> class MTPusers_getUsers { / / RPC method ' users . getUsers ' <nl> } ; <nl> class MTPusers_GetUsers : public MTPBoxed < MTPusers_getUsers > { <nl> public : <nl> - MTPusers_GetUsers ( ) { <nl> - } <nl> + MTPusers_GetUsers ( ) = default ; <nl> MTPusers_GetUsers ( const MTPusers_getUsers & v ) : MTPBoxed < MTPusers_getUsers > ( v ) { <nl> } <nl> - MTPusers_GetUsers ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPusers_getUsers > ( from , end , cons ) { <nl> - } <nl> MTPusers_GetUsers ( const MTPVector < MTPInputUser > & _id ) : MTPBoxed < MTPusers_getUsers > ( MTPusers_getUsers ( _id ) ) { <nl> } <nl> } ; <nl> class MTPusers_getFullUser { / / RPC method ' users . getFullUser ' <nl> public : <nl> MTPInputUser vid ; <nl> <nl> - MTPusers_getFullUser ( ) { <nl> - } <nl> - MTPusers_getFullUser ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_users_getFullUser ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPusers_getFullUser ( ) = default ; <nl> MTPusers_getFullUser ( const MTPInputUser & _id ) : vid ( _id ) { <nl> } <nl> <nl> class MTPusers_getFullUser { / / RPC method ' users . getFullUser ' <nl> } ; <nl> class MTPusers_GetFullUser : public MTPBoxed < MTPusers_getFullUser > { <nl> public : <nl> - MTPusers_GetFullUser ( ) { <nl> - } <nl> + MTPusers_GetFullUser ( ) = default ; <nl> MTPusers_GetFullUser ( const MTPusers_getFullUser & v ) : MTPBoxed < MTPusers_getFullUser > ( v ) { <nl> } <nl> - MTPusers_GetFullUser ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPusers_getFullUser > ( from , end , cons ) { <nl> - } <nl> MTPusers_GetFullUser ( const MTPInputUser & _id ) : MTPBoxed < MTPusers_getFullUser > ( MTPusers_getFullUser ( _id ) ) { <nl> } <nl> } ; <nl> <nl> class MTPcontacts_getStatuses { / / RPC method ' contacts . getStatuses ' <nl> public : <nl> - MTPcontacts_getStatuses ( ) { <nl> - } <nl> - MTPcontacts_getStatuses ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_contacts_getStatuses ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPcontacts_getStatuses ( ) = default ; <nl> <nl> uint32 innerLength ( ) const { <nl> return 0 ; <nl> class MTPcontacts_getStatuses { / / RPC method ' contacts . getStatuses ' <nl> } ; <nl> class MTPcontacts_GetStatuses : public MTPBoxed < MTPcontacts_getStatuses > { <nl> public : <nl> - MTPcontacts_GetStatuses ( ) { <nl> - } <nl> + MTPcontacts_GetStatuses ( ) = default ; <nl> MTPcontacts_GetStatuses ( const MTPcontacts_getStatuses & v ) : MTPBoxed < MTPcontacts_getStatuses > ( v ) { <nl> } <nl> - MTPcontacts_GetStatuses ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPcontacts_getStatuses > ( from , end , cons ) { <nl> - } <nl> } ; <nl> <nl> class MTPcontacts_getContacts { / / RPC method ' contacts . getContacts ' <nl> public : <nl> MTPstring vhash ; <nl> <nl> - MTPcontacts_getContacts ( ) { <nl> - } <nl> - MTPcontacts_getContacts ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_contacts_getContacts ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPcontacts_getContacts ( ) = default ; <nl> MTPcontacts_getContacts ( const MTPstring & _hash ) : vhash ( _hash ) { <nl> } <nl> <nl> class MTPcontacts_getContacts { / / RPC method ' contacts . getContacts ' <nl> } ; <nl> class MTPcontacts_GetContacts : public MTPBoxed < MTPcontacts_getContacts > { <nl> public : <nl> - MTPcontacts_GetContacts ( ) { <nl> - } <nl> + MTPcontacts_GetContacts ( ) = default ; <nl> MTPcontacts_GetContacts ( const MTPcontacts_getContacts & v ) : MTPBoxed < MTPcontacts_getContacts > ( v ) { <nl> } <nl> - MTPcontacts_GetContacts ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPcontacts_getContacts > ( from , end , cons ) { <nl> - } <nl> MTPcontacts_GetContacts ( const MTPstring & _hash ) : MTPBoxed < MTPcontacts_getContacts > ( MTPcontacts_getContacts ( _hash ) ) { <nl> } <nl> } ; <nl> class MTPcontacts_importContacts { / / RPC method ' contacts . importContacts ' <nl> MTPVector < MTPInputContact > vcontacts ; <nl> MTPBool vreplace ; <nl> <nl> - MTPcontacts_importContacts ( ) { <nl> - } <nl> - MTPcontacts_importContacts ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_contacts_importContacts ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPcontacts_importContacts ( ) = default ; <nl> MTPcontacts_importContacts ( const MTPVector < MTPInputContact > & _contacts , MTPBool _replace ) : vcontacts ( _contacts ) , vreplace ( _replace ) { <nl> } <nl> <nl> class MTPcontacts_importContacts { / / RPC method ' contacts . importContacts ' <nl> } ; <nl> class MTPcontacts_ImportContacts : public MTPBoxed < MTPcontacts_importContacts > { <nl> public : <nl> - MTPcontacts_ImportContacts ( ) { <nl> - } <nl> + MTPcontacts_ImportContacts ( ) = default ; <nl> MTPcontacts_ImportContacts ( const MTPcontacts_importContacts & v ) : MTPBoxed < MTPcontacts_importContacts > ( v ) { <nl> } <nl> - MTPcontacts_ImportContacts ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPcontacts_importContacts > ( from , end , cons ) { <nl> - } <nl> MTPcontacts_ImportContacts ( const MTPVector < MTPInputContact > & _contacts , MTPBool _replace ) : MTPBoxed < MTPcontacts_importContacts > ( MTPcontacts_importContacts ( _contacts , _replace ) ) { <nl> } <nl> } ; <nl> class MTPcontacts_deleteContact { / / RPC method ' contacts . deleteContact ' <nl> public : <nl> MTPInputUser vid ; <nl> <nl> - MTPcontacts_deleteContact ( ) { <nl> - } <nl> - MTPcontacts_deleteContact ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_contacts_deleteContact ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPcontacts_deleteContact ( ) = default ; <nl> MTPcontacts_deleteContact ( const MTPInputUser & _id ) : vid ( _id ) { <nl> } <nl> <nl> class MTPcontacts_deleteContact { / / RPC method ' contacts . deleteContact ' <nl> } ; <nl> class MTPcontacts_DeleteContact : public MTPBoxed < MTPcontacts_deleteContact > { <nl> public : <nl> - MTPcontacts_DeleteContact ( ) { <nl> - } <nl> + MTPcontacts_DeleteContact ( ) = default ; <nl> MTPcontacts_DeleteContact ( const MTPcontacts_deleteContact & v ) : MTPBoxed < MTPcontacts_deleteContact > ( v ) { <nl> } <nl> - MTPcontacts_DeleteContact ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPcontacts_deleteContact > ( from , end , cons ) { <nl> - } <nl> MTPcontacts_DeleteContact ( const MTPInputUser & _id ) : MTPBoxed < MTPcontacts_deleteContact > ( MTPcontacts_deleteContact ( _id ) ) { <nl> } <nl> } ; <nl> class MTPcontacts_deleteContacts { / / RPC method ' contacts . deleteContacts ' <nl> public : <nl> MTPVector < MTPInputUser > vid ; <nl> <nl> - MTPcontacts_deleteContacts ( ) { <nl> - } <nl> - MTPcontacts_deleteContacts ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_contacts_deleteContacts ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPcontacts_deleteContacts ( ) = default ; <nl> MTPcontacts_deleteContacts ( const MTPVector < MTPInputUser > & _id ) : vid ( _id ) { <nl> } <nl> <nl> class MTPcontacts_deleteContacts { / / RPC method ' contacts . deleteContacts ' <nl> } ; <nl> class MTPcontacts_DeleteContacts : public MTPBoxed < MTPcontacts_deleteContacts > { <nl> public : <nl> - MTPcontacts_DeleteContacts ( ) { <nl> - } <nl> + MTPcontacts_DeleteContacts ( ) = default ; <nl> MTPcontacts_DeleteContacts ( const MTPcontacts_deleteContacts & v ) : MTPBoxed < MTPcontacts_deleteContacts > ( v ) { <nl> } <nl> - MTPcontacts_DeleteContacts ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPcontacts_deleteContacts > ( from , end , cons ) { <nl> - } <nl> MTPcontacts_DeleteContacts ( const MTPVector < MTPInputUser > & _id ) : MTPBoxed < MTPcontacts_deleteContacts > ( MTPcontacts_deleteContacts ( _id ) ) { <nl> } <nl> } ; <nl> class MTPcontacts_block { / / RPC method ' contacts . block ' <nl> public : <nl> MTPInputUser vid ; <nl> <nl> - MTPcontacts_block ( ) { <nl> - } <nl> - MTPcontacts_block ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_contacts_block ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPcontacts_block ( ) = default ; <nl> MTPcontacts_block ( const MTPInputUser & _id ) : vid ( _id ) { <nl> } <nl> <nl> class MTPcontacts_block { / / RPC method ' contacts . block ' <nl> } ; <nl> class MTPcontacts_Block : public MTPBoxed < MTPcontacts_block > { <nl> public : <nl> - MTPcontacts_Block ( ) { <nl> - } <nl> + MTPcontacts_Block ( ) = default ; <nl> MTPcontacts_Block ( const MTPcontacts_block & v ) : MTPBoxed < MTPcontacts_block > ( v ) { <nl> } <nl> - MTPcontacts_Block ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPcontacts_block > ( from , end , cons ) { <nl> - } <nl> MTPcontacts_Block ( const MTPInputUser & _id ) : MTPBoxed < MTPcontacts_block > ( MTPcontacts_block ( _id ) ) { <nl> } <nl> } ; <nl> class MTPcontacts_unblock { / / RPC method ' contacts . unblock ' <nl> public : <nl> MTPInputUser vid ; <nl> <nl> - MTPcontacts_unblock ( ) { <nl> - } <nl> - MTPcontacts_unblock ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_contacts_unblock ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPcontacts_unblock ( ) = default ; <nl> MTPcontacts_unblock ( const MTPInputUser & _id ) : vid ( _id ) { <nl> } <nl> <nl> class MTPcontacts_unblock { / / RPC method ' contacts . unblock ' <nl> } ; <nl> class MTPcontacts_Unblock : public MTPBoxed < MTPcontacts_unblock > { <nl> public : <nl> - MTPcontacts_Unblock ( ) { <nl> - } <nl> + MTPcontacts_Unblock ( ) = default ; <nl> MTPcontacts_Unblock ( const MTPcontacts_unblock & v ) : MTPBoxed < MTPcontacts_unblock > ( v ) { <nl> } <nl> - MTPcontacts_Unblock ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPcontacts_unblock > ( from , end , cons ) { <nl> - } <nl> MTPcontacts_Unblock ( const MTPInputUser & _id ) : MTPBoxed < MTPcontacts_unblock > ( MTPcontacts_unblock ( _id ) ) { <nl> } <nl> } ; <nl> class MTPcontacts_getBlocked { / / RPC method ' contacts . getBlocked ' <nl> MTPint voffset ; <nl> MTPint vlimit ; <nl> <nl> - MTPcontacts_getBlocked ( ) { <nl> - } <nl> - MTPcontacts_getBlocked ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_contacts_getBlocked ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPcontacts_getBlocked ( ) = default ; <nl> MTPcontacts_getBlocked ( MTPint _offset , MTPint _limit ) : voffset ( _offset ) , vlimit ( _limit ) { <nl> } <nl> <nl> class MTPcontacts_getBlocked { / / RPC method ' contacts . getBlocked ' <nl> } ; <nl> class MTPcontacts_GetBlocked : public MTPBoxed < MTPcontacts_getBlocked > { <nl> public : <nl> - MTPcontacts_GetBlocked ( ) { <nl> - } <nl> + MTPcontacts_GetBlocked ( ) = default ; <nl> MTPcontacts_GetBlocked ( const MTPcontacts_getBlocked & v ) : MTPBoxed < MTPcontacts_getBlocked > ( v ) { <nl> } <nl> - MTPcontacts_GetBlocked ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPcontacts_getBlocked > ( from , end , cons ) { <nl> - } <nl> MTPcontacts_GetBlocked ( MTPint _offset , MTPint _limit ) : MTPBoxed < MTPcontacts_getBlocked > ( MTPcontacts_getBlocked ( _offset , _limit ) ) { <nl> } <nl> } ; <nl> <nl> class MTPcontacts_exportCard { / / RPC method ' contacts . exportCard ' <nl> public : <nl> - MTPcontacts_exportCard ( ) { <nl> - } <nl> - MTPcontacts_exportCard ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_contacts_exportCard ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPcontacts_exportCard ( ) = default ; <nl> <nl> uint32 innerLength ( ) const { <nl> return 0 ; <nl> class MTPcontacts_exportCard { / / RPC method ' contacts . exportCard ' <nl> } ; <nl> class MTPcontacts_ExportCard : public MTPBoxed < MTPcontacts_exportCard > { <nl> public : <nl> - MTPcontacts_ExportCard ( ) { <nl> - } <nl> + MTPcontacts_ExportCard ( ) = default ; <nl> MTPcontacts_ExportCard ( const MTPcontacts_exportCard & v ) : MTPBoxed < MTPcontacts_exportCard > ( v ) { <nl> } <nl> - MTPcontacts_ExportCard ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPcontacts_exportCard > ( from , end , cons ) { <nl> - } <nl> } ; <nl> <nl> class MTPcontacts_importCard { / / RPC method ' contacts . importCard ' <nl> public : <nl> MTPVector < MTPint > vexport_card ; <nl> <nl> - MTPcontacts_importCard ( ) { <nl> - } <nl> - MTPcontacts_importCard ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_contacts_importCard ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPcontacts_importCard ( ) = default ; <nl> MTPcontacts_importCard ( const MTPVector < MTPint > & _export_card ) : vexport_card ( _export_card ) { <nl> } <nl> <nl> class MTPcontacts_importCard { / / RPC method ' contacts . importCard ' <nl> } ; <nl> class MTPcontacts_ImportCard : public MTPBoxed < MTPcontacts_importCard > { <nl> public : <nl> - MTPcontacts_ImportCard ( ) { <nl> - } <nl> + MTPcontacts_ImportCard ( ) = default ; <nl> MTPcontacts_ImportCard ( const MTPcontacts_importCard & v ) : MTPBoxed < MTPcontacts_importCard > ( v ) { <nl> } <nl> - MTPcontacts_ImportCard ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPcontacts_importCard > ( from , end , cons ) { <nl> - } <nl> MTPcontacts_ImportCard ( const MTPVector < MTPint > & _export_card ) : MTPBoxed < MTPcontacts_importCard > ( MTPcontacts_importCard ( _export_card ) ) { <nl> } <nl> } ; <nl> class MTPcontacts_search { / / RPC method ' contacts . search ' <nl> MTPstring vq ; <nl> MTPint vlimit ; <nl> <nl> - MTPcontacts_search ( ) { <nl> - } <nl> - MTPcontacts_search ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_contacts_search ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPcontacts_search ( ) = default ; <nl> MTPcontacts_search ( const MTPstring & _q , MTPint _limit ) : vq ( _q ) , vlimit ( _limit ) { <nl> } <nl> <nl> class MTPcontacts_search { / / RPC method ' contacts . search ' <nl> } ; <nl> class MTPcontacts_Search : public MTPBoxed < MTPcontacts_search > { <nl> public : <nl> - MTPcontacts_Search ( ) { <nl> - } <nl> + MTPcontacts_Search ( ) = default ; <nl> MTPcontacts_Search ( const MTPcontacts_search & v ) : MTPBoxed < MTPcontacts_search > ( v ) { <nl> } <nl> - MTPcontacts_Search ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPcontacts_search > ( from , end , cons ) { <nl> - } <nl> MTPcontacts_Search ( const MTPstring & _q , MTPint _limit ) : MTPBoxed < MTPcontacts_search > ( MTPcontacts_search ( _q , _limit ) ) { <nl> } <nl> } ; <nl> class MTPcontacts_resolveUsername { / / RPC method ' contacts . resolveUsername ' <nl> public : <nl> MTPstring vusername ; <nl> <nl> - MTPcontacts_resolveUsername ( ) { <nl> - } <nl> - MTPcontacts_resolveUsername ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_contacts_resolveUsername ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPcontacts_resolveUsername ( ) = default ; <nl> MTPcontacts_resolveUsername ( const MTPstring & _username ) : vusername ( _username ) { <nl> } <nl> <nl> class MTPcontacts_resolveUsername { / / RPC method ' contacts . resolveUsername ' <nl> } ; <nl> class MTPcontacts_ResolveUsername : public MTPBoxed < MTPcontacts_resolveUsername > { <nl> public : <nl> - MTPcontacts_ResolveUsername ( ) { <nl> - } <nl> + MTPcontacts_ResolveUsername ( ) = default ; <nl> MTPcontacts_ResolveUsername ( const MTPcontacts_resolveUsername & v ) : MTPBoxed < MTPcontacts_resolveUsername > ( v ) { <nl> } <nl> - MTPcontacts_ResolveUsername ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPcontacts_resolveUsername > ( from , end , cons ) { <nl> - } <nl> MTPcontacts_ResolveUsername ( const MTPstring & _username ) : MTPBoxed < MTPcontacts_resolveUsername > ( MTPcontacts_resolveUsername ( _username ) ) { <nl> } <nl> } ; <nl> class MTPcontacts_getTopPeers { / / RPC method ' contacts . getTopPeers ' <nl> MTPint vlimit ; <nl> MTPint vhash ; <nl> <nl> - MTPcontacts_getTopPeers ( ) { <nl> - } <nl> - MTPcontacts_getTopPeers ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_contacts_getTopPeers ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPcontacts_getTopPeers ( ) = default ; <nl> MTPcontacts_getTopPeers ( const MTPflags < MTPcontacts_getTopPeers : : Flags > & _flags , MTPint _offset , MTPint _limit , MTPint _hash ) : vflags ( _flags ) , voffset ( _offset ) , vlimit ( _limit ) , vhash ( _hash ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPcontacts_getTopPeers : : Flags ) <nl> <nl> class MTPcontacts_GetTopPeers : public MTPBoxed < MTPcontacts_getTopPeers > { <nl> public : <nl> - MTPcontacts_GetTopPeers ( ) { <nl> - } <nl> + MTPcontacts_GetTopPeers ( ) = default ; <nl> MTPcontacts_GetTopPeers ( const MTPcontacts_getTopPeers & v ) : MTPBoxed < MTPcontacts_getTopPeers > ( v ) { <nl> } <nl> - MTPcontacts_GetTopPeers ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPcontacts_getTopPeers > ( from , end , cons ) { <nl> - } <nl> MTPcontacts_GetTopPeers ( const MTPflags < MTPcontacts_getTopPeers : : Flags > & _flags , MTPint _offset , MTPint _limit , MTPint _hash ) : MTPBoxed < MTPcontacts_getTopPeers > ( MTPcontacts_getTopPeers ( _flags , _offset , _limit , _hash ) ) { <nl> } <nl> } ; <nl> class MTPcontacts_resetTopPeerRating { / / RPC method ' contacts . resetTopPeerRatin <nl> MTPTopPeerCategory vcategory ; <nl> MTPInputPeer vpeer ; <nl> <nl> - MTPcontacts_resetTopPeerRating ( ) { <nl> - } <nl> - MTPcontacts_resetTopPeerRating ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_contacts_resetTopPeerRating ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPcontacts_resetTopPeerRating ( ) = default ; <nl> MTPcontacts_resetTopPeerRating ( const MTPTopPeerCategory & _category , const MTPInputPeer & _peer ) : vcategory ( _category ) , vpeer ( _peer ) { <nl> } <nl> <nl> class MTPcontacts_resetTopPeerRating { / / RPC method ' contacts . resetTopPeerRatin <nl> } ; <nl> class MTPcontacts_ResetTopPeerRating : public MTPBoxed < MTPcontacts_resetTopPeerRating > { <nl> public : <nl> - MTPcontacts_ResetTopPeerRating ( ) { <nl> - } <nl> + MTPcontacts_ResetTopPeerRating ( ) = default ; <nl> MTPcontacts_ResetTopPeerRating ( const MTPcontacts_resetTopPeerRating & v ) : MTPBoxed < MTPcontacts_resetTopPeerRating > ( v ) { <nl> } <nl> - MTPcontacts_ResetTopPeerRating ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPcontacts_resetTopPeerRating > ( from , end , cons ) { <nl> - } <nl> MTPcontacts_ResetTopPeerRating ( const MTPTopPeerCategory & _category , const MTPInputPeer & _peer ) : MTPBoxed < MTPcontacts_resetTopPeerRating > ( MTPcontacts_resetTopPeerRating ( _category , _peer ) ) { <nl> } <nl> } ; <nl> class MTPmessages_getMessages { / / RPC method ' messages . getMessages ' <nl> public : <nl> MTPVector < MTPint > vid ; <nl> <nl> - MTPmessages_getMessages ( ) { <nl> - } <nl> - MTPmessages_getMessages ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_getMessages ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_getMessages ( ) = default ; <nl> MTPmessages_getMessages ( const MTPVector < MTPint > & _id ) : vid ( _id ) { <nl> } <nl> <nl> class MTPmessages_getMessages { / / RPC method ' messages . getMessages ' <nl> } ; <nl> class MTPmessages_GetMessages : public MTPBoxed < MTPmessages_getMessages > { <nl> public : <nl> - MTPmessages_GetMessages ( ) { <nl> - } <nl> + MTPmessages_GetMessages ( ) = default ; <nl> MTPmessages_GetMessages ( const MTPmessages_getMessages & v ) : MTPBoxed < MTPmessages_getMessages > ( v ) { <nl> } <nl> - MTPmessages_GetMessages ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_getMessages > ( from , end , cons ) { <nl> - } <nl> MTPmessages_GetMessages ( const MTPVector < MTPint > & _id ) : MTPBoxed < MTPmessages_getMessages > ( MTPmessages_getMessages ( _id ) ) { <nl> } <nl> } ; <nl> class MTPmessages_getDialogs { / / RPC method ' messages . getDialogs ' <nl> MTPInputPeer voffset_peer ; <nl> MTPint vlimit ; <nl> <nl> - MTPmessages_getDialogs ( ) { <nl> - } <nl> - MTPmessages_getDialogs ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_getDialogs ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_getDialogs ( ) = default ; <nl> MTPmessages_getDialogs ( const MTPflags < MTPmessages_getDialogs : : Flags > & _flags , MTPint _offset_date , MTPint _offset_id , const MTPInputPeer & _offset_peer , MTPint _limit ) : vflags ( _flags ) , voffset_date ( _offset_date ) , voffset_id ( _offset_id ) , voffset_peer ( _offset_peer ) , vlimit ( _limit ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPmessages_getDialogs : : Flags ) <nl> <nl> class MTPmessages_GetDialogs : public MTPBoxed < MTPmessages_getDialogs > { <nl> public : <nl> - MTPmessages_GetDialogs ( ) { <nl> - } <nl> + MTPmessages_GetDialogs ( ) = default ; <nl> MTPmessages_GetDialogs ( const MTPmessages_getDialogs & v ) : MTPBoxed < MTPmessages_getDialogs > ( v ) { <nl> } <nl> - MTPmessages_GetDialogs ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_getDialogs > ( from , end , cons ) { <nl> - } <nl> MTPmessages_GetDialogs ( const MTPflags < MTPmessages_getDialogs : : Flags > & _flags , MTPint _offset_date , MTPint _offset_id , const MTPInputPeer & _offset_peer , MTPint _limit ) : MTPBoxed < MTPmessages_getDialogs > ( MTPmessages_getDialogs ( _flags , _offset_date , _offset_id , _offset_peer , _limit ) ) { <nl> } <nl> } ; <nl> class MTPmessages_getHistory { / / RPC method ' messages . getHistory ' <nl> MTPint vmax_id ; <nl> MTPint vmin_id ; <nl> <nl> - MTPmessages_getHistory ( ) { <nl> - } <nl> - MTPmessages_getHistory ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_getHistory ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_getHistory ( ) = default ; <nl> MTPmessages_getHistory ( const MTPInputPeer & _peer , MTPint _offset_id , MTPint _offset_date , MTPint _add_offset , MTPint _limit , MTPint _max_id , MTPint _min_id ) : vpeer ( _peer ) , voffset_id ( _offset_id ) , voffset_date ( _offset_date ) , vadd_offset ( _add_offset ) , vlimit ( _limit ) , vmax_id ( _max_id ) , vmin_id ( _min_id ) { <nl> } <nl> <nl> class MTPmessages_getHistory { / / RPC method ' messages . getHistory ' <nl> } ; <nl> class MTPmessages_GetHistory : public MTPBoxed < MTPmessages_getHistory > { <nl> public : <nl> - MTPmessages_GetHistory ( ) { <nl> - } <nl> + MTPmessages_GetHistory ( ) = default ; <nl> MTPmessages_GetHistory ( const MTPmessages_getHistory & v ) : MTPBoxed < MTPmessages_getHistory > ( v ) { <nl> } <nl> - MTPmessages_GetHistory ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_getHistory > ( from , end , cons ) { <nl> - } <nl> MTPmessages_GetHistory ( const MTPInputPeer & _peer , MTPint _offset_id , MTPint _offset_date , MTPint _add_offset , MTPint _limit , MTPint _max_id , MTPint _min_id ) : MTPBoxed < MTPmessages_getHistory > ( MTPmessages_getHistory ( _peer , _offset_id , _offset_date , _add_offset , _limit , _max_id , _min_id ) ) { <nl> } <nl> } ; <nl> class MTPmessages_search { / / RPC method ' messages . search ' <nl> MTPint vmax_id ; <nl> MTPint vlimit ; <nl> <nl> - MTPmessages_search ( ) { <nl> - } <nl> - MTPmessages_search ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_search ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_search ( ) = default ; <nl> MTPmessages_search ( const MTPflags < MTPmessages_search : : Flags > & _flags , const MTPInputPeer & _peer , const MTPstring & _q , const MTPMessagesFilter & _filter , MTPint _min_date , MTPint _max_date , MTPint _offset , MTPint _max_id , MTPint _limit ) : vflags ( _flags ) , vpeer ( _peer ) , vq ( _q ) , vfilter ( _filter ) , vmin_date ( _min_date ) , vmax_date ( _max_date ) , voffset ( _offset ) , vmax_id ( _max_id ) , vlimit ( _limit ) { <nl> } <nl> <nl> class MTPmessages_search { / / RPC method ' messages . search ' <nl> } ; <nl> class MTPmessages_Search : public MTPBoxed < MTPmessages_search > { <nl> public : <nl> - MTPmessages_Search ( ) { <nl> - } <nl> + MTPmessages_Search ( ) = default ; <nl> MTPmessages_Search ( const MTPmessages_search & v ) : MTPBoxed < MTPmessages_search > ( v ) { <nl> } <nl> - MTPmessages_Search ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_search > ( from , end , cons ) { <nl> - } <nl> MTPmessages_Search ( const MTPflags < MTPmessages_search : : Flags > & _flags , const MTPInputPeer & _peer , const MTPstring & _q , const MTPMessagesFilter & _filter , MTPint _min_date , MTPint _max_date , MTPint _offset , MTPint _max_id , MTPint _limit ) : MTPBoxed < MTPmessages_search > ( MTPmessages_search ( _flags , _peer , _q , _filter , _min_date , _max_date , _offset , _max_id , _limit ) ) { <nl> } <nl> } ; <nl> class MTPmessages_readHistory { / / RPC method ' messages . readHistory ' <nl> MTPInputPeer vpeer ; <nl> MTPint vmax_id ; <nl> <nl> - MTPmessages_readHistory ( ) { <nl> - } <nl> - MTPmessages_readHistory ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_readHistory ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_readHistory ( ) = default ; <nl> MTPmessages_readHistory ( const MTPInputPeer & _peer , MTPint _max_id ) : vpeer ( _peer ) , vmax_id ( _max_id ) { <nl> } <nl> <nl> class MTPmessages_readHistory { / / RPC method ' messages . readHistory ' <nl> } ; <nl> class MTPmessages_ReadHistory : public MTPBoxed < MTPmessages_readHistory > { <nl> public : <nl> - MTPmessages_ReadHistory ( ) { <nl> - } <nl> + MTPmessages_ReadHistory ( ) = default ; <nl> MTPmessages_ReadHistory ( const MTPmessages_readHistory & v ) : MTPBoxed < MTPmessages_readHistory > ( v ) { <nl> } <nl> - MTPmessages_ReadHistory ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_readHistory > ( from , end , cons ) { <nl> - } <nl> MTPmessages_ReadHistory ( const MTPInputPeer & _peer , MTPint _max_id ) : MTPBoxed < MTPmessages_readHistory > ( MTPmessages_readHistory ( _peer , _max_id ) ) { <nl> } <nl> } ; <nl> class MTPmessages_deleteHistory { / / RPC method ' messages . deleteHistory ' <nl> MTPInputPeer vpeer ; <nl> MTPint vmax_id ; <nl> <nl> - MTPmessages_deleteHistory ( ) { <nl> - } <nl> - MTPmessages_deleteHistory ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_deleteHistory ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_deleteHistory ( ) = default ; <nl> MTPmessages_deleteHistory ( const MTPflags < MTPmessages_deleteHistory : : Flags > & _flags , const MTPInputPeer & _peer , MTPint _max_id ) : vflags ( _flags ) , vpeer ( _peer ) , vmax_id ( _max_id ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPmessages_deleteHistory : : Flags ) <nl> <nl> class MTPmessages_DeleteHistory : public MTPBoxed < MTPmessages_deleteHistory > { <nl> public : <nl> - MTPmessages_DeleteHistory ( ) { <nl> - } <nl> + MTPmessages_DeleteHistory ( ) = default ; <nl> MTPmessages_DeleteHistory ( const MTPmessages_deleteHistory & v ) : MTPBoxed < MTPmessages_deleteHistory > ( v ) { <nl> } <nl> - MTPmessages_DeleteHistory ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_deleteHistory > ( from , end , cons ) { <nl> - } <nl> MTPmessages_DeleteHistory ( const MTPflags < MTPmessages_deleteHistory : : Flags > & _flags , const MTPInputPeer & _peer , MTPint _max_id ) : MTPBoxed < MTPmessages_deleteHistory > ( MTPmessages_deleteHistory ( _flags , _peer , _max_id ) ) { <nl> } <nl> } ; <nl> class MTPmessages_deleteMessages { / / RPC method ' messages . deleteMessages ' <nl> MTPflags < MTPmessages_deleteMessages : : Flags > vflags ; <nl> MTPVector < MTPint > vid ; <nl> <nl> - MTPmessages_deleteMessages ( ) { <nl> - } <nl> - MTPmessages_deleteMessages ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_deleteMessages ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_deleteMessages ( ) = default ; <nl> MTPmessages_deleteMessages ( const MTPflags < MTPmessages_deleteMessages : : Flags > & _flags , const MTPVector < MTPint > & _id ) : vflags ( _flags ) , vid ( _id ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPmessages_deleteMessages : : Flags ) <nl> <nl> class MTPmessages_DeleteMessages : public MTPBoxed < MTPmessages_deleteMessages > { <nl> public : <nl> - MTPmessages_DeleteMessages ( ) { <nl> - } <nl> + MTPmessages_DeleteMessages ( ) = default ; <nl> MTPmessages_DeleteMessages ( const MTPmessages_deleteMessages & v ) : MTPBoxed < MTPmessages_deleteMessages > ( v ) { <nl> } <nl> - MTPmessages_DeleteMessages ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_deleteMessages > ( from , end , cons ) { <nl> - } <nl> MTPmessages_DeleteMessages ( const MTPflags < MTPmessages_deleteMessages : : Flags > & _flags , const MTPVector < MTPint > & _id ) : MTPBoxed < MTPmessages_deleteMessages > ( MTPmessages_deleteMessages ( _flags , _id ) ) { <nl> } <nl> } ; <nl> class MTPmessages_receivedMessages { / / RPC method ' messages . receivedMessages ' <nl> public : <nl> MTPint vmax_id ; <nl> <nl> - MTPmessages_receivedMessages ( ) { <nl> - } <nl> - MTPmessages_receivedMessages ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_receivedMessages ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_receivedMessages ( ) = default ; <nl> MTPmessages_receivedMessages ( MTPint _max_id ) : vmax_id ( _max_id ) { <nl> } <nl> <nl> class MTPmessages_receivedMessages { / / RPC method ' messages . receivedMessages ' <nl> } ; <nl> class MTPmessages_ReceivedMessages : public MTPBoxed < MTPmessages_receivedMessages > { <nl> public : <nl> - MTPmessages_ReceivedMessages ( ) { <nl> - } <nl> + MTPmessages_ReceivedMessages ( ) = default ; <nl> MTPmessages_ReceivedMessages ( const MTPmessages_receivedMessages & v ) : MTPBoxed < MTPmessages_receivedMessages > ( v ) { <nl> } <nl> - MTPmessages_ReceivedMessages ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_receivedMessages > ( from , end , cons ) { <nl> - } <nl> MTPmessages_ReceivedMessages ( MTPint _max_id ) : MTPBoxed < MTPmessages_receivedMessages > ( MTPmessages_receivedMessages ( _max_id ) ) { <nl> } <nl> } ; <nl> class MTPmessages_setTyping { / / RPC method ' messages . setTyping ' <nl> MTPInputPeer vpeer ; <nl> MTPSendMessageAction vaction ; <nl> <nl> - MTPmessages_setTyping ( ) { <nl> - } <nl> - MTPmessages_setTyping ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_setTyping ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_setTyping ( ) = default ; <nl> MTPmessages_setTyping ( const MTPInputPeer & _peer , const MTPSendMessageAction & _action ) : vpeer ( _peer ) , vaction ( _action ) { <nl> } <nl> <nl> class MTPmessages_setTyping { / / RPC method ' messages . setTyping ' <nl> } ; <nl> class MTPmessages_SetTyping : public MTPBoxed < MTPmessages_setTyping > { <nl> public : <nl> - MTPmessages_SetTyping ( ) { <nl> - } <nl> + MTPmessages_SetTyping ( ) = default ; <nl> MTPmessages_SetTyping ( const MTPmessages_setTyping & v ) : MTPBoxed < MTPmessages_setTyping > ( v ) { <nl> } <nl> - MTPmessages_SetTyping ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_setTyping > ( from , end , cons ) { <nl> - } <nl> MTPmessages_SetTyping ( const MTPInputPeer & _peer , const MTPSendMessageAction & _action ) : MTPBoxed < MTPmessages_setTyping > ( MTPmessages_setTyping ( _peer , _action ) ) { <nl> } <nl> } ; <nl> class MTPmessages_sendMessage { / / RPC method ' messages . sendMessage ' <nl> MTPReplyMarkup vreply_markup ; <nl> MTPVector < MTPMessageEntity > ventities ; <nl> <nl> - MTPmessages_sendMessage ( ) { <nl> - } <nl> - MTPmessages_sendMessage ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_sendMessage ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_sendMessage ( ) = default ; <nl> MTPmessages_sendMessage ( const MTPflags < MTPmessages_sendMessage : : Flags > & _flags , const MTPInputPeer & _peer , MTPint _reply_to_msg_id , const MTPstring & _message , const MTPlong & _random_id , const MTPReplyMarkup & _reply_markup , const MTPVector < MTPMessageEntity > & _entities ) : vflags ( _flags ) , vpeer ( _peer ) , vreply_to_msg_id ( _reply_to_msg_id ) , vmessage ( _message ) , vrandom_id ( _random_id ) , vreply_markup ( _reply_markup ) , ventities ( _entities ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPmessages_sendMessage : : Flags ) <nl> <nl> class MTPmessages_SendMessage : public MTPBoxed < MTPmessages_sendMessage > { <nl> public : <nl> - MTPmessages_SendMessage ( ) { <nl> - } <nl> + MTPmessages_SendMessage ( ) = default ; <nl> MTPmessages_SendMessage ( const MTPmessages_sendMessage & v ) : MTPBoxed < MTPmessages_sendMessage > ( v ) { <nl> } <nl> - MTPmessages_SendMessage ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_sendMessage > ( from , end , cons ) { <nl> - } <nl> MTPmessages_SendMessage ( const MTPflags < MTPmessages_sendMessage : : Flags > & _flags , const MTPInputPeer & _peer , MTPint _reply_to_msg_id , const MTPstring & _message , const MTPlong & _random_id , const MTPReplyMarkup & _reply_markup , const MTPVector < MTPMessageEntity > & _entities ) : MTPBoxed < MTPmessages_sendMessage > ( MTPmessages_sendMessage ( _flags , _peer , _reply_to_msg_id , _message , _random_id , _reply_markup , _entities ) ) { <nl> } <nl> } ; <nl> class MTPmessages_sendMedia { / / RPC method ' messages . sendMedia ' <nl> MTPlong vrandom_id ; <nl> MTPReplyMarkup vreply_markup ; <nl> <nl> - MTPmessages_sendMedia ( ) { <nl> - } <nl> - MTPmessages_sendMedia ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_sendMedia ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_sendMedia ( ) = default ; <nl> MTPmessages_sendMedia ( const MTPflags < MTPmessages_sendMedia : : Flags > & _flags , const MTPInputPeer & _peer , MTPint _reply_to_msg_id , const MTPInputMedia & _media , const MTPlong & _random_id , const MTPReplyMarkup & _reply_markup ) : vflags ( _flags ) , vpeer ( _peer ) , vreply_to_msg_id ( _reply_to_msg_id ) , vmedia ( _media ) , vrandom_id ( _random_id ) , vreply_markup ( _reply_markup ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPmessages_sendMedia : : Flags ) <nl> <nl> class MTPmessages_SendMedia : public MTPBoxed < MTPmessages_sendMedia > { <nl> public : <nl> - MTPmessages_SendMedia ( ) { <nl> - } <nl> + MTPmessages_SendMedia ( ) = default ; <nl> MTPmessages_SendMedia ( const MTPmessages_sendMedia & v ) : MTPBoxed < MTPmessages_sendMedia > ( v ) { <nl> } <nl> - MTPmessages_SendMedia ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_sendMedia > ( from , end , cons ) { <nl> - } <nl> MTPmessages_SendMedia ( const MTPflags < MTPmessages_sendMedia : : Flags > & _flags , const MTPInputPeer & _peer , MTPint _reply_to_msg_id , const MTPInputMedia & _media , const MTPlong & _random_id , const MTPReplyMarkup & _reply_markup ) : MTPBoxed < MTPmessages_sendMedia > ( MTPmessages_sendMedia ( _flags , _peer , _reply_to_msg_id , _media , _random_id , _reply_markup ) ) { <nl> } <nl> } ; <nl> class MTPmessages_forwardMessages { / / RPC method ' messages . forwardMessages ' <nl> MTPVector < MTPlong > vrandom_id ; <nl> MTPInputPeer vto_peer ; <nl> <nl> - MTPmessages_forwardMessages ( ) { <nl> - } <nl> - MTPmessages_forwardMessages ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_forwardMessages ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_forwardMessages ( ) = default ; <nl> MTPmessages_forwardMessages ( const MTPflags < MTPmessages_forwardMessages : : Flags > & _flags , const MTPInputPeer & _from_peer , const MTPVector < MTPint > & _id , const MTPVector < MTPlong > & _random_id , const MTPInputPeer & _to_peer ) : vflags ( _flags ) , vfrom_peer ( _from_peer ) , vid ( _id ) , vrandom_id ( _random_id ) , vto_peer ( _to_peer ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPmessages_forwardMessages : : Flags ) <nl> <nl> class MTPmessages_ForwardMessages : public MTPBoxed < MTPmessages_forwardMessages > { <nl> public : <nl> - MTPmessages_ForwardMessages ( ) { <nl> - } <nl> + MTPmessages_ForwardMessages ( ) = default ; <nl> MTPmessages_ForwardMessages ( const MTPmessages_forwardMessages & v ) : MTPBoxed < MTPmessages_forwardMessages > ( v ) { <nl> } <nl> - MTPmessages_ForwardMessages ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_forwardMessages > ( from , end , cons ) { <nl> - } <nl> MTPmessages_ForwardMessages ( const MTPflags < MTPmessages_forwardMessages : : Flags > & _flags , const MTPInputPeer & _from_peer , const MTPVector < MTPint > & _id , const MTPVector < MTPlong > & _random_id , const MTPInputPeer & _to_peer ) : MTPBoxed < MTPmessages_forwardMessages > ( MTPmessages_forwardMessages ( _flags , _from_peer , _id , _random_id , _to_peer ) ) { <nl> } <nl> } ; <nl> class MTPmessages_reportSpam { / / RPC method ' messages . reportSpam ' <nl> public : <nl> MTPInputPeer vpeer ; <nl> <nl> - MTPmessages_reportSpam ( ) { <nl> - } <nl> - MTPmessages_reportSpam ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_reportSpam ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_reportSpam ( ) = default ; <nl> MTPmessages_reportSpam ( const MTPInputPeer & _peer ) : vpeer ( _peer ) { <nl> } <nl> <nl> class MTPmessages_reportSpam { / / RPC method ' messages . reportSpam ' <nl> } ; <nl> class MTPmessages_ReportSpam : public MTPBoxed < MTPmessages_reportSpam > { <nl> public : <nl> - MTPmessages_ReportSpam ( ) { <nl> - } <nl> + MTPmessages_ReportSpam ( ) = default ; <nl> MTPmessages_ReportSpam ( const MTPmessages_reportSpam & v ) : MTPBoxed < MTPmessages_reportSpam > ( v ) { <nl> } <nl> - MTPmessages_ReportSpam ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_reportSpam > ( from , end , cons ) { <nl> - } <nl> MTPmessages_ReportSpam ( const MTPInputPeer & _peer ) : MTPBoxed < MTPmessages_reportSpam > ( MTPmessages_reportSpam ( _peer ) ) { <nl> } <nl> } ; <nl> class MTPmessages_hideReportSpam { / / RPC method ' messages . hideReportSpam ' <nl> public : <nl> MTPInputPeer vpeer ; <nl> <nl> - MTPmessages_hideReportSpam ( ) { <nl> - } <nl> - MTPmessages_hideReportSpam ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_hideReportSpam ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_hideReportSpam ( ) = default ; <nl> MTPmessages_hideReportSpam ( const MTPInputPeer & _peer ) : vpeer ( _peer ) { <nl> } <nl> <nl> class MTPmessages_hideReportSpam { / / RPC method ' messages . hideReportSpam ' <nl> } ; <nl> class MTPmessages_HideReportSpam : public MTPBoxed < MTPmessages_hideReportSpam > { <nl> public : <nl> - MTPmessages_HideReportSpam ( ) { <nl> - } <nl> + MTPmessages_HideReportSpam ( ) = default ; <nl> MTPmessages_HideReportSpam ( const MTPmessages_hideReportSpam & v ) : MTPBoxed < MTPmessages_hideReportSpam > ( v ) { <nl> } <nl> - MTPmessages_HideReportSpam ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_hideReportSpam > ( from , end , cons ) { <nl> - } <nl> MTPmessages_HideReportSpam ( const MTPInputPeer & _peer ) : MTPBoxed < MTPmessages_hideReportSpam > ( MTPmessages_hideReportSpam ( _peer ) ) { <nl> } <nl> } ; <nl> class MTPmessages_getPeerSettings { / / RPC method ' messages . getPeerSettings ' <nl> public : <nl> MTPInputPeer vpeer ; <nl> <nl> - MTPmessages_getPeerSettings ( ) { <nl> - } <nl> - MTPmessages_getPeerSettings ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_getPeerSettings ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_getPeerSettings ( ) = default ; <nl> MTPmessages_getPeerSettings ( const MTPInputPeer & _peer ) : vpeer ( _peer ) { <nl> } <nl> <nl> class MTPmessages_getPeerSettings { / / RPC method ' messages . getPeerSettings ' <nl> } ; <nl> class MTPmessages_GetPeerSettings : public MTPBoxed < MTPmessages_getPeerSettings > { <nl> public : <nl> - MTPmessages_GetPeerSettings ( ) { <nl> - } <nl> + MTPmessages_GetPeerSettings ( ) = default ; <nl> MTPmessages_GetPeerSettings ( const MTPmessages_getPeerSettings & v ) : MTPBoxed < MTPmessages_getPeerSettings > ( v ) { <nl> } <nl> - MTPmessages_GetPeerSettings ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_getPeerSettings > ( from , end , cons ) { <nl> - } <nl> MTPmessages_GetPeerSettings ( const MTPInputPeer & _peer ) : MTPBoxed < MTPmessages_getPeerSettings > ( MTPmessages_getPeerSettings ( _peer ) ) { <nl> } <nl> } ; <nl> class MTPmessages_getChats { / / RPC method ' messages . getChats ' <nl> public : <nl> MTPVector < MTPint > vid ; <nl> <nl> - MTPmessages_getChats ( ) { <nl> - } <nl> - MTPmessages_getChats ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_getChats ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_getChats ( ) = default ; <nl> MTPmessages_getChats ( const MTPVector < MTPint > & _id ) : vid ( _id ) { <nl> } <nl> <nl> class MTPmessages_getChats { / / RPC method ' messages . getChats ' <nl> } ; <nl> class MTPmessages_GetChats : public MTPBoxed < MTPmessages_getChats > { <nl> public : <nl> - MTPmessages_GetChats ( ) { <nl> - } <nl> + MTPmessages_GetChats ( ) = default ; <nl> MTPmessages_GetChats ( const MTPmessages_getChats & v ) : MTPBoxed < MTPmessages_getChats > ( v ) { <nl> } <nl> - MTPmessages_GetChats ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_getChats > ( from , end , cons ) { <nl> - } <nl> MTPmessages_GetChats ( const MTPVector < MTPint > & _id ) : MTPBoxed < MTPmessages_getChats > ( MTPmessages_getChats ( _id ) ) { <nl> } <nl> } ; <nl> class MTPmessages_getFullChat { / / RPC method ' messages . getFullChat ' <nl> public : <nl> MTPint vchat_id ; <nl> <nl> - MTPmessages_getFullChat ( ) { <nl> - } <nl> - MTPmessages_getFullChat ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_getFullChat ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_getFullChat ( ) = default ; <nl> MTPmessages_getFullChat ( MTPint _chat_id ) : vchat_id ( _chat_id ) { <nl> } <nl> <nl> class MTPmessages_getFullChat { / / RPC method ' messages . getFullChat ' <nl> } ; <nl> class MTPmessages_GetFullChat : public MTPBoxed < MTPmessages_getFullChat > { <nl> public : <nl> - MTPmessages_GetFullChat ( ) { <nl> - } <nl> + MTPmessages_GetFullChat ( ) = default ; <nl> MTPmessages_GetFullChat ( const MTPmessages_getFullChat & v ) : MTPBoxed < MTPmessages_getFullChat > ( v ) { <nl> } <nl> - MTPmessages_GetFullChat ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_getFullChat > ( from , end , cons ) { <nl> - } <nl> MTPmessages_GetFullChat ( MTPint _chat_id ) : MTPBoxed < MTPmessages_getFullChat > ( MTPmessages_getFullChat ( _chat_id ) ) { <nl> } <nl> } ; <nl> class MTPmessages_editChatTitle { / / RPC method ' messages . editChatTitle ' <nl> MTPint vchat_id ; <nl> MTPstring vtitle ; <nl> <nl> - MTPmessages_editChatTitle ( ) { <nl> - } <nl> - MTPmessages_editChatTitle ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_editChatTitle ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_editChatTitle ( ) = default ; <nl> MTPmessages_editChatTitle ( MTPint _chat_id , const MTPstring & _title ) : vchat_id ( _chat_id ) , vtitle ( _title ) { <nl> } <nl> <nl> class MTPmessages_editChatTitle { / / RPC method ' messages . editChatTitle ' <nl> } ; <nl> class MTPmessages_EditChatTitle : public MTPBoxed < MTPmessages_editChatTitle > { <nl> public : <nl> - MTPmessages_EditChatTitle ( ) { <nl> - } <nl> + MTPmessages_EditChatTitle ( ) = default ; <nl> MTPmessages_EditChatTitle ( const MTPmessages_editChatTitle & v ) : MTPBoxed < MTPmessages_editChatTitle > ( v ) { <nl> } <nl> - MTPmessages_EditChatTitle ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_editChatTitle > ( from , end , cons ) { <nl> - } <nl> MTPmessages_EditChatTitle ( MTPint _chat_id , const MTPstring & _title ) : MTPBoxed < MTPmessages_editChatTitle > ( MTPmessages_editChatTitle ( _chat_id , _title ) ) { <nl> } <nl> } ; <nl> class MTPmessages_editChatPhoto { / / RPC method ' messages . editChatPhoto ' <nl> MTPint vchat_id ; <nl> MTPInputChatPhoto vphoto ; <nl> <nl> - MTPmessages_editChatPhoto ( ) { <nl> - } <nl> - MTPmessages_editChatPhoto ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_editChatPhoto ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_editChatPhoto ( ) = default ; <nl> MTPmessages_editChatPhoto ( MTPint _chat_id , const MTPInputChatPhoto & _photo ) : vchat_id ( _chat_id ) , vphoto ( _photo ) { <nl> } <nl> <nl> class MTPmessages_editChatPhoto { / / RPC method ' messages . editChatPhoto ' <nl> } ; <nl> class MTPmessages_EditChatPhoto : public MTPBoxed < MTPmessages_editChatPhoto > { <nl> public : <nl> - MTPmessages_EditChatPhoto ( ) { <nl> - } <nl> + MTPmessages_EditChatPhoto ( ) = default ; <nl> MTPmessages_EditChatPhoto ( const MTPmessages_editChatPhoto & v ) : MTPBoxed < MTPmessages_editChatPhoto > ( v ) { <nl> } <nl> - MTPmessages_EditChatPhoto ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_editChatPhoto > ( from , end , cons ) { <nl> - } <nl> MTPmessages_EditChatPhoto ( MTPint _chat_id , const MTPInputChatPhoto & _photo ) : MTPBoxed < MTPmessages_editChatPhoto > ( MTPmessages_editChatPhoto ( _chat_id , _photo ) ) { <nl> } <nl> } ; <nl> class MTPmessages_addChatUser { / / RPC method ' messages . addChatUser ' <nl> MTPInputUser vuser_id ; <nl> MTPint vfwd_limit ; <nl> <nl> - MTPmessages_addChatUser ( ) { <nl> - } <nl> - MTPmessages_addChatUser ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_addChatUser ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_addChatUser ( ) = default ; <nl> MTPmessages_addChatUser ( MTPint _chat_id , const MTPInputUser & _user_id , MTPint _fwd_limit ) : vchat_id ( _chat_id ) , vuser_id ( _user_id ) , vfwd_limit ( _fwd_limit ) { <nl> } <nl> <nl> class MTPmessages_addChatUser { / / RPC method ' messages . addChatUser ' <nl> } ; <nl> class MTPmessages_AddChatUser : public MTPBoxed < MTPmessages_addChatUser > { <nl> public : <nl> - MTPmessages_AddChatUser ( ) { <nl> - } <nl> + MTPmessages_AddChatUser ( ) = default ; <nl> MTPmessages_AddChatUser ( const MTPmessages_addChatUser & v ) : MTPBoxed < MTPmessages_addChatUser > ( v ) { <nl> } <nl> - MTPmessages_AddChatUser ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_addChatUser > ( from , end , cons ) { <nl> - } <nl> MTPmessages_AddChatUser ( MTPint _chat_id , const MTPInputUser & _user_id , MTPint _fwd_limit ) : MTPBoxed < MTPmessages_addChatUser > ( MTPmessages_addChatUser ( _chat_id , _user_id , _fwd_limit ) ) { <nl> } <nl> } ; <nl> class MTPmessages_deleteChatUser { / / RPC method ' messages . deleteChatUser ' <nl> MTPint vchat_id ; <nl> MTPInputUser vuser_id ; <nl> <nl> - MTPmessages_deleteChatUser ( ) { <nl> - } <nl> - MTPmessages_deleteChatUser ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_deleteChatUser ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_deleteChatUser ( ) = default ; <nl> MTPmessages_deleteChatUser ( MTPint _chat_id , const MTPInputUser & _user_id ) : vchat_id ( _chat_id ) , vuser_id ( _user_id ) { <nl> } <nl> <nl> class MTPmessages_deleteChatUser { / / RPC method ' messages . deleteChatUser ' <nl> } ; <nl> class MTPmessages_DeleteChatUser : public MTPBoxed < MTPmessages_deleteChatUser > { <nl> public : <nl> - MTPmessages_DeleteChatUser ( ) { <nl> - } <nl> + MTPmessages_DeleteChatUser ( ) = default ; <nl> MTPmessages_DeleteChatUser ( const MTPmessages_deleteChatUser & v ) : MTPBoxed < MTPmessages_deleteChatUser > ( v ) { <nl> } <nl> - MTPmessages_DeleteChatUser ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_deleteChatUser > ( from , end , cons ) { <nl> - } <nl> MTPmessages_DeleteChatUser ( MTPint _chat_id , const MTPInputUser & _user_id ) : MTPBoxed < MTPmessages_deleteChatUser > ( MTPmessages_deleteChatUser ( _chat_id , _user_id ) ) { <nl> } <nl> } ; <nl> class MTPmessages_createChat { / / RPC method ' messages . createChat ' <nl> MTPVector < MTPInputUser > vusers ; <nl> MTPstring vtitle ; <nl> <nl> - MTPmessages_createChat ( ) { <nl> - } <nl> - MTPmessages_createChat ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_createChat ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_createChat ( ) = default ; <nl> MTPmessages_createChat ( const MTPVector < MTPInputUser > & _users , const MTPstring & _title ) : vusers ( _users ) , vtitle ( _title ) { <nl> } <nl> <nl> class MTPmessages_createChat { / / RPC method ' messages . createChat ' <nl> } ; <nl> class MTPmessages_CreateChat : public MTPBoxed < MTPmessages_createChat > { <nl> public : <nl> - MTPmessages_CreateChat ( ) { <nl> - } <nl> + MTPmessages_CreateChat ( ) = default ; <nl> MTPmessages_CreateChat ( const MTPmessages_createChat & v ) : MTPBoxed < MTPmessages_createChat > ( v ) { <nl> } <nl> - MTPmessages_CreateChat ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_createChat > ( from , end , cons ) { <nl> - } <nl> MTPmessages_CreateChat ( const MTPVector < MTPInputUser > & _users , const MTPstring & _title ) : MTPBoxed < MTPmessages_createChat > ( MTPmessages_createChat ( _users , _title ) ) { <nl> } <nl> } ; <nl> class MTPmessages_forwardMessage { / / RPC method ' messages . forwardMessage ' <nl> MTPint vid ; <nl> MTPlong vrandom_id ; <nl> <nl> - MTPmessages_forwardMessage ( ) { <nl> - } <nl> - MTPmessages_forwardMessage ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_forwardMessage ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_forwardMessage ( ) = default ; <nl> MTPmessages_forwardMessage ( const MTPInputPeer & _peer , MTPint _id , const MTPlong & _random_id ) : vpeer ( _peer ) , vid ( _id ) , vrandom_id ( _random_id ) { <nl> } <nl> <nl> class MTPmessages_forwardMessage { / / RPC method ' messages . forwardMessage ' <nl> } ; <nl> class MTPmessages_ForwardMessage : public MTPBoxed < MTPmessages_forwardMessage > { <nl> public : <nl> - MTPmessages_ForwardMessage ( ) { <nl> - } <nl> + MTPmessages_ForwardMessage ( ) = default ; <nl> MTPmessages_ForwardMessage ( const MTPmessages_forwardMessage & v ) : MTPBoxed < MTPmessages_forwardMessage > ( v ) { <nl> } <nl> - MTPmessages_ForwardMessage ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_forwardMessage > ( from , end , cons ) { <nl> - } <nl> MTPmessages_ForwardMessage ( const MTPInputPeer & _peer , MTPint _id , const MTPlong & _random_id ) : MTPBoxed < MTPmessages_forwardMessage > ( MTPmessages_forwardMessage ( _peer , _id , _random_id ) ) { <nl> } <nl> } ; <nl> class MTPmessages_getDhConfig { / / RPC method ' messages . getDhConfig ' <nl> MTPint vversion ; <nl> MTPint vrandom_length ; <nl> <nl> - MTPmessages_getDhConfig ( ) { <nl> - } <nl> - MTPmessages_getDhConfig ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_getDhConfig ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_getDhConfig ( ) = default ; <nl> MTPmessages_getDhConfig ( MTPint _version , MTPint _random_length ) : vversion ( _version ) , vrandom_length ( _random_length ) { <nl> } <nl> <nl> class MTPmessages_getDhConfig { / / RPC method ' messages . getDhConfig ' <nl> } ; <nl> class MTPmessages_GetDhConfig : public MTPBoxed < MTPmessages_getDhConfig > { <nl> public : <nl> - MTPmessages_GetDhConfig ( ) { <nl> - } <nl> + MTPmessages_GetDhConfig ( ) = default ; <nl> MTPmessages_GetDhConfig ( const MTPmessages_getDhConfig & v ) : MTPBoxed < MTPmessages_getDhConfig > ( v ) { <nl> } <nl> - MTPmessages_GetDhConfig ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_getDhConfig > ( from , end , cons ) { <nl> - } <nl> MTPmessages_GetDhConfig ( MTPint _version , MTPint _random_length ) : MTPBoxed < MTPmessages_getDhConfig > ( MTPmessages_getDhConfig ( _version , _random_length ) ) { <nl> } <nl> } ; <nl> class MTPmessages_requestEncryption { / / RPC method ' messages . requestEncryption ' <nl> MTPint vrandom_id ; <nl> MTPbytes vg_a ; <nl> <nl> - MTPmessages_requestEncryption ( ) { <nl> - } <nl> - MTPmessages_requestEncryption ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_requestEncryption ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_requestEncryption ( ) = default ; <nl> MTPmessages_requestEncryption ( const MTPInputUser & _user_id , MTPint _random_id , const MTPbytes & _g_a ) : vuser_id ( _user_id ) , vrandom_id ( _random_id ) , vg_a ( _g_a ) { <nl> } <nl> <nl> class MTPmessages_requestEncryption { / / RPC method ' messages . requestEncryption ' <nl> } ; <nl> class MTPmessages_RequestEncryption : public MTPBoxed < MTPmessages_requestEncryption > { <nl> public : <nl> - MTPmessages_RequestEncryption ( ) { <nl> - } <nl> + MTPmessages_RequestEncryption ( ) = default ; <nl> MTPmessages_RequestEncryption ( const MTPmessages_requestEncryption & v ) : MTPBoxed < MTPmessages_requestEncryption > ( v ) { <nl> } <nl> - MTPmessages_RequestEncryption ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_requestEncryption > ( from , end , cons ) { <nl> - } <nl> MTPmessages_RequestEncryption ( const MTPInputUser & _user_id , MTPint _random_id , const MTPbytes & _g_a ) : MTPBoxed < MTPmessages_requestEncryption > ( MTPmessages_requestEncryption ( _user_id , _random_id , _g_a ) ) { <nl> } <nl> } ; <nl> class MTPmessages_acceptEncryption { / / RPC method ' messages . acceptEncryption ' <nl> MTPbytes vg_b ; <nl> MTPlong vkey_fingerprint ; <nl> <nl> - MTPmessages_acceptEncryption ( ) { <nl> - } <nl> - MTPmessages_acceptEncryption ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_acceptEncryption ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_acceptEncryption ( ) = default ; <nl> MTPmessages_acceptEncryption ( const MTPInputEncryptedChat & _peer , const MTPbytes & _g_b , const MTPlong & _key_fingerprint ) : vpeer ( _peer ) , vg_b ( _g_b ) , vkey_fingerprint ( _key_fingerprint ) { <nl> } <nl> <nl> class MTPmessages_acceptEncryption { / / RPC method ' messages . acceptEncryption ' <nl> } ; <nl> class MTPmessages_AcceptEncryption : public MTPBoxed < MTPmessages_acceptEncryption > { <nl> public : <nl> - MTPmessages_AcceptEncryption ( ) { <nl> - } <nl> + MTPmessages_AcceptEncryption ( ) = default ; <nl> MTPmessages_AcceptEncryption ( const MTPmessages_acceptEncryption & v ) : MTPBoxed < MTPmessages_acceptEncryption > ( v ) { <nl> } <nl> - MTPmessages_AcceptEncryption ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_acceptEncryption > ( from , end , cons ) { <nl> - } <nl> MTPmessages_AcceptEncryption ( const MTPInputEncryptedChat & _peer , const MTPbytes & _g_b , const MTPlong & _key_fingerprint ) : MTPBoxed < MTPmessages_acceptEncryption > ( MTPmessages_acceptEncryption ( _peer , _g_b , _key_fingerprint ) ) { <nl> } <nl> } ; <nl> class MTPmessages_discardEncryption { / / RPC method ' messages . discardEncryption ' <nl> public : <nl> MTPint vchat_id ; <nl> <nl> - MTPmessages_discardEncryption ( ) { <nl> - } <nl> - MTPmessages_discardEncryption ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_discardEncryption ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_discardEncryption ( ) = default ; <nl> MTPmessages_discardEncryption ( MTPint _chat_id ) : vchat_id ( _chat_id ) { <nl> } <nl> <nl> class MTPmessages_discardEncryption { / / RPC method ' messages . discardEncryption ' <nl> } ; <nl> class MTPmessages_DiscardEncryption : public MTPBoxed < MTPmessages_discardEncryption > { <nl> public : <nl> - MTPmessages_DiscardEncryption ( ) { <nl> - } <nl> + MTPmessages_DiscardEncryption ( ) = default ; <nl> MTPmessages_DiscardEncryption ( const MTPmessages_discardEncryption & v ) : MTPBoxed < MTPmessages_discardEncryption > ( v ) { <nl> } <nl> - MTPmessages_DiscardEncryption ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_discardEncryption > ( from , end , cons ) { <nl> - } <nl> MTPmessages_DiscardEncryption ( MTPint _chat_id ) : MTPBoxed < MTPmessages_discardEncryption > ( MTPmessages_discardEncryption ( _chat_id ) ) { <nl> } <nl> } ; <nl> class MTPmessages_setEncryptedTyping { / / RPC method ' messages . setEncryptedTypin <nl> MTPInputEncryptedChat vpeer ; <nl> MTPBool vtyping ; <nl> <nl> - MTPmessages_setEncryptedTyping ( ) { <nl> - } <nl> - MTPmessages_setEncryptedTyping ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_setEncryptedTyping ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_setEncryptedTyping ( ) = default ; <nl> MTPmessages_setEncryptedTyping ( const MTPInputEncryptedChat & _peer , MTPBool _typing ) : vpeer ( _peer ) , vtyping ( _typing ) { <nl> } <nl> <nl> class MTPmessages_setEncryptedTyping { / / RPC method ' messages . setEncryptedTypin <nl> } ; <nl> class MTPmessages_SetEncryptedTyping : public MTPBoxed < MTPmessages_setEncryptedTyping > { <nl> public : <nl> - MTPmessages_SetEncryptedTyping ( ) { <nl> - } <nl> + MTPmessages_SetEncryptedTyping ( ) = default ; <nl> MTPmessages_SetEncryptedTyping ( const MTPmessages_setEncryptedTyping & v ) : MTPBoxed < MTPmessages_setEncryptedTyping > ( v ) { <nl> } <nl> - MTPmessages_SetEncryptedTyping ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_setEncryptedTyping > ( from , end , cons ) { <nl> - } <nl> MTPmessages_SetEncryptedTyping ( const MTPInputEncryptedChat & _peer , MTPBool _typing ) : MTPBoxed < MTPmessages_setEncryptedTyping > ( MTPmessages_setEncryptedTyping ( _peer , _typing ) ) { <nl> } <nl> } ; <nl> class MTPmessages_readEncryptedHistory { / / RPC method ' messages . readEncryptedHi <nl> MTPInputEncryptedChat vpeer ; <nl> MTPint vmax_date ; <nl> <nl> - MTPmessages_readEncryptedHistory ( ) { <nl> - } <nl> - MTPmessages_readEncryptedHistory ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_readEncryptedHistory ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_readEncryptedHistory ( ) = default ; <nl> MTPmessages_readEncryptedHistory ( const MTPInputEncryptedChat & _peer , MTPint _max_date ) : vpeer ( _peer ) , vmax_date ( _max_date ) { <nl> } <nl> <nl> class MTPmessages_readEncryptedHistory { / / RPC method ' messages . readEncryptedHi <nl> } ; <nl> class MTPmessages_ReadEncryptedHistory : public MTPBoxed < MTPmessages_readEncryptedHistory > { <nl> public : <nl> - MTPmessages_ReadEncryptedHistory ( ) { <nl> - } <nl> + MTPmessages_ReadEncryptedHistory ( ) = default ; <nl> MTPmessages_ReadEncryptedHistory ( const MTPmessages_readEncryptedHistory & v ) : MTPBoxed < MTPmessages_readEncryptedHistory > ( v ) { <nl> } <nl> - MTPmessages_ReadEncryptedHistory ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_readEncryptedHistory > ( from , end , cons ) { <nl> - } <nl> MTPmessages_ReadEncryptedHistory ( const MTPInputEncryptedChat & _peer , MTPint _max_date ) : MTPBoxed < MTPmessages_readEncryptedHistory > ( MTPmessages_readEncryptedHistory ( _peer , _max_date ) ) { <nl> } <nl> } ; <nl> class MTPmessages_sendEncrypted { / / RPC method ' messages . sendEncrypted ' <nl> MTPlong vrandom_id ; <nl> MTPbytes vdata ; <nl> <nl> - MTPmessages_sendEncrypted ( ) { <nl> - } <nl> - MTPmessages_sendEncrypted ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_sendEncrypted ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_sendEncrypted ( ) = default ; <nl> MTPmessages_sendEncrypted ( const MTPInputEncryptedChat & _peer , const MTPlong & _random_id , const MTPbytes & _data ) : vpeer ( _peer ) , vrandom_id ( _random_id ) , vdata ( _data ) { <nl> } <nl> <nl> class MTPmessages_sendEncrypted { / / RPC method ' messages . sendEncrypted ' <nl> } ; <nl> class MTPmessages_SendEncrypted : public MTPBoxed < MTPmessages_sendEncrypted > { <nl> public : <nl> - MTPmessages_SendEncrypted ( ) { <nl> - } <nl> + MTPmessages_SendEncrypted ( ) = default ; <nl> MTPmessages_SendEncrypted ( const MTPmessages_sendEncrypted & v ) : MTPBoxed < MTPmessages_sendEncrypted > ( v ) { <nl> } <nl> - MTPmessages_SendEncrypted ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_sendEncrypted > ( from , end , cons ) { <nl> - } <nl> MTPmessages_SendEncrypted ( const MTPInputEncryptedChat & _peer , const MTPlong & _random_id , const MTPbytes & _data ) : MTPBoxed < MTPmessages_sendEncrypted > ( MTPmessages_sendEncrypted ( _peer , _random_id , _data ) ) { <nl> } <nl> } ; <nl> class MTPmessages_sendEncryptedFile { / / RPC method ' messages . sendEncryptedFile ' <nl> MTPbytes vdata ; <nl> MTPInputEncryptedFile vfile ; <nl> <nl> - MTPmessages_sendEncryptedFile ( ) { <nl> - } <nl> - MTPmessages_sendEncryptedFile ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_sendEncryptedFile ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_sendEncryptedFile ( ) = default ; <nl> MTPmessages_sendEncryptedFile ( const MTPInputEncryptedChat & _peer , const MTPlong & _random_id , const MTPbytes & _data , const MTPInputEncryptedFile & _file ) : vpeer ( _peer ) , vrandom_id ( _random_id ) , vdata ( _data ) , vfile ( _file ) { <nl> } <nl> <nl> class MTPmessages_sendEncryptedFile { / / RPC method ' messages . sendEncryptedFile ' <nl> } ; <nl> class MTPmessages_SendEncryptedFile : public MTPBoxed < MTPmessages_sendEncryptedFile > { <nl> public : <nl> - MTPmessages_SendEncryptedFile ( ) { <nl> - } <nl> + MTPmessages_SendEncryptedFile ( ) = default ; <nl> MTPmessages_SendEncryptedFile ( const MTPmessages_sendEncryptedFile & v ) : MTPBoxed < MTPmessages_sendEncryptedFile > ( v ) { <nl> } <nl> - MTPmessages_SendEncryptedFile ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_sendEncryptedFile > ( from , end , cons ) { <nl> - } <nl> MTPmessages_SendEncryptedFile ( const MTPInputEncryptedChat & _peer , const MTPlong & _random_id , const MTPbytes & _data , const MTPInputEncryptedFile & _file ) : MTPBoxed < MTPmessages_sendEncryptedFile > ( MTPmessages_sendEncryptedFile ( _peer , _random_id , _data , _file ) ) { <nl> } <nl> } ; <nl> class MTPmessages_sendEncryptedService { / / RPC method ' messages . sendEncryptedSe <nl> MTPlong vrandom_id ; <nl> MTPbytes vdata ; <nl> <nl> - MTPmessages_sendEncryptedService ( ) { <nl> - } <nl> - MTPmessages_sendEncryptedService ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_sendEncryptedService ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_sendEncryptedService ( ) = default ; <nl> MTPmessages_sendEncryptedService ( const MTPInputEncryptedChat & _peer , const MTPlong & _random_id , const MTPbytes & _data ) : vpeer ( _peer ) , vrandom_id ( _random_id ) , vdata ( _data ) { <nl> } <nl> <nl> class MTPmessages_sendEncryptedService { / / RPC method ' messages . sendEncryptedSe <nl> } ; <nl> class MTPmessages_SendEncryptedService : public MTPBoxed < MTPmessages_sendEncryptedService > { <nl> public : <nl> - MTPmessages_SendEncryptedService ( ) { <nl> - } <nl> + MTPmessages_SendEncryptedService ( ) = default ; <nl> MTPmessages_SendEncryptedService ( const MTPmessages_sendEncryptedService & v ) : MTPBoxed < MTPmessages_sendEncryptedService > ( v ) { <nl> } <nl> - MTPmessages_SendEncryptedService ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_sendEncryptedService > ( from , end , cons ) { <nl> - } <nl> MTPmessages_SendEncryptedService ( const MTPInputEncryptedChat & _peer , const MTPlong & _random_id , const MTPbytes & _data ) : MTPBoxed < MTPmessages_sendEncryptedService > ( MTPmessages_sendEncryptedService ( _peer , _random_id , _data ) ) { <nl> } <nl> } ; <nl> class MTPmessages_receivedQueue { / / RPC method ' messages . receivedQueue ' <nl> public : <nl> MTPint vmax_qts ; <nl> <nl> - MTPmessages_receivedQueue ( ) { <nl> - } <nl> - MTPmessages_receivedQueue ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_receivedQueue ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_receivedQueue ( ) = default ; <nl> MTPmessages_receivedQueue ( MTPint _max_qts ) : vmax_qts ( _max_qts ) { <nl> } <nl> <nl> class MTPmessages_receivedQueue { / / RPC method ' messages . receivedQueue ' <nl> } ; <nl> class MTPmessages_ReceivedQueue : public MTPBoxed < MTPmessages_receivedQueue > { <nl> public : <nl> - MTPmessages_ReceivedQueue ( ) { <nl> - } <nl> + MTPmessages_ReceivedQueue ( ) = default ; <nl> MTPmessages_ReceivedQueue ( const MTPmessages_receivedQueue & v ) : MTPBoxed < MTPmessages_receivedQueue > ( v ) { <nl> } <nl> - MTPmessages_ReceivedQueue ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_receivedQueue > ( from , end , cons ) { <nl> - } <nl> MTPmessages_ReceivedQueue ( MTPint _max_qts ) : MTPBoxed < MTPmessages_receivedQueue > ( MTPmessages_receivedQueue ( _max_qts ) ) { <nl> } <nl> } ; <nl> class MTPmessages_reportEncryptedSpam { / / RPC method ' messages . reportEncryptedS <nl> public : <nl> MTPInputEncryptedChat vpeer ; <nl> <nl> - MTPmessages_reportEncryptedSpam ( ) { <nl> - } <nl> - MTPmessages_reportEncryptedSpam ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_reportEncryptedSpam ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_reportEncryptedSpam ( ) = default ; <nl> MTPmessages_reportEncryptedSpam ( const MTPInputEncryptedChat & _peer ) : vpeer ( _peer ) { <nl> } <nl> <nl> class MTPmessages_reportEncryptedSpam { / / RPC method ' messages . reportEncryptedS <nl> } ; <nl> class MTPmessages_ReportEncryptedSpam : public MTPBoxed < MTPmessages_reportEncryptedSpam > { <nl> public : <nl> - MTPmessages_ReportEncryptedSpam ( ) { <nl> - } <nl> + MTPmessages_ReportEncryptedSpam ( ) = default ; <nl> MTPmessages_ReportEncryptedSpam ( const MTPmessages_reportEncryptedSpam & v ) : MTPBoxed < MTPmessages_reportEncryptedSpam > ( v ) { <nl> } <nl> - MTPmessages_ReportEncryptedSpam ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_reportEncryptedSpam > ( from , end , cons ) { <nl> - } <nl> MTPmessages_ReportEncryptedSpam ( const MTPInputEncryptedChat & _peer ) : MTPBoxed < MTPmessages_reportEncryptedSpam > ( MTPmessages_reportEncryptedSpam ( _peer ) ) { <nl> } <nl> } ; <nl> class MTPmessages_readMessageContents { / / RPC method ' messages . readMessageConte <nl> public : <nl> MTPVector < MTPint > vid ; <nl> <nl> - MTPmessages_readMessageContents ( ) { <nl> - } <nl> - MTPmessages_readMessageContents ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_readMessageContents ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_readMessageContents ( ) = default ; <nl> MTPmessages_readMessageContents ( const MTPVector < MTPint > & _id ) : vid ( _id ) { <nl> } <nl> <nl> class MTPmessages_readMessageContents { / / RPC method ' messages . readMessageConte <nl> } ; <nl> class MTPmessages_ReadMessageContents : public MTPBoxed < MTPmessages_readMessageContents > { <nl> public : <nl> - MTPmessages_ReadMessageContents ( ) { <nl> - } <nl> + MTPmessages_ReadMessageContents ( ) = default ; <nl> MTPmessages_ReadMessageContents ( const MTPmessages_readMessageContents & v ) : MTPBoxed < MTPmessages_readMessageContents > ( v ) { <nl> } <nl> - MTPmessages_ReadMessageContents ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_readMessageContents > ( from , end , cons ) { <nl> - } <nl> MTPmessages_ReadMessageContents ( const MTPVector < MTPint > & _id ) : MTPBoxed < MTPmessages_readMessageContents > ( MTPmessages_readMessageContents ( _id ) ) { <nl> } <nl> } ; <nl> class MTPmessages_getAllStickers { / / RPC method ' messages . getAllStickers ' <nl> public : <nl> MTPint vhash ; <nl> <nl> - MTPmessages_getAllStickers ( ) { <nl> - } <nl> - MTPmessages_getAllStickers ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_getAllStickers ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_getAllStickers ( ) = default ; <nl> MTPmessages_getAllStickers ( MTPint _hash ) : vhash ( _hash ) { <nl> } <nl> <nl> class MTPmessages_getAllStickers { / / RPC method ' messages . getAllStickers ' <nl> } ; <nl> class MTPmessages_GetAllStickers : public MTPBoxed < MTPmessages_getAllStickers > { <nl> public : <nl> - MTPmessages_GetAllStickers ( ) { <nl> - } <nl> + MTPmessages_GetAllStickers ( ) = default ; <nl> MTPmessages_GetAllStickers ( const MTPmessages_getAllStickers & v ) : MTPBoxed < MTPmessages_getAllStickers > ( v ) { <nl> } <nl> - MTPmessages_GetAllStickers ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_getAllStickers > ( from , end , cons ) { <nl> - } <nl> MTPmessages_GetAllStickers ( MTPint _hash ) : MTPBoxed < MTPmessages_getAllStickers > ( MTPmessages_getAllStickers ( _hash ) ) { <nl> } <nl> } ; <nl> class MTPmessages_getWebPagePreview { / / RPC method ' messages . getWebPagePreview ' <nl> public : <nl> MTPstring vmessage ; <nl> <nl> - MTPmessages_getWebPagePreview ( ) { <nl> - } <nl> - MTPmessages_getWebPagePreview ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_getWebPagePreview ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_getWebPagePreview ( ) = default ; <nl> MTPmessages_getWebPagePreview ( const MTPstring & _message ) : vmessage ( _message ) { <nl> } <nl> <nl> class MTPmessages_getWebPagePreview { / / RPC method ' messages . getWebPagePreview ' <nl> } ; <nl> class MTPmessages_GetWebPagePreview : public MTPBoxed < MTPmessages_getWebPagePreview > { <nl> public : <nl> - MTPmessages_GetWebPagePreview ( ) { <nl> - } <nl> + MTPmessages_GetWebPagePreview ( ) = default ; <nl> MTPmessages_GetWebPagePreview ( const MTPmessages_getWebPagePreview & v ) : MTPBoxed < MTPmessages_getWebPagePreview > ( v ) { <nl> } <nl> - MTPmessages_GetWebPagePreview ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_getWebPagePreview > ( from , end , cons ) { <nl> - } <nl> MTPmessages_GetWebPagePreview ( const MTPstring & _message ) : MTPBoxed < MTPmessages_getWebPagePreview > ( MTPmessages_getWebPagePreview ( _message ) ) { <nl> } <nl> } ; <nl> class MTPmessages_exportChatInvite { / / RPC method ' messages . exportChatInvite ' <nl> public : <nl> MTPint vchat_id ; <nl> <nl> - MTPmessages_exportChatInvite ( ) { <nl> - } <nl> - MTPmessages_exportChatInvite ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_exportChatInvite ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_exportChatInvite ( ) = default ; <nl> MTPmessages_exportChatInvite ( MTPint _chat_id ) : vchat_id ( _chat_id ) { <nl> } <nl> <nl> class MTPmessages_exportChatInvite { / / RPC method ' messages . exportChatInvite ' <nl> } ; <nl> class MTPmessages_ExportChatInvite : public MTPBoxed < MTPmessages_exportChatInvite > { <nl> public : <nl> - MTPmessages_ExportChatInvite ( ) { <nl> - } <nl> + MTPmessages_ExportChatInvite ( ) = default ; <nl> MTPmessages_ExportChatInvite ( const MTPmessages_exportChatInvite & v ) : MTPBoxed < MTPmessages_exportChatInvite > ( v ) { <nl> } <nl> - MTPmessages_ExportChatInvite ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_exportChatInvite > ( from , end , cons ) { <nl> - } <nl> MTPmessages_ExportChatInvite ( MTPint _chat_id ) : MTPBoxed < MTPmessages_exportChatInvite > ( MTPmessages_exportChatInvite ( _chat_id ) ) { <nl> } <nl> } ; <nl> class MTPmessages_checkChatInvite { / / RPC method ' messages . checkChatInvite ' <nl> public : <nl> MTPstring vhash ; <nl> <nl> - MTPmessages_checkChatInvite ( ) { <nl> - } <nl> - MTPmessages_checkChatInvite ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_checkChatInvite ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_checkChatInvite ( ) = default ; <nl> MTPmessages_checkChatInvite ( const MTPstring & _hash ) : vhash ( _hash ) { <nl> } <nl> <nl> class MTPmessages_checkChatInvite { / / RPC method ' messages . checkChatInvite ' <nl> } ; <nl> class MTPmessages_CheckChatInvite : public MTPBoxed < MTPmessages_checkChatInvite > { <nl> public : <nl> - MTPmessages_CheckChatInvite ( ) { <nl> - } <nl> + MTPmessages_CheckChatInvite ( ) = default ; <nl> MTPmessages_CheckChatInvite ( const MTPmessages_checkChatInvite & v ) : MTPBoxed < MTPmessages_checkChatInvite > ( v ) { <nl> } <nl> - MTPmessages_CheckChatInvite ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_checkChatInvite > ( from , end , cons ) { <nl> - } <nl> MTPmessages_CheckChatInvite ( const MTPstring & _hash ) : MTPBoxed < MTPmessages_checkChatInvite > ( MTPmessages_checkChatInvite ( _hash ) ) { <nl> } <nl> } ; <nl> class MTPmessages_importChatInvite { / / RPC method ' messages . importChatInvite ' <nl> public : <nl> MTPstring vhash ; <nl> <nl> - MTPmessages_importChatInvite ( ) { <nl> - } <nl> - MTPmessages_importChatInvite ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_importChatInvite ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_importChatInvite ( ) = default ; <nl> MTPmessages_importChatInvite ( const MTPstring & _hash ) : vhash ( _hash ) { <nl> } <nl> <nl> class MTPmessages_importChatInvite { / / RPC method ' messages . importChatInvite ' <nl> } ; <nl> class MTPmessages_ImportChatInvite : public MTPBoxed < MTPmessages_importChatInvite > { <nl> public : <nl> - MTPmessages_ImportChatInvite ( ) { <nl> - } <nl> + MTPmessages_ImportChatInvite ( ) = default ; <nl> MTPmessages_ImportChatInvite ( const MTPmessages_importChatInvite & v ) : MTPBoxed < MTPmessages_importChatInvite > ( v ) { <nl> } <nl> - MTPmessages_ImportChatInvite ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_importChatInvite > ( from , end , cons ) { <nl> - } <nl> MTPmessages_ImportChatInvite ( const MTPstring & _hash ) : MTPBoxed < MTPmessages_importChatInvite > ( MTPmessages_importChatInvite ( _hash ) ) { <nl> } <nl> } ; <nl> class MTPmessages_getStickerSet { / / RPC method ' messages . getStickerSet ' <nl> public : <nl> MTPInputStickerSet vstickerset ; <nl> <nl> - MTPmessages_getStickerSet ( ) { <nl> - } <nl> - MTPmessages_getStickerSet ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_getStickerSet ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_getStickerSet ( ) = default ; <nl> MTPmessages_getStickerSet ( const MTPInputStickerSet & _stickerset ) : vstickerset ( _stickerset ) { <nl> } <nl> <nl> class MTPmessages_getStickerSet { / / RPC method ' messages . getStickerSet ' <nl> } ; <nl> class MTPmessages_GetStickerSet : public MTPBoxed < MTPmessages_getStickerSet > { <nl> public : <nl> - MTPmessages_GetStickerSet ( ) { <nl> - } <nl> + MTPmessages_GetStickerSet ( ) = default ; <nl> MTPmessages_GetStickerSet ( const MTPmessages_getStickerSet & v ) : MTPBoxed < MTPmessages_getStickerSet > ( v ) { <nl> } <nl> - MTPmessages_GetStickerSet ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_getStickerSet > ( from , end , cons ) { <nl> - } <nl> MTPmessages_GetStickerSet ( const MTPInputStickerSet & _stickerset ) : MTPBoxed < MTPmessages_getStickerSet > ( MTPmessages_getStickerSet ( _stickerset ) ) { <nl> } <nl> } ; <nl> class MTPmessages_installStickerSet { / / RPC method ' messages . installStickerSet ' <nl> MTPInputStickerSet vstickerset ; <nl> MTPBool varchived ; <nl> <nl> - MTPmessages_installStickerSet ( ) { <nl> - } <nl> - MTPmessages_installStickerSet ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_installStickerSet ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_installStickerSet ( ) = default ; <nl> MTPmessages_installStickerSet ( const MTPInputStickerSet & _stickerset , MTPBool _archived ) : vstickerset ( _stickerset ) , varchived ( _archived ) { <nl> } <nl> <nl> class MTPmessages_installStickerSet { / / RPC method ' messages . installStickerSet ' <nl> } ; <nl> class MTPmessages_InstallStickerSet : public MTPBoxed < MTPmessages_installStickerSet > { <nl> public : <nl> - MTPmessages_InstallStickerSet ( ) { <nl> - } <nl> + MTPmessages_InstallStickerSet ( ) = default ; <nl> MTPmessages_InstallStickerSet ( const MTPmessages_installStickerSet & v ) : MTPBoxed < MTPmessages_installStickerSet > ( v ) { <nl> } <nl> - MTPmessages_InstallStickerSet ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_installStickerSet > ( from , end , cons ) { <nl> - } <nl> MTPmessages_InstallStickerSet ( const MTPInputStickerSet & _stickerset , MTPBool _archived ) : MTPBoxed < MTPmessages_installStickerSet > ( MTPmessages_installStickerSet ( _stickerset , _archived ) ) { <nl> } <nl> } ; <nl> class MTPmessages_uninstallStickerSet { / / RPC method ' messages . uninstallSticker <nl> public : <nl> MTPInputStickerSet vstickerset ; <nl> <nl> - MTPmessages_uninstallStickerSet ( ) { <nl> - } <nl> - MTPmessages_uninstallStickerSet ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_uninstallStickerSet ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_uninstallStickerSet ( ) = default ; <nl> MTPmessages_uninstallStickerSet ( const MTPInputStickerSet & _stickerset ) : vstickerset ( _stickerset ) { <nl> } <nl> <nl> class MTPmessages_uninstallStickerSet { / / RPC method ' messages . uninstallSticker <nl> } ; <nl> class MTPmessages_UninstallStickerSet : public MTPBoxed < MTPmessages_uninstallStickerSet > { <nl> public : <nl> - MTPmessages_UninstallStickerSet ( ) { <nl> - } <nl> + MTPmessages_UninstallStickerSet ( ) = default ; <nl> MTPmessages_UninstallStickerSet ( const MTPmessages_uninstallStickerSet & v ) : MTPBoxed < MTPmessages_uninstallStickerSet > ( v ) { <nl> } <nl> - MTPmessages_UninstallStickerSet ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_uninstallStickerSet > ( from , end , cons ) { <nl> - } <nl> MTPmessages_UninstallStickerSet ( const MTPInputStickerSet & _stickerset ) : MTPBoxed < MTPmessages_uninstallStickerSet > ( MTPmessages_uninstallStickerSet ( _stickerset ) ) { <nl> } <nl> } ; <nl> class MTPmessages_startBot { / / RPC method ' messages . startBot ' <nl> MTPlong vrandom_id ; <nl> MTPstring vstart_param ; <nl> <nl> - MTPmessages_startBot ( ) { <nl> - } <nl> - MTPmessages_startBot ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_startBot ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_startBot ( ) = default ; <nl> MTPmessages_startBot ( const MTPInputUser & _bot , const MTPInputPeer & _peer , const MTPlong & _random_id , const MTPstring & _start_param ) : vbot ( _bot ) , vpeer ( _peer ) , vrandom_id ( _random_id ) , vstart_param ( _start_param ) { <nl> } <nl> <nl> class MTPmessages_startBot { / / RPC method ' messages . startBot ' <nl> } ; <nl> class MTPmessages_StartBot : public MTPBoxed < MTPmessages_startBot > { <nl> public : <nl> - MTPmessages_StartBot ( ) { <nl> - } <nl> + MTPmessages_StartBot ( ) = default ; <nl> MTPmessages_StartBot ( const MTPmessages_startBot & v ) : MTPBoxed < MTPmessages_startBot > ( v ) { <nl> } <nl> - MTPmessages_StartBot ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_startBot > ( from , end , cons ) { <nl> - } <nl> MTPmessages_StartBot ( const MTPInputUser & _bot , const MTPInputPeer & _peer , const MTPlong & _random_id , const MTPstring & _start_param ) : MTPBoxed < MTPmessages_startBot > ( MTPmessages_startBot ( _bot , _peer , _random_id , _start_param ) ) { <nl> } <nl> } ; <nl> class MTPmessages_getMessagesViews { / / RPC method ' messages . getMessagesViews ' <nl> MTPVector < MTPint > vid ; <nl> MTPBool vincrement ; <nl> <nl> - MTPmessages_getMessagesViews ( ) { <nl> - } <nl> - MTPmessages_getMessagesViews ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_getMessagesViews ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_getMessagesViews ( ) = default ; <nl> MTPmessages_getMessagesViews ( const MTPInputPeer & _peer , const MTPVector < MTPint > & _id , MTPBool _increment ) : vpeer ( _peer ) , vid ( _id ) , vincrement ( _increment ) { <nl> } <nl> <nl> class MTPmessages_getMessagesViews { / / RPC method ' messages . getMessagesViews ' <nl> } ; <nl> class MTPmessages_GetMessagesViews : public MTPBoxed < MTPmessages_getMessagesViews > { <nl> public : <nl> - MTPmessages_GetMessagesViews ( ) { <nl> - } <nl> + MTPmessages_GetMessagesViews ( ) = default ; <nl> MTPmessages_GetMessagesViews ( const MTPmessages_getMessagesViews & v ) : MTPBoxed < MTPmessages_getMessagesViews > ( v ) { <nl> } <nl> - MTPmessages_GetMessagesViews ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_getMessagesViews > ( from , end , cons ) { <nl> - } <nl> MTPmessages_GetMessagesViews ( const MTPInputPeer & _peer , const MTPVector < MTPint > & _id , MTPBool _increment ) : MTPBoxed < MTPmessages_getMessagesViews > ( MTPmessages_getMessagesViews ( _peer , _id , _increment ) ) { <nl> } <nl> } ; <nl> class MTPmessages_toggleChatAdmins { / / RPC method ' messages . toggleChatAdmins ' <nl> MTPint vchat_id ; <nl> MTPBool venabled ; <nl> <nl> - MTPmessages_toggleChatAdmins ( ) { <nl> - } <nl> - MTPmessages_toggleChatAdmins ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_toggleChatAdmins ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_toggleChatAdmins ( ) = default ; <nl> MTPmessages_toggleChatAdmins ( MTPint _chat_id , MTPBool _enabled ) : vchat_id ( _chat_id ) , venabled ( _enabled ) { <nl> } <nl> <nl> class MTPmessages_toggleChatAdmins { / / RPC method ' messages . toggleChatAdmins ' <nl> } ; <nl> class MTPmessages_ToggleChatAdmins : public MTPBoxed < MTPmessages_toggleChatAdmins > { <nl> public : <nl> - MTPmessages_ToggleChatAdmins ( ) { <nl> - } <nl> + MTPmessages_ToggleChatAdmins ( ) = default ; <nl> MTPmessages_ToggleChatAdmins ( const MTPmessages_toggleChatAdmins & v ) : MTPBoxed < MTPmessages_toggleChatAdmins > ( v ) { <nl> } <nl> - MTPmessages_ToggleChatAdmins ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_toggleChatAdmins > ( from , end , cons ) { <nl> - } <nl> MTPmessages_ToggleChatAdmins ( MTPint _chat_id , MTPBool _enabled ) : MTPBoxed < MTPmessages_toggleChatAdmins > ( MTPmessages_toggleChatAdmins ( _chat_id , _enabled ) ) { <nl> } <nl> } ; <nl> class MTPmessages_editChatAdmin { / / RPC method ' messages . editChatAdmin ' <nl> MTPInputUser vuser_id ; <nl> MTPBool vis_admin ; <nl> <nl> - MTPmessages_editChatAdmin ( ) { <nl> - } <nl> - MTPmessages_editChatAdmin ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_editChatAdmin ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_editChatAdmin ( ) = default ; <nl> MTPmessages_editChatAdmin ( MTPint _chat_id , const MTPInputUser & _user_id , MTPBool _is_admin ) : vchat_id ( _chat_id ) , vuser_id ( _user_id ) , vis_admin ( _is_admin ) { <nl> } <nl> <nl> class MTPmessages_editChatAdmin { / / RPC method ' messages . editChatAdmin ' <nl> } ; <nl> class MTPmessages_EditChatAdmin : public MTPBoxed < MTPmessages_editChatAdmin > { <nl> public : <nl> - MTPmessages_EditChatAdmin ( ) { <nl> - } <nl> + MTPmessages_EditChatAdmin ( ) = default ; <nl> MTPmessages_EditChatAdmin ( const MTPmessages_editChatAdmin & v ) : MTPBoxed < MTPmessages_editChatAdmin > ( v ) { <nl> } <nl> - MTPmessages_EditChatAdmin ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_editChatAdmin > ( from , end , cons ) { <nl> - } <nl> MTPmessages_EditChatAdmin ( MTPint _chat_id , const MTPInputUser & _user_id , MTPBool _is_admin ) : MTPBoxed < MTPmessages_editChatAdmin > ( MTPmessages_editChatAdmin ( _chat_id , _user_id , _is_admin ) ) { <nl> } <nl> } ; <nl> class MTPmessages_migrateChat { / / RPC method ' messages . migrateChat ' <nl> public : <nl> MTPint vchat_id ; <nl> <nl> - MTPmessages_migrateChat ( ) { <nl> - } <nl> - MTPmessages_migrateChat ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_migrateChat ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_migrateChat ( ) = default ; <nl> MTPmessages_migrateChat ( MTPint _chat_id ) : vchat_id ( _chat_id ) { <nl> } <nl> <nl> class MTPmessages_migrateChat { / / RPC method ' messages . migrateChat ' <nl> } ; <nl> class MTPmessages_MigrateChat : public MTPBoxed < MTPmessages_migrateChat > { <nl> public : <nl> - MTPmessages_MigrateChat ( ) { <nl> - } <nl> + MTPmessages_MigrateChat ( ) = default ; <nl> MTPmessages_MigrateChat ( const MTPmessages_migrateChat & v ) : MTPBoxed < MTPmessages_migrateChat > ( v ) { <nl> } <nl> - MTPmessages_MigrateChat ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_migrateChat > ( from , end , cons ) { <nl> - } <nl> MTPmessages_MigrateChat ( MTPint _chat_id ) : MTPBoxed < MTPmessages_migrateChat > ( MTPmessages_migrateChat ( _chat_id ) ) { <nl> } <nl> } ; <nl> class MTPmessages_searchGlobal { / / RPC method ' messages . searchGlobal ' <nl> MTPint voffset_id ; <nl> MTPint vlimit ; <nl> <nl> - MTPmessages_searchGlobal ( ) { <nl> - } <nl> - MTPmessages_searchGlobal ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_searchGlobal ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_searchGlobal ( ) = default ; <nl> MTPmessages_searchGlobal ( const MTPstring & _q , MTPint _offset_date , const MTPInputPeer & _offset_peer , MTPint _offset_id , MTPint _limit ) : vq ( _q ) , voffset_date ( _offset_date ) , voffset_peer ( _offset_peer ) , voffset_id ( _offset_id ) , vlimit ( _limit ) { <nl> } <nl> <nl> class MTPmessages_searchGlobal { / / RPC method ' messages . searchGlobal ' <nl> } ; <nl> class MTPmessages_SearchGlobal : public MTPBoxed < MTPmessages_searchGlobal > { <nl> public : <nl> - MTPmessages_SearchGlobal ( ) { <nl> - } <nl> + MTPmessages_SearchGlobal ( ) = default ; <nl> MTPmessages_SearchGlobal ( const MTPmessages_searchGlobal & v ) : MTPBoxed < MTPmessages_searchGlobal > ( v ) { <nl> } <nl> - MTPmessages_SearchGlobal ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_searchGlobal > ( from , end , cons ) { <nl> - } <nl> MTPmessages_SearchGlobal ( const MTPstring & _q , MTPint _offset_date , const MTPInputPeer & _offset_peer , MTPint _offset_id , MTPint _limit ) : MTPBoxed < MTPmessages_searchGlobal > ( MTPmessages_searchGlobal ( _q , _offset_date , _offset_peer , _offset_id , _limit ) ) { <nl> } <nl> } ; <nl> class MTPmessages_reorderStickerSets { / / RPC method ' messages . reorderStickerSet <nl> MTPflags < MTPmessages_reorderStickerSets : : Flags > vflags ; <nl> MTPVector < MTPlong > vorder ; <nl> <nl> - MTPmessages_reorderStickerSets ( ) { <nl> - } <nl> - MTPmessages_reorderStickerSets ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_reorderStickerSets ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_reorderStickerSets ( ) = default ; <nl> MTPmessages_reorderStickerSets ( const MTPflags < MTPmessages_reorderStickerSets : : Flags > & _flags , const MTPVector < MTPlong > & _order ) : vflags ( _flags ) , vorder ( _order ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPmessages_reorderStickerSets : : Flags ) <nl> <nl> class MTPmessages_ReorderStickerSets : public MTPBoxed < MTPmessages_reorderStickerSets > { <nl> public : <nl> - MTPmessages_ReorderStickerSets ( ) { <nl> - } <nl> + MTPmessages_ReorderStickerSets ( ) = default ; <nl> MTPmessages_ReorderStickerSets ( const MTPmessages_reorderStickerSets & v ) : MTPBoxed < MTPmessages_reorderStickerSets > ( v ) { <nl> } <nl> - MTPmessages_ReorderStickerSets ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_reorderStickerSets > ( from , end , cons ) { <nl> - } <nl> MTPmessages_ReorderStickerSets ( const MTPflags < MTPmessages_reorderStickerSets : : Flags > & _flags , const MTPVector < MTPlong > & _order ) : MTPBoxed < MTPmessages_reorderStickerSets > ( MTPmessages_reorderStickerSets ( _flags , _order ) ) { <nl> } <nl> } ; <nl> class MTPmessages_getDocumentByHash { / / RPC method ' messages . getDocumentByHash ' <nl> MTPint vsize ; <nl> MTPstring vmime_type ; <nl> <nl> - MTPmessages_getDocumentByHash ( ) { <nl> - } <nl> - MTPmessages_getDocumentByHash ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_getDocumentByHash ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_getDocumentByHash ( ) = default ; <nl> MTPmessages_getDocumentByHash ( const MTPbytes & _sha256 , MTPint _size , const MTPstring & _mime_type ) : vsha256 ( _sha256 ) , vsize ( _size ) , vmime_type ( _mime_type ) { <nl> } <nl> <nl> class MTPmessages_getDocumentByHash { / / RPC method ' messages . getDocumentByHash ' <nl> } ; <nl> class MTPmessages_GetDocumentByHash : public MTPBoxed < MTPmessages_getDocumentByHash > { <nl> public : <nl> - MTPmessages_GetDocumentByHash ( ) { <nl> - } <nl> + MTPmessages_GetDocumentByHash ( ) = default ; <nl> MTPmessages_GetDocumentByHash ( const MTPmessages_getDocumentByHash & v ) : MTPBoxed < MTPmessages_getDocumentByHash > ( v ) { <nl> } <nl> - MTPmessages_GetDocumentByHash ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_getDocumentByHash > ( from , end , cons ) { <nl> - } <nl> MTPmessages_GetDocumentByHash ( const MTPbytes & _sha256 , MTPint _size , const MTPstring & _mime_type ) : MTPBoxed < MTPmessages_getDocumentByHash > ( MTPmessages_getDocumentByHash ( _sha256 , _size , _mime_type ) ) { <nl> } <nl> } ; <nl> class MTPmessages_searchGifs { / / RPC method ' messages . searchGifs ' <nl> MTPstring vq ; <nl> MTPint voffset ; <nl> <nl> - MTPmessages_searchGifs ( ) { <nl> - } <nl> - MTPmessages_searchGifs ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_searchGifs ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_searchGifs ( ) = default ; <nl> MTPmessages_searchGifs ( const MTPstring & _q , MTPint _offset ) : vq ( _q ) , voffset ( _offset ) { <nl> } <nl> <nl> class MTPmessages_searchGifs { / / RPC method ' messages . searchGifs ' <nl> } ; <nl> class MTPmessages_SearchGifs : public MTPBoxed < MTPmessages_searchGifs > { <nl> public : <nl> - MTPmessages_SearchGifs ( ) { <nl> - } <nl> + MTPmessages_SearchGifs ( ) = default ; <nl> MTPmessages_SearchGifs ( const MTPmessages_searchGifs & v ) : MTPBoxed < MTPmessages_searchGifs > ( v ) { <nl> } <nl> - MTPmessages_SearchGifs ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_searchGifs > ( from , end , cons ) { <nl> - } <nl> MTPmessages_SearchGifs ( const MTPstring & _q , MTPint _offset ) : MTPBoxed < MTPmessages_searchGifs > ( MTPmessages_searchGifs ( _q , _offset ) ) { <nl> } <nl> } ; <nl> class MTPmessages_getSavedGifs { / / RPC method ' messages . getSavedGifs ' <nl> public : <nl> MTPint vhash ; <nl> <nl> - MTPmessages_getSavedGifs ( ) { <nl> - } <nl> - MTPmessages_getSavedGifs ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_getSavedGifs ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_getSavedGifs ( ) = default ; <nl> MTPmessages_getSavedGifs ( MTPint _hash ) : vhash ( _hash ) { <nl> } <nl> <nl> class MTPmessages_getSavedGifs { / / RPC method ' messages . getSavedGifs ' <nl> } ; <nl> class MTPmessages_GetSavedGifs : public MTPBoxed < MTPmessages_getSavedGifs > { <nl> public : <nl> - MTPmessages_GetSavedGifs ( ) { <nl> - } <nl> + MTPmessages_GetSavedGifs ( ) = default ; <nl> MTPmessages_GetSavedGifs ( const MTPmessages_getSavedGifs & v ) : MTPBoxed < MTPmessages_getSavedGifs > ( v ) { <nl> } <nl> - MTPmessages_GetSavedGifs ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_getSavedGifs > ( from , end , cons ) { <nl> - } <nl> MTPmessages_GetSavedGifs ( MTPint _hash ) : MTPBoxed < MTPmessages_getSavedGifs > ( MTPmessages_getSavedGifs ( _hash ) ) { <nl> } <nl> } ; <nl> class MTPmessages_saveGif { / / RPC method ' messages . saveGif ' <nl> MTPInputDocument vid ; <nl> MTPBool vunsave ; <nl> <nl> - MTPmessages_saveGif ( ) { <nl> - } <nl> - MTPmessages_saveGif ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_saveGif ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_saveGif ( ) = default ; <nl> MTPmessages_saveGif ( const MTPInputDocument & _id , MTPBool _unsave ) : vid ( _id ) , vunsave ( _unsave ) { <nl> } <nl> <nl> class MTPmessages_saveGif { / / RPC method ' messages . saveGif ' <nl> } ; <nl> class MTPmessages_SaveGif : public MTPBoxed < MTPmessages_saveGif > { <nl> public : <nl> - MTPmessages_SaveGif ( ) { <nl> - } <nl> + MTPmessages_SaveGif ( ) = default ; <nl> MTPmessages_SaveGif ( const MTPmessages_saveGif & v ) : MTPBoxed < MTPmessages_saveGif > ( v ) { <nl> } <nl> - MTPmessages_SaveGif ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_saveGif > ( from , end , cons ) { <nl> - } <nl> MTPmessages_SaveGif ( const MTPInputDocument & _id , MTPBool _unsave ) : MTPBoxed < MTPmessages_saveGif > ( MTPmessages_saveGif ( _id , _unsave ) ) { <nl> } <nl> } ; <nl> class MTPmessages_getInlineBotResults { / / RPC method ' messages . getInlineBotResu <nl> MTPstring vquery ; <nl> MTPstring voffset ; <nl> <nl> - MTPmessages_getInlineBotResults ( ) { <nl> - } <nl> - MTPmessages_getInlineBotResults ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_getInlineBotResults ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_getInlineBotResults ( ) = default ; <nl> MTPmessages_getInlineBotResults ( const MTPflags < MTPmessages_getInlineBotResults : : Flags > & _flags , const MTPInputUser & _bot , const MTPInputPeer & _peer , const MTPInputGeoPoint & _geo_point , const MTPstring & _query , const MTPstring & _offset ) : vflags ( _flags ) , vbot ( _bot ) , vpeer ( _peer ) , vgeo_point ( _geo_point ) , vquery ( _query ) , voffset ( _offset ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPmessages_getInlineBotResults : : Flags ) <nl> <nl> class MTPmessages_GetInlineBotResults : public MTPBoxed < MTPmessages_getInlineBotResults > { <nl> public : <nl> - MTPmessages_GetInlineBotResults ( ) { <nl> - } <nl> + MTPmessages_GetInlineBotResults ( ) = default ; <nl> MTPmessages_GetInlineBotResults ( const MTPmessages_getInlineBotResults & v ) : MTPBoxed < MTPmessages_getInlineBotResults > ( v ) { <nl> } <nl> - MTPmessages_GetInlineBotResults ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_getInlineBotResults > ( from , end , cons ) { <nl> - } <nl> MTPmessages_GetInlineBotResults ( const MTPflags < MTPmessages_getInlineBotResults : : Flags > & _flags , const MTPInputUser & _bot , const MTPInputPeer & _peer , const MTPInputGeoPoint & _geo_point , const MTPstring & _query , const MTPstring & _offset ) : MTPBoxed < MTPmessages_getInlineBotResults > ( MTPmessages_getInlineBotResults ( _flags , _bot , _peer , _geo_point , _query , _offset ) ) { <nl> } <nl> } ; <nl> class MTPmessages_setInlineBotResults { / / RPC method ' messages . setInlineBotResu <nl> MTPstring vnext_offset ; <nl> MTPInlineBotSwitchPM vswitch_pm ; <nl> <nl> - MTPmessages_setInlineBotResults ( ) { <nl> - } <nl> - MTPmessages_setInlineBotResults ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_setInlineBotResults ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_setInlineBotResults ( ) = default ; <nl> MTPmessages_setInlineBotResults ( const MTPflags < MTPmessages_setInlineBotResults : : Flags > & _flags , const MTPlong & _query_id , const MTPVector < MTPInputBotInlineResult > & _results , MTPint _cache_time , const MTPstring & _next_offset , const MTPInlineBotSwitchPM & _switch_pm ) : vflags ( _flags ) , vquery_id ( _query_id ) , vresults ( _results ) , vcache_time ( _cache_time ) , vnext_offset ( _next_offset ) , vswitch_pm ( _switch_pm ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPmessages_setInlineBotResults : : Flags ) <nl> <nl> class MTPmessages_SetInlineBotResults : public MTPBoxed < MTPmessages_setInlineBotResults > { <nl> public : <nl> - MTPmessages_SetInlineBotResults ( ) { <nl> - } <nl> + MTPmessages_SetInlineBotResults ( ) = default ; <nl> MTPmessages_SetInlineBotResults ( const MTPmessages_setInlineBotResults & v ) : MTPBoxed < MTPmessages_setInlineBotResults > ( v ) { <nl> } <nl> - MTPmessages_SetInlineBotResults ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_setInlineBotResults > ( from , end , cons ) { <nl> - } <nl> MTPmessages_SetInlineBotResults ( const MTPflags < MTPmessages_setInlineBotResults : : Flags > & _flags , const MTPlong & _query_id , const MTPVector < MTPInputBotInlineResult > & _results , MTPint _cache_time , const MTPstring & _next_offset , const MTPInlineBotSwitchPM & _switch_pm ) : MTPBoxed < MTPmessages_setInlineBotResults > ( MTPmessages_setInlineBotResults ( _flags , _query_id , _results , _cache_time , _next_offset , _switch_pm ) ) { <nl> } <nl> } ; <nl> class MTPmessages_sendInlineBotResult { / / RPC method ' messages . sendInlineBotRes <nl> MTPlong vquery_id ; <nl> MTPstring vid ; <nl> <nl> - MTPmessages_sendInlineBotResult ( ) { <nl> - } <nl> - MTPmessages_sendInlineBotResult ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_sendInlineBotResult ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_sendInlineBotResult ( ) = default ; <nl> MTPmessages_sendInlineBotResult ( const MTPflags < MTPmessages_sendInlineBotResult : : Flags > & _flags , const MTPInputPeer & _peer , MTPint _reply_to_msg_id , const MTPlong & _random_id , const MTPlong & _query_id , const MTPstring & _id ) : vflags ( _flags ) , vpeer ( _peer ) , vreply_to_msg_id ( _reply_to_msg_id ) , vrandom_id ( _random_id ) , vquery_id ( _query_id ) , vid ( _id ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPmessages_sendInlineBotResult : : Flags ) <nl> <nl> class MTPmessages_SendInlineBotResult : public MTPBoxed < MTPmessages_sendInlineBotResult > { <nl> public : <nl> - MTPmessages_SendInlineBotResult ( ) { <nl> - } <nl> + MTPmessages_SendInlineBotResult ( ) = default ; <nl> MTPmessages_SendInlineBotResult ( const MTPmessages_sendInlineBotResult & v ) : MTPBoxed < MTPmessages_sendInlineBotResult > ( v ) { <nl> } <nl> - MTPmessages_SendInlineBotResult ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_sendInlineBotResult > ( from , end , cons ) { <nl> - } <nl> MTPmessages_SendInlineBotResult ( const MTPflags < MTPmessages_sendInlineBotResult : : Flags > & _flags , const MTPInputPeer & _peer , MTPint _reply_to_msg_id , const MTPlong & _random_id , const MTPlong & _query_id , const MTPstring & _id ) : MTPBoxed < MTPmessages_sendInlineBotResult > ( MTPmessages_sendInlineBotResult ( _flags , _peer , _reply_to_msg_id , _random_id , _query_id , _id ) ) { <nl> } <nl> } ; <nl> class MTPmessages_getMessageEditData { / / RPC method ' messages . getMessageEditDat <nl> MTPInputPeer vpeer ; <nl> MTPint vid ; <nl> <nl> - MTPmessages_getMessageEditData ( ) { <nl> - } <nl> - MTPmessages_getMessageEditData ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_getMessageEditData ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_getMessageEditData ( ) = default ; <nl> MTPmessages_getMessageEditData ( const MTPInputPeer & _peer , MTPint _id ) : vpeer ( _peer ) , vid ( _id ) { <nl> } <nl> <nl> class MTPmessages_getMessageEditData { / / RPC method ' messages . getMessageEditDat <nl> } ; <nl> class MTPmessages_GetMessageEditData : public MTPBoxed < MTPmessages_getMessageEditData > { <nl> public : <nl> - MTPmessages_GetMessageEditData ( ) { <nl> - } <nl> + MTPmessages_GetMessageEditData ( ) = default ; <nl> MTPmessages_GetMessageEditData ( const MTPmessages_getMessageEditData & v ) : MTPBoxed < MTPmessages_getMessageEditData > ( v ) { <nl> } <nl> - MTPmessages_GetMessageEditData ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_getMessageEditData > ( from , end , cons ) { <nl> - } <nl> MTPmessages_GetMessageEditData ( const MTPInputPeer & _peer , MTPint _id ) : MTPBoxed < MTPmessages_getMessageEditData > ( MTPmessages_getMessageEditData ( _peer , _id ) ) { <nl> } <nl> } ; <nl> class MTPmessages_editMessage { / / RPC method ' messages . editMessage ' <nl> MTPReplyMarkup vreply_markup ; <nl> MTPVector < MTPMessageEntity > ventities ; <nl> <nl> - MTPmessages_editMessage ( ) { <nl> - } <nl> - MTPmessages_editMessage ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_editMessage ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_editMessage ( ) = default ; <nl> MTPmessages_editMessage ( const MTPflags < MTPmessages_editMessage : : Flags > & _flags , const MTPInputPeer & _peer , MTPint _id , const MTPstring & _message , const MTPReplyMarkup & _reply_markup , const MTPVector < MTPMessageEntity > & _entities ) : vflags ( _flags ) , vpeer ( _peer ) , vid ( _id ) , vmessage ( _message ) , vreply_markup ( _reply_markup ) , ventities ( _entities ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPmessages_editMessage : : Flags ) <nl> <nl> class MTPmessages_EditMessage : public MTPBoxed < MTPmessages_editMessage > { <nl> public : <nl> - MTPmessages_EditMessage ( ) { <nl> - } <nl> + MTPmessages_EditMessage ( ) = default ; <nl> MTPmessages_EditMessage ( const MTPmessages_editMessage & v ) : MTPBoxed < MTPmessages_editMessage > ( v ) { <nl> } <nl> - MTPmessages_EditMessage ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_editMessage > ( from , end , cons ) { <nl> - } <nl> MTPmessages_EditMessage ( const MTPflags < MTPmessages_editMessage : : Flags > & _flags , const MTPInputPeer & _peer , MTPint _id , const MTPstring & _message , const MTPReplyMarkup & _reply_markup , const MTPVector < MTPMessageEntity > & _entities ) : MTPBoxed < MTPmessages_editMessage > ( MTPmessages_editMessage ( _flags , _peer , _id , _message , _reply_markup , _entities ) ) { <nl> } <nl> } ; <nl> class MTPmessages_editInlineBotMessage { / / RPC method ' messages . editInlineBotMe <nl> MTPReplyMarkup vreply_markup ; <nl> MTPVector < MTPMessageEntity > ventities ; <nl> <nl> - MTPmessages_editInlineBotMessage ( ) { <nl> - } <nl> - MTPmessages_editInlineBotMessage ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_editInlineBotMessage ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_editInlineBotMessage ( ) = default ; <nl> MTPmessages_editInlineBotMessage ( const MTPflags < MTPmessages_editInlineBotMessage : : Flags > & _flags , const MTPInputBotInlineMessageID & _id , const MTPstring & _message , const MTPReplyMarkup & _reply_markup , const MTPVector < MTPMessageEntity > & _entities ) : vflags ( _flags ) , vid ( _id ) , vmessage ( _message ) , vreply_markup ( _reply_markup ) , ventities ( _entities ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPmessages_editInlineBotMessage : : Flags ) <nl> <nl> class MTPmessages_EditInlineBotMessage : public MTPBoxed < MTPmessages_editInlineBotMessage > { <nl> public : <nl> - MTPmessages_EditInlineBotMessage ( ) { <nl> - } <nl> + MTPmessages_EditInlineBotMessage ( ) = default ; <nl> MTPmessages_EditInlineBotMessage ( const MTPmessages_editInlineBotMessage & v ) : MTPBoxed < MTPmessages_editInlineBotMessage > ( v ) { <nl> } <nl> - MTPmessages_EditInlineBotMessage ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_editInlineBotMessage > ( from , end , cons ) { <nl> - } <nl> MTPmessages_EditInlineBotMessage ( const MTPflags < MTPmessages_editInlineBotMessage : : Flags > & _flags , const MTPInputBotInlineMessageID & _id , const MTPstring & _message , const MTPReplyMarkup & _reply_markup , const MTPVector < MTPMessageEntity > & _entities ) : MTPBoxed < MTPmessages_editInlineBotMessage > ( MTPmessages_editInlineBotMessage ( _flags , _id , _message , _reply_markup , _entities ) ) { <nl> } <nl> } ; <nl> class MTPmessages_getBotCallbackAnswer { / / RPC method ' messages . getBotCallbackA <nl> MTPint vmsg_id ; <nl> MTPbytes vdata ; <nl> <nl> - MTPmessages_getBotCallbackAnswer ( ) { <nl> - } <nl> - MTPmessages_getBotCallbackAnswer ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_getBotCallbackAnswer ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_getBotCallbackAnswer ( ) = default ; <nl> MTPmessages_getBotCallbackAnswer ( const MTPflags < MTPmessages_getBotCallbackAnswer : : Flags > & _flags , const MTPInputPeer & _peer , MTPint _msg_id , const MTPbytes & _data ) : vflags ( _flags ) , vpeer ( _peer ) , vmsg_id ( _msg_id ) , vdata ( _data ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPmessages_getBotCallbackAnswer : : Flags ) <nl> <nl> class MTPmessages_GetBotCallbackAnswer : public MTPBoxed < MTPmessages_getBotCallbackAnswer > { <nl> public : <nl> - MTPmessages_GetBotCallbackAnswer ( ) { <nl> - } <nl> + MTPmessages_GetBotCallbackAnswer ( ) = default ; <nl> MTPmessages_GetBotCallbackAnswer ( const MTPmessages_getBotCallbackAnswer & v ) : MTPBoxed < MTPmessages_getBotCallbackAnswer > ( v ) { <nl> } <nl> - MTPmessages_GetBotCallbackAnswer ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_getBotCallbackAnswer > ( from , end , cons ) { <nl> - } <nl> MTPmessages_GetBotCallbackAnswer ( const MTPflags < MTPmessages_getBotCallbackAnswer : : Flags > & _flags , const MTPInputPeer & _peer , MTPint _msg_id , const MTPbytes & _data ) : MTPBoxed < MTPmessages_getBotCallbackAnswer > ( MTPmessages_getBotCallbackAnswer ( _flags , _peer , _msg_id , _data ) ) { <nl> } <nl> } ; <nl> class MTPmessages_setBotCallbackAnswer { / / RPC method ' messages . setBotCallbackA <nl> MTPstring vurl ; <nl> MTPint vcache_time ; <nl> <nl> - MTPmessages_setBotCallbackAnswer ( ) { <nl> - } <nl> - MTPmessages_setBotCallbackAnswer ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_setBotCallbackAnswer ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_setBotCallbackAnswer ( ) = default ; <nl> MTPmessages_setBotCallbackAnswer ( const MTPflags < MTPmessages_setBotCallbackAnswer : : Flags > & _flags , const MTPlong & _query_id , const MTPstring & _message , const MTPstring & _url , MTPint _cache_time ) : vflags ( _flags ) , vquery_id ( _query_id ) , vmessage ( _message ) , vurl ( _url ) , vcache_time ( _cache_time ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPmessages_setBotCallbackAnswer : : Flags ) <nl> <nl> class MTPmessages_SetBotCallbackAnswer : public MTPBoxed < MTPmessages_setBotCallbackAnswer > { <nl> public : <nl> - MTPmessages_SetBotCallbackAnswer ( ) { <nl> - } <nl> + MTPmessages_SetBotCallbackAnswer ( ) = default ; <nl> MTPmessages_SetBotCallbackAnswer ( const MTPmessages_setBotCallbackAnswer & v ) : MTPBoxed < MTPmessages_setBotCallbackAnswer > ( v ) { <nl> } <nl> - MTPmessages_SetBotCallbackAnswer ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_setBotCallbackAnswer > ( from , end , cons ) { <nl> - } <nl> MTPmessages_SetBotCallbackAnswer ( const MTPflags < MTPmessages_setBotCallbackAnswer : : Flags > & _flags , const MTPlong & _query_id , const MTPstring & _message , const MTPstring & _url , MTPint _cache_time ) : MTPBoxed < MTPmessages_setBotCallbackAnswer > ( MTPmessages_setBotCallbackAnswer ( _flags , _query_id , _message , _url , _cache_time ) ) { <nl> } <nl> } ; <nl> class MTPmessages_getPeerDialogs { / / RPC method ' messages . getPeerDialogs ' <nl> public : <nl> MTPVector < MTPInputPeer > vpeers ; <nl> <nl> - MTPmessages_getPeerDialogs ( ) { <nl> - } <nl> - MTPmessages_getPeerDialogs ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_getPeerDialogs ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_getPeerDialogs ( ) = default ; <nl> MTPmessages_getPeerDialogs ( const MTPVector < MTPInputPeer > & _peers ) : vpeers ( _peers ) { <nl> } <nl> <nl> class MTPmessages_getPeerDialogs { / / RPC method ' messages . getPeerDialogs ' <nl> } ; <nl> class MTPmessages_GetPeerDialogs : public MTPBoxed < MTPmessages_getPeerDialogs > { <nl> public : <nl> - MTPmessages_GetPeerDialogs ( ) { <nl> - } <nl> + MTPmessages_GetPeerDialogs ( ) = default ; <nl> MTPmessages_GetPeerDialogs ( const MTPmessages_getPeerDialogs & v ) : MTPBoxed < MTPmessages_getPeerDialogs > ( v ) { <nl> } <nl> - MTPmessages_GetPeerDialogs ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_getPeerDialogs > ( from , end , cons ) { <nl> - } <nl> MTPmessages_GetPeerDialogs ( const MTPVector < MTPInputPeer > & _peers ) : MTPBoxed < MTPmessages_getPeerDialogs > ( MTPmessages_getPeerDialogs ( _peers ) ) { <nl> } <nl> } ; <nl> class MTPmessages_saveDraft { / / RPC method ' messages . saveDraft ' <nl> MTPstring vmessage ; <nl> MTPVector < MTPMessageEntity > ventities ; <nl> <nl> - MTPmessages_saveDraft ( ) { <nl> - } <nl> - MTPmessages_saveDraft ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_saveDraft ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_saveDraft ( ) = default ; <nl> MTPmessages_saveDraft ( const MTPflags < MTPmessages_saveDraft : : Flags > & _flags , MTPint _reply_to_msg_id , const MTPInputPeer & _peer , const MTPstring & _message , const MTPVector < MTPMessageEntity > & _entities ) : vflags ( _flags ) , vreply_to_msg_id ( _reply_to_msg_id ) , vpeer ( _peer ) , vmessage ( _message ) , ventities ( _entities ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPmessages_saveDraft : : Flags ) <nl> <nl> class MTPmessages_SaveDraft : public MTPBoxed < MTPmessages_saveDraft > { <nl> public : <nl> - MTPmessages_SaveDraft ( ) { <nl> - } <nl> + MTPmessages_SaveDraft ( ) = default ; <nl> MTPmessages_SaveDraft ( const MTPmessages_saveDraft & v ) : MTPBoxed < MTPmessages_saveDraft > ( v ) { <nl> } <nl> - MTPmessages_SaveDraft ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_saveDraft > ( from , end , cons ) { <nl> - } <nl> MTPmessages_SaveDraft ( const MTPflags < MTPmessages_saveDraft : : Flags > & _flags , MTPint _reply_to_msg_id , const MTPInputPeer & _peer , const MTPstring & _message , const MTPVector < MTPMessageEntity > & _entities ) : MTPBoxed < MTPmessages_saveDraft > ( MTPmessages_saveDraft ( _flags , _reply_to_msg_id , _peer , _message , _entities ) ) { <nl> } <nl> } ; <nl> <nl> class MTPmessages_getAllDrafts { / / RPC method ' messages . getAllDrafts ' <nl> public : <nl> - MTPmessages_getAllDrafts ( ) { <nl> - } <nl> - MTPmessages_getAllDrafts ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_getAllDrafts ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_getAllDrafts ( ) = default ; <nl> <nl> uint32 innerLength ( ) const { <nl> return 0 ; <nl> class MTPmessages_getAllDrafts { / / RPC method ' messages . getAllDrafts ' <nl> } ; <nl> class MTPmessages_GetAllDrafts : public MTPBoxed < MTPmessages_getAllDrafts > { <nl> public : <nl> - MTPmessages_GetAllDrafts ( ) { <nl> - } <nl> + MTPmessages_GetAllDrafts ( ) = default ; <nl> MTPmessages_GetAllDrafts ( const MTPmessages_getAllDrafts & v ) : MTPBoxed < MTPmessages_getAllDrafts > ( v ) { <nl> } <nl> - MTPmessages_GetAllDrafts ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_getAllDrafts > ( from , end , cons ) { <nl> - } <nl> } ; <nl> <nl> class MTPmessages_getFeaturedStickers { / / RPC method ' messages . getFeaturedStickers ' <nl> public : <nl> MTPint vhash ; <nl> <nl> - MTPmessages_getFeaturedStickers ( ) { <nl> - } <nl> - MTPmessages_getFeaturedStickers ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_getFeaturedStickers ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_getFeaturedStickers ( ) = default ; <nl> MTPmessages_getFeaturedStickers ( MTPint _hash ) : vhash ( _hash ) { <nl> } <nl> <nl> class MTPmessages_getFeaturedStickers { / / RPC method ' messages . getFeaturedStick <nl> } ; <nl> class MTPmessages_GetFeaturedStickers : public MTPBoxed < MTPmessages_getFeaturedStickers > { <nl> public : <nl> - MTPmessages_GetFeaturedStickers ( ) { <nl> - } <nl> + MTPmessages_GetFeaturedStickers ( ) = default ; <nl> MTPmessages_GetFeaturedStickers ( const MTPmessages_getFeaturedStickers & v ) : MTPBoxed < MTPmessages_getFeaturedStickers > ( v ) { <nl> } <nl> - MTPmessages_GetFeaturedStickers ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_getFeaturedStickers > ( from , end , cons ) { <nl> - } <nl> MTPmessages_GetFeaturedStickers ( MTPint _hash ) : MTPBoxed < MTPmessages_getFeaturedStickers > ( MTPmessages_getFeaturedStickers ( _hash ) ) { <nl> } <nl> } ; <nl> class MTPmessages_readFeaturedStickers { / / RPC method ' messages . readFeaturedSti <nl> public : <nl> MTPVector < MTPlong > vid ; <nl> <nl> - MTPmessages_readFeaturedStickers ( ) { <nl> - } <nl> - MTPmessages_readFeaturedStickers ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_readFeaturedStickers ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_readFeaturedStickers ( ) = default ; <nl> MTPmessages_readFeaturedStickers ( const MTPVector < MTPlong > & _id ) : vid ( _id ) { <nl> } <nl> <nl> class MTPmessages_readFeaturedStickers { / / RPC method ' messages . readFeaturedSti <nl> } ; <nl> class MTPmessages_ReadFeaturedStickers : public MTPBoxed < MTPmessages_readFeaturedStickers > { <nl> public : <nl> - MTPmessages_ReadFeaturedStickers ( ) { <nl> - } <nl> + MTPmessages_ReadFeaturedStickers ( ) = default ; <nl> MTPmessages_ReadFeaturedStickers ( const MTPmessages_readFeaturedStickers & v ) : MTPBoxed < MTPmessages_readFeaturedStickers > ( v ) { <nl> } <nl> - MTPmessages_ReadFeaturedStickers ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_readFeaturedStickers > ( from , end , cons ) { <nl> - } <nl> MTPmessages_ReadFeaturedStickers ( const MTPVector < MTPlong > & _id ) : MTPBoxed < MTPmessages_readFeaturedStickers > ( MTPmessages_readFeaturedStickers ( _id ) ) { <nl> } <nl> } ; <nl> class MTPmessages_getRecentStickers { / / RPC method ' messages . getRecentStickers ' <nl> MTPflags < MTPmessages_getRecentStickers : : Flags > vflags ; <nl> MTPint vhash ; <nl> <nl> - MTPmessages_getRecentStickers ( ) { <nl> - } <nl> - MTPmessages_getRecentStickers ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_getRecentStickers ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_getRecentStickers ( ) = default ; <nl> MTPmessages_getRecentStickers ( const MTPflags < MTPmessages_getRecentStickers : : Flags > & _flags , MTPint _hash ) : vflags ( _flags ) , vhash ( _hash ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPmessages_getRecentStickers : : Flags ) <nl> <nl> class MTPmessages_GetRecentStickers : public MTPBoxed < MTPmessages_getRecentStickers > { <nl> public : <nl> - MTPmessages_GetRecentStickers ( ) { <nl> - } <nl> + MTPmessages_GetRecentStickers ( ) = default ; <nl> MTPmessages_GetRecentStickers ( const MTPmessages_getRecentStickers & v ) : MTPBoxed < MTPmessages_getRecentStickers > ( v ) { <nl> } <nl> - MTPmessages_GetRecentStickers ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_getRecentStickers > ( from , end , cons ) { <nl> - } <nl> MTPmessages_GetRecentStickers ( const MTPflags < MTPmessages_getRecentStickers : : Flags > & _flags , MTPint _hash ) : MTPBoxed < MTPmessages_getRecentStickers > ( MTPmessages_getRecentStickers ( _flags , _hash ) ) { <nl> } <nl> } ; <nl> class MTPmessages_saveRecentSticker { / / RPC method ' messages . saveRecentSticker ' <nl> MTPInputDocument vid ; <nl> MTPBool vunsave ; <nl> <nl> - MTPmessages_saveRecentSticker ( ) { <nl> - } <nl> - MTPmessages_saveRecentSticker ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_saveRecentSticker ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_saveRecentSticker ( ) = default ; <nl> MTPmessages_saveRecentSticker ( const MTPflags < MTPmessages_saveRecentSticker : : Flags > & _flags , const MTPInputDocument & _id , MTPBool _unsave ) : vflags ( _flags ) , vid ( _id ) , vunsave ( _unsave ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPmessages_saveRecentSticker : : Flags ) <nl> <nl> class MTPmessages_SaveRecentSticker : public MTPBoxed < MTPmessages_saveRecentSticker > { <nl> public : <nl> - MTPmessages_SaveRecentSticker ( ) { <nl> - } <nl> + MTPmessages_SaveRecentSticker ( ) = default ; <nl> MTPmessages_SaveRecentSticker ( const MTPmessages_saveRecentSticker & v ) : MTPBoxed < MTPmessages_saveRecentSticker > ( v ) { <nl> } <nl> - MTPmessages_SaveRecentSticker ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_saveRecentSticker > ( from , end , cons ) { <nl> - } <nl> MTPmessages_SaveRecentSticker ( const MTPflags < MTPmessages_saveRecentSticker : : Flags > & _flags , const MTPInputDocument & _id , MTPBool _unsave ) : MTPBoxed < MTPmessages_saveRecentSticker > ( MTPmessages_saveRecentSticker ( _flags , _id , _unsave ) ) { <nl> } <nl> } ; <nl> class MTPmessages_clearRecentStickers { / / RPC method ' messages . clearRecentStick <nl> <nl> MTPflags < MTPmessages_clearRecentStickers : : Flags > vflags ; <nl> <nl> - MTPmessages_clearRecentStickers ( ) { <nl> - } <nl> - MTPmessages_clearRecentStickers ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_clearRecentStickers ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_clearRecentStickers ( ) = default ; <nl> MTPmessages_clearRecentStickers ( const MTPflags < MTPmessages_clearRecentStickers : : Flags > & _flags ) : vflags ( _flags ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPmessages_clearRecentStickers : : Flags ) <nl> <nl> class MTPmessages_ClearRecentStickers : public MTPBoxed < MTPmessages_clearRecentStickers > { <nl> public : <nl> - MTPmessages_ClearRecentStickers ( ) { <nl> - } <nl> + MTPmessages_ClearRecentStickers ( ) = default ; <nl> MTPmessages_ClearRecentStickers ( const MTPmessages_clearRecentStickers & v ) : MTPBoxed < MTPmessages_clearRecentStickers > ( v ) { <nl> } <nl> - MTPmessages_ClearRecentStickers ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_clearRecentStickers > ( from , end , cons ) { <nl> - } <nl> MTPmessages_ClearRecentStickers ( const MTPflags < MTPmessages_clearRecentStickers : : Flags > & _flags ) : MTPBoxed < MTPmessages_clearRecentStickers > ( MTPmessages_clearRecentStickers ( _flags ) ) { <nl> } <nl> } ; <nl> class MTPmessages_getArchivedStickers { / / RPC method ' messages . getArchivedStick <nl> MTPlong voffset_id ; <nl> MTPint vlimit ; <nl> <nl> - MTPmessages_getArchivedStickers ( ) { <nl> - } <nl> - MTPmessages_getArchivedStickers ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_getArchivedStickers ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_getArchivedStickers ( ) = default ; <nl> MTPmessages_getArchivedStickers ( const MTPflags < MTPmessages_getArchivedStickers : : Flags > & _flags , const MTPlong & _offset_id , MTPint _limit ) : vflags ( _flags ) , voffset_id ( _offset_id ) , vlimit ( _limit ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPmessages_getArchivedStickers : : Flags ) <nl> <nl> class MTPmessages_GetArchivedStickers : public MTPBoxed < MTPmessages_getArchivedStickers > { <nl> public : <nl> - MTPmessages_GetArchivedStickers ( ) { <nl> - } <nl> + MTPmessages_GetArchivedStickers ( ) = default ; <nl> MTPmessages_GetArchivedStickers ( const MTPmessages_getArchivedStickers & v ) : MTPBoxed < MTPmessages_getArchivedStickers > ( v ) { <nl> } <nl> - MTPmessages_GetArchivedStickers ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_getArchivedStickers > ( from , end , cons ) { <nl> - } <nl> MTPmessages_GetArchivedStickers ( const MTPflags < MTPmessages_getArchivedStickers : : Flags > & _flags , const MTPlong & _offset_id , MTPint _limit ) : MTPBoxed < MTPmessages_getArchivedStickers > ( MTPmessages_getArchivedStickers ( _flags , _offset_id , _limit ) ) { <nl> } <nl> } ; <nl> class MTPmessages_getMaskStickers { / / RPC method ' messages . getMaskStickers ' <nl> public : <nl> MTPint vhash ; <nl> <nl> - MTPmessages_getMaskStickers ( ) { <nl> - } <nl> - MTPmessages_getMaskStickers ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_getMaskStickers ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_getMaskStickers ( ) = default ; <nl> MTPmessages_getMaskStickers ( MTPint _hash ) : vhash ( _hash ) { <nl> } <nl> <nl> class MTPmessages_getMaskStickers { / / RPC method ' messages . getMaskStickers ' <nl> } ; <nl> class MTPmessages_GetMaskStickers : public MTPBoxed < MTPmessages_getMaskStickers > { <nl> public : <nl> - MTPmessages_GetMaskStickers ( ) { <nl> - } <nl> + MTPmessages_GetMaskStickers ( ) = default ; <nl> MTPmessages_GetMaskStickers ( const MTPmessages_getMaskStickers & v ) : MTPBoxed < MTPmessages_getMaskStickers > ( v ) { <nl> } <nl> - MTPmessages_GetMaskStickers ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_getMaskStickers > ( from , end , cons ) { <nl> - } <nl> MTPmessages_GetMaskStickers ( MTPint _hash ) : MTPBoxed < MTPmessages_getMaskStickers > ( MTPmessages_getMaskStickers ( _hash ) ) { <nl> } <nl> } ; <nl> class MTPmessages_getAttachedStickers { / / RPC method ' messages . getAttachedStick <nl> public : <nl> MTPInputStickeredMedia vmedia ; <nl> <nl> - MTPmessages_getAttachedStickers ( ) { <nl> - } <nl> - MTPmessages_getAttachedStickers ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_getAttachedStickers ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_getAttachedStickers ( ) = default ; <nl> MTPmessages_getAttachedStickers ( const MTPInputStickeredMedia & _media ) : vmedia ( _media ) { <nl> } <nl> <nl> class MTPmessages_getAttachedStickers { / / RPC method ' messages . getAttachedStick <nl> } ; <nl> class MTPmessages_GetAttachedStickers : public MTPBoxed < MTPmessages_getAttachedStickers > { <nl> public : <nl> - MTPmessages_GetAttachedStickers ( ) { <nl> - } <nl> + MTPmessages_GetAttachedStickers ( ) = default ; <nl> MTPmessages_GetAttachedStickers ( const MTPmessages_getAttachedStickers & v ) : MTPBoxed < MTPmessages_getAttachedStickers > ( v ) { <nl> } <nl> - MTPmessages_GetAttachedStickers ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_getAttachedStickers > ( from , end , cons ) { <nl> - } <nl> MTPmessages_GetAttachedStickers ( const MTPInputStickeredMedia & _media ) : MTPBoxed < MTPmessages_getAttachedStickers > ( MTPmessages_getAttachedStickers ( _media ) ) { <nl> } <nl> } ; <nl> class MTPmessages_setGameScore { / / RPC method ' messages . setGameScore ' <nl> MTPInputUser vuser_id ; <nl> MTPint vscore ; <nl> <nl> - MTPmessages_setGameScore ( ) { <nl> - } <nl> - MTPmessages_setGameScore ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_setGameScore ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_setGameScore ( ) = default ; <nl> MTPmessages_setGameScore ( const MTPflags < MTPmessages_setGameScore : : Flags > & _flags , const MTPInputPeer & _peer , MTPint _id , const MTPInputUser & _user_id , MTPint _score ) : vflags ( _flags ) , vpeer ( _peer ) , vid ( _id ) , vuser_id ( _user_id ) , vscore ( _score ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPmessages_setGameScore : : Flags ) <nl> <nl> class MTPmessages_SetGameScore : public MTPBoxed < MTPmessages_setGameScore > { <nl> public : <nl> - MTPmessages_SetGameScore ( ) { <nl> - } <nl> + MTPmessages_SetGameScore ( ) = default ; <nl> MTPmessages_SetGameScore ( const MTPmessages_setGameScore & v ) : MTPBoxed < MTPmessages_setGameScore > ( v ) { <nl> } <nl> - MTPmessages_SetGameScore ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_setGameScore > ( from , end , cons ) { <nl> - } <nl> MTPmessages_SetGameScore ( const MTPflags < MTPmessages_setGameScore : : Flags > & _flags , const MTPInputPeer & _peer , MTPint _id , const MTPInputUser & _user_id , MTPint _score ) : MTPBoxed < MTPmessages_setGameScore > ( MTPmessages_setGameScore ( _flags , _peer , _id , _user_id , _score ) ) { <nl> } <nl> } ; <nl> class MTPmessages_setInlineGameScore { / / RPC method ' messages . setInlineGameScor <nl> MTPInputUser vuser_id ; <nl> MTPint vscore ; <nl> <nl> - MTPmessages_setInlineGameScore ( ) { <nl> - } <nl> - MTPmessages_setInlineGameScore ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_setInlineGameScore ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_setInlineGameScore ( ) = default ; <nl> MTPmessages_setInlineGameScore ( const MTPflags < MTPmessages_setInlineGameScore : : Flags > & _flags , const MTPInputBotInlineMessageID & _id , const MTPInputUser & _user_id , MTPint _score ) : vflags ( _flags ) , vid ( _id ) , vuser_id ( _user_id ) , vscore ( _score ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPmessages_setInlineGameScore : : Flags ) <nl> <nl> class MTPmessages_SetInlineGameScore : public MTPBoxed < MTPmessages_setInlineGameScore > { <nl> public : <nl> - MTPmessages_SetInlineGameScore ( ) { <nl> - } <nl> + MTPmessages_SetInlineGameScore ( ) = default ; <nl> MTPmessages_SetInlineGameScore ( const MTPmessages_setInlineGameScore & v ) : MTPBoxed < MTPmessages_setInlineGameScore > ( v ) { <nl> } <nl> - MTPmessages_SetInlineGameScore ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_setInlineGameScore > ( from , end , cons ) { <nl> - } <nl> MTPmessages_SetInlineGameScore ( const MTPflags < MTPmessages_setInlineGameScore : : Flags > & _flags , const MTPInputBotInlineMessageID & _id , const MTPInputUser & _user_id , MTPint _score ) : MTPBoxed < MTPmessages_setInlineGameScore > ( MTPmessages_setInlineGameScore ( _flags , _id , _user_id , _score ) ) { <nl> } <nl> } ; <nl> class MTPmessages_getGameHighScores { / / RPC method ' messages . getGameHighScores ' <nl> MTPint vid ; <nl> MTPInputUser vuser_id ; <nl> <nl> - MTPmessages_getGameHighScores ( ) { <nl> - } <nl> - MTPmessages_getGameHighScores ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_getGameHighScores ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_getGameHighScores ( ) = default ; <nl> MTPmessages_getGameHighScores ( const MTPInputPeer & _peer , MTPint _id , const MTPInputUser & _user_id ) : vpeer ( _peer ) , vid ( _id ) , vuser_id ( _user_id ) { <nl> } <nl> <nl> class MTPmessages_getGameHighScores { / / RPC method ' messages . getGameHighScores ' <nl> } ; <nl> class MTPmessages_GetGameHighScores : public MTPBoxed < MTPmessages_getGameHighScores > { <nl> public : <nl> - MTPmessages_GetGameHighScores ( ) { <nl> - } <nl> + MTPmessages_GetGameHighScores ( ) = default ; <nl> MTPmessages_GetGameHighScores ( const MTPmessages_getGameHighScores & v ) : MTPBoxed < MTPmessages_getGameHighScores > ( v ) { <nl> } <nl> - MTPmessages_GetGameHighScores ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_getGameHighScores > ( from , end , cons ) { <nl> - } <nl> MTPmessages_GetGameHighScores ( const MTPInputPeer & _peer , MTPint _id , const MTPInputUser & _user_id ) : MTPBoxed < MTPmessages_getGameHighScores > ( MTPmessages_getGameHighScores ( _peer , _id , _user_id ) ) { <nl> } <nl> } ; <nl> class MTPmessages_getInlineGameHighScores { / / RPC method ' messages . getInlineGam <nl> MTPInputBotInlineMessageID vid ; <nl> MTPInputUser vuser_id ; <nl> <nl> - MTPmessages_getInlineGameHighScores ( ) { <nl> - } <nl> - MTPmessages_getInlineGameHighScores ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_getInlineGameHighScores ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_getInlineGameHighScores ( ) = default ; <nl> MTPmessages_getInlineGameHighScores ( const MTPInputBotInlineMessageID & _id , const MTPInputUser & _user_id ) : vid ( _id ) , vuser_id ( _user_id ) { <nl> } <nl> <nl> class MTPmessages_getInlineGameHighScores { / / RPC method ' messages . getInlineGam <nl> } ; <nl> class MTPmessages_GetInlineGameHighScores : public MTPBoxed < MTPmessages_getInlineGameHighScores > { <nl> public : <nl> - MTPmessages_GetInlineGameHighScores ( ) { <nl> - } <nl> + MTPmessages_GetInlineGameHighScores ( ) = default ; <nl> MTPmessages_GetInlineGameHighScores ( const MTPmessages_getInlineGameHighScores & v ) : MTPBoxed < MTPmessages_getInlineGameHighScores > ( v ) { <nl> } <nl> - MTPmessages_GetInlineGameHighScores ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_getInlineGameHighScores > ( from , end , cons ) { <nl> - } <nl> MTPmessages_GetInlineGameHighScores ( const MTPInputBotInlineMessageID & _id , const MTPInputUser & _user_id ) : MTPBoxed < MTPmessages_getInlineGameHighScores > ( MTPmessages_getInlineGameHighScores ( _id , _user_id ) ) { <nl> } <nl> } ; <nl> class MTPmessages_getCommonChats { / / RPC method ' messages . getCommonChats ' <nl> MTPint vmax_id ; <nl> MTPint vlimit ; <nl> <nl> - MTPmessages_getCommonChats ( ) { <nl> - } <nl> - MTPmessages_getCommonChats ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_getCommonChats ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_getCommonChats ( ) = default ; <nl> MTPmessages_getCommonChats ( const MTPInputUser & _user_id , MTPint _max_id , MTPint _limit ) : vuser_id ( _user_id ) , vmax_id ( _max_id ) , vlimit ( _limit ) { <nl> } <nl> <nl> class MTPmessages_getCommonChats { / / RPC method ' messages . getCommonChats ' <nl> } ; <nl> class MTPmessages_GetCommonChats : public MTPBoxed < MTPmessages_getCommonChats > { <nl> public : <nl> - MTPmessages_GetCommonChats ( ) { <nl> - } <nl> + MTPmessages_GetCommonChats ( ) = default ; <nl> MTPmessages_GetCommonChats ( const MTPmessages_getCommonChats & v ) : MTPBoxed < MTPmessages_getCommonChats > ( v ) { <nl> } <nl> - MTPmessages_GetCommonChats ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_getCommonChats > ( from , end , cons ) { <nl> - } <nl> MTPmessages_GetCommonChats ( const MTPInputUser & _user_id , MTPint _max_id , MTPint _limit ) : MTPBoxed < MTPmessages_getCommonChats > ( MTPmessages_getCommonChats ( _user_id , _max_id , _limit ) ) { <nl> } <nl> } ; <nl> class MTPmessages_getAllChats { / / RPC method ' messages . getAllChats ' <nl> public : <nl> MTPVector < MTPint > vexcept_ids ; <nl> <nl> - MTPmessages_getAllChats ( ) { <nl> - } <nl> - MTPmessages_getAllChats ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_getAllChats ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_getAllChats ( ) = default ; <nl> MTPmessages_getAllChats ( const MTPVector < MTPint > & _except_ids ) : vexcept_ids ( _except_ids ) { <nl> } <nl> <nl> class MTPmessages_getAllChats { / / RPC method ' messages . getAllChats ' <nl> } ; <nl> class MTPmessages_GetAllChats : public MTPBoxed < MTPmessages_getAllChats > { <nl> public : <nl> - MTPmessages_GetAllChats ( ) { <nl> - } <nl> + MTPmessages_GetAllChats ( ) = default ; <nl> MTPmessages_GetAllChats ( const MTPmessages_getAllChats & v ) : MTPBoxed < MTPmessages_getAllChats > ( v ) { <nl> } <nl> - MTPmessages_GetAllChats ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_getAllChats > ( from , end , cons ) { <nl> - } <nl> MTPmessages_GetAllChats ( const MTPVector < MTPint > & _except_ids ) : MTPBoxed < MTPmessages_getAllChats > ( MTPmessages_getAllChats ( _except_ids ) ) { <nl> } <nl> } ; <nl> class MTPmessages_getWebPage { / / RPC method ' messages . getWebPage ' <nl> MTPstring vurl ; <nl> MTPint vhash ; <nl> <nl> - MTPmessages_getWebPage ( ) { <nl> - } <nl> - MTPmessages_getWebPage ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_getWebPage ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_getWebPage ( ) = default ; <nl> MTPmessages_getWebPage ( const MTPstring & _url , MTPint _hash ) : vurl ( _url ) , vhash ( _hash ) { <nl> } <nl> <nl> class MTPmessages_getWebPage { / / RPC method ' messages . getWebPage ' <nl> } ; <nl> class MTPmessages_GetWebPage : public MTPBoxed < MTPmessages_getWebPage > { <nl> public : <nl> - MTPmessages_GetWebPage ( ) { <nl> - } <nl> + MTPmessages_GetWebPage ( ) = default ; <nl> MTPmessages_GetWebPage ( const MTPmessages_getWebPage & v ) : MTPBoxed < MTPmessages_getWebPage > ( v ) { <nl> } <nl> - MTPmessages_GetWebPage ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_getWebPage > ( from , end , cons ) { <nl> - } <nl> MTPmessages_GetWebPage ( const MTPstring & _url , MTPint _hash ) : MTPBoxed < MTPmessages_getWebPage > ( MTPmessages_getWebPage ( _url , _hash ) ) { <nl> } <nl> } ; <nl> class MTPmessages_toggleDialogPin { / / RPC method ' messages . toggleDialogPin ' <nl> MTPflags < MTPmessages_toggleDialogPin : : Flags > vflags ; <nl> MTPInputPeer vpeer ; <nl> <nl> - MTPmessages_toggleDialogPin ( ) { <nl> - } <nl> - MTPmessages_toggleDialogPin ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_toggleDialogPin ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_toggleDialogPin ( ) = default ; <nl> MTPmessages_toggleDialogPin ( const MTPflags < MTPmessages_toggleDialogPin : : Flags > & _flags , const MTPInputPeer & _peer ) : vflags ( _flags ) , vpeer ( _peer ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPmessages_toggleDialogPin : : Flags ) <nl> <nl> class MTPmessages_ToggleDialogPin : public MTPBoxed < MTPmessages_toggleDialogPin > { <nl> public : <nl> - MTPmessages_ToggleDialogPin ( ) { <nl> - } <nl> + MTPmessages_ToggleDialogPin ( ) = default ; <nl> MTPmessages_ToggleDialogPin ( const MTPmessages_toggleDialogPin & v ) : MTPBoxed < MTPmessages_toggleDialogPin > ( v ) { <nl> } <nl> - MTPmessages_ToggleDialogPin ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_toggleDialogPin > ( from , end , cons ) { <nl> - } <nl> MTPmessages_ToggleDialogPin ( const MTPflags < MTPmessages_toggleDialogPin : : Flags > & _flags , const MTPInputPeer & _peer ) : MTPBoxed < MTPmessages_toggleDialogPin > ( MTPmessages_toggleDialogPin ( _flags , _peer ) ) { <nl> } <nl> } ; <nl> class MTPmessages_reorderPinnedDialogs { / / RPC method ' messages . reorderPinnedDi <nl> MTPflags < MTPmessages_reorderPinnedDialogs : : Flags > vflags ; <nl> MTPVector < MTPInputPeer > vorder ; <nl> <nl> - MTPmessages_reorderPinnedDialogs ( ) { <nl> - } <nl> - MTPmessages_reorderPinnedDialogs ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_reorderPinnedDialogs ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_reorderPinnedDialogs ( ) = default ; <nl> MTPmessages_reorderPinnedDialogs ( const MTPflags < MTPmessages_reorderPinnedDialogs : : Flags > & _flags , const MTPVector < MTPInputPeer > & _order ) : vflags ( _flags ) , vorder ( _order ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPmessages_reorderPinnedDialogs : : Flags ) <nl> <nl> class MTPmessages_ReorderPinnedDialogs : public MTPBoxed < MTPmessages_reorderPinnedDialogs > { <nl> public : <nl> - MTPmessages_ReorderPinnedDialogs ( ) { <nl> - } <nl> + MTPmessages_ReorderPinnedDialogs ( ) = default ; <nl> MTPmessages_ReorderPinnedDialogs ( const MTPmessages_reorderPinnedDialogs & v ) : MTPBoxed < MTPmessages_reorderPinnedDialogs > ( v ) { <nl> } <nl> - MTPmessages_ReorderPinnedDialogs ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_reorderPinnedDialogs > ( from , end , cons ) { <nl> - } <nl> MTPmessages_ReorderPinnedDialogs ( const MTPflags < MTPmessages_reorderPinnedDialogs : : Flags > & _flags , const MTPVector < MTPInputPeer > & _order ) : MTPBoxed < MTPmessages_reorderPinnedDialogs > ( MTPmessages_reorderPinnedDialogs ( _flags , _order ) ) { <nl> } <nl> } ; <nl> <nl> class MTPmessages_getPinnedDialogs { / / RPC method ' messages . getPinnedDialogs ' <nl> public : <nl> - MTPmessages_getPinnedDialogs ( ) { <nl> - } <nl> - MTPmessages_getPinnedDialogs ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_messages_getPinnedDialogs ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPmessages_getPinnedDialogs ( ) = default ; <nl> <nl> uint32 innerLength ( ) const { <nl> return 0 ; <nl> class MTPmessages_getPinnedDialogs { / / RPC method ' messages . getPinnedDialogs ' <nl> } ; <nl> class MTPmessages_GetPinnedDialogs : public MTPBoxed < MTPmessages_getPinnedDialogs > { <nl> public : <nl> - MTPmessages_GetPinnedDialogs ( ) { <nl> - } <nl> + MTPmessages_GetPinnedDialogs ( ) = default ; <nl> MTPmessages_GetPinnedDialogs ( const MTPmessages_getPinnedDialogs & v ) : MTPBoxed < MTPmessages_getPinnedDialogs > ( v ) { <nl> } <nl> - MTPmessages_GetPinnedDialogs ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPmessages_getPinnedDialogs > ( from , end , cons ) { <nl> - } <nl> } ; <nl> <nl> class MTPupdates_getState { / / RPC method ' updates . getState ' <nl> public : <nl> - MTPupdates_getState ( ) { <nl> - } <nl> - MTPupdates_getState ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_updates_getState ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPupdates_getState ( ) = default ; <nl> <nl> uint32 innerLength ( ) const { <nl> return 0 ; <nl> class MTPupdates_getState { / / RPC method ' updates . getState ' <nl> } ; <nl> class MTPupdates_GetState : public MTPBoxed < MTPupdates_getState > { <nl> public : <nl> - MTPupdates_GetState ( ) { <nl> - } <nl> + MTPupdates_GetState ( ) = default ; <nl> MTPupdates_GetState ( const MTPupdates_getState & v ) : MTPBoxed < MTPupdates_getState > ( v ) { <nl> } <nl> - MTPupdates_GetState ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPupdates_getState > ( from , end , cons ) { <nl> - } <nl> } ; <nl> <nl> class MTPupdates_getDifference { / / RPC method ' updates . getDifference ' <nl> class MTPupdates_getDifference { / / RPC method ' updates . getDifference ' <nl> MTPint vdate ; <nl> MTPint vqts ; <nl> <nl> - MTPupdates_getDifference ( ) { <nl> - } <nl> - MTPupdates_getDifference ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_updates_getDifference ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPupdates_getDifference ( ) = default ; <nl> MTPupdates_getDifference ( const MTPflags < MTPupdates_getDifference : : Flags > & _flags , MTPint _pts , MTPint _pts_total_limit , MTPint _date , MTPint _qts ) : vflags ( _flags ) , vpts ( _pts ) , vpts_total_limit ( _pts_total_limit ) , vdate ( _date ) , vqts ( _qts ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPupdates_getDifference : : Flags ) <nl> <nl> class MTPupdates_GetDifference : public MTPBoxed < MTPupdates_getDifference > { <nl> public : <nl> - MTPupdates_GetDifference ( ) { <nl> - } <nl> + MTPupdates_GetDifference ( ) = default ; <nl> MTPupdates_GetDifference ( const MTPupdates_getDifference & v ) : MTPBoxed < MTPupdates_getDifference > ( v ) { <nl> } <nl> - MTPupdates_GetDifference ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPupdates_getDifference > ( from , end , cons ) { <nl> - } <nl> MTPupdates_GetDifference ( const MTPflags < MTPupdates_getDifference : : Flags > & _flags , MTPint _pts , MTPint _pts_total_limit , MTPint _date , MTPint _qts ) : MTPBoxed < MTPupdates_getDifference > ( MTPupdates_getDifference ( _flags , _pts , _pts_total_limit , _date , _qts ) ) { <nl> } <nl> } ; <nl> class MTPupdates_getChannelDifference { / / RPC method ' updates . getChannelDiffere <nl> MTPint vpts ; <nl> MTPint vlimit ; <nl> <nl> - MTPupdates_getChannelDifference ( ) { <nl> - } <nl> - MTPupdates_getChannelDifference ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_updates_getChannelDifference ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPupdates_getChannelDifference ( ) = default ; <nl> MTPupdates_getChannelDifference ( const MTPflags < MTPupdates_getChannelDifference : : Flags > & _flags , const MTPInputChannel & _channel , const MTPChannelMessagesFilter & _filter , MTPint _pts , MTPint _limit ) : vflags ( _flags ) , vchannel ( _channel ) , vfilter ( _filter ) , vpts ( _pts ) , vlimit ( _limit ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPupdates_getChannelDifference : : Flags ) <nl> <nl> class MTPupdates_GetChannelDifference : public MTPBoxed < MTPupdates_getChannelDifference > { <nl> public : <nl> - MTPupdates_GetChannelDifference ( ) { <nl> - } <nl> + MTPupdates_GetChannelDifference ( ) = default ; <nl> MTPupdates_GetChannelDifference ( const MTPupdates_getChannelDifference & v ) : MTPBoxed < MTPupdates_getChannelDifference > ( v ) { <nl> } <nl> - MTPupdates_GetChannelDifference ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPupdates_getChannelDifference > ( from , end , cons ) { <nl> - } <nl> MTPupdates_GetChannelDifference ( const MTPflags < MTPupdates_getChannelDifference : : Flags > & _flags , const MTPInputChannel & _channel , const MTPChannelMessagesFilter & _filter , MTPint _pts , MTPint _limit ) : MTPBoxed < MTPupdates_getChannelDifference > ( MTPupdates_getChannelDifference ( _flags , _channel , _filter , _pts , _limit ) ) { <nl> } <nl> } ; <nl> class MTPphotos_updateProfilePhoto { / / RPC method ' photos . updateProfilePhoto ' <nl> public : <nl> MTPInputPhoto vid ; <nl> <nl> - MTPphotos_updateProfilePhoto ( ) { <nl> - } <nl> - MTPphotos_updateProfilePhoto ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_photos_updateProfilePhoto ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPphotos_updateProfilePhoto ( ) = default ; <nl> MTPphotos_updateProfilePhoto ( const MTPInputPhoto & _id ) : vid ( _id ) { <nl> } <nl> <nl> class MTPphotos_updateProfilePhoto { / / RPC method ' photos . updateProfilePhoto ' <nl> } ; <nl> class MTPphotos_UpdateProfilePhoto : public MTPBoxed < MTPphotos_updateProfilePhoto > { <nl> public : <nl> - MTPphotos_UpdateProfilePhoto ( ) { <nl> - } <nl> + MTPphotos_UpdateProfilePhoto ( ) = default ; <nl> MTPphotos_UpdateProfilePhoto ( const MTPphotos_updateProfilePhoto & v ) : MTPBoxed < MTPphotos_updateProfilePhoto > ( v ) { <nl> } <nl> - MTPphotos_UpdateProfilePhoto ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPphotos_updateProfilePhoto > ( from , end , cons ) { <nl> - } <nl> MTPphotos_UpdateProfilePhoto ( const MTPInputPhoto & _id ) : MTPBoxed < MTPphotos_updateProfilePhoto > ( MTPphotos_updateProfilePhoto ( _id ) ) { <nl> } <nl> } ; <nl> class MTPphotos_uploadProfilePhoto { / / RPC method ' photos . uploadProfilePhoto ' <nl> public : <nl> MTPInputFile vfile ; <nl> <nl> - MTPphotos_uploadProfilePhoto ( ) { <nl> - } <nl> - MTPphotos_uploadProfilePhoto ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_photos_uploadProfilePhoto ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPphotos_uploadProfilePhoto ( ) = default ; <nl> MTPphotos_uploadProfilePhoto ( const MTPInputFile & _file ) : vfile ( _file ) { <nl> } <nl> <nl> class MTPphotos_uploadProfilePhoto { / / RPC method ' photos . uploadProfilePhoto ' <nl> } ; <nl> class MTPphotos_UploadProfilePhoto : public MTPBoxed < MTPphotos_uploadProfilePhoto > { <nl> public : <nl> - MTPphotos_UploadProfilePhoto ( ) { <nl> - } <nl> + MTPphotos_UploadProfilePhoto ( ) = default ; <nl> MTPphotos_UploadProfilePhoto ( const MTPphotos_uploadProfilePhoto & v ) : MTPBoxed < MTPphotos_uploadProfilePhoto > ( v ) { <nl> } <nl> - MTPphotos_UploadProfilePhoto ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPphotos_uploadProfilePhoto > ( from , end , cons ) { <nl> - } <nl> MTPphotos_UploadProfilePhoto ( const MTPInputFile & _file ) : MTPBoxed < MTPphotos_uploadProfilePhoto > ( MTPphotos_uploadProfilePhoto ( _file ) ) { <nl> } <nl> } ; <nl> class MTPphotos_deletePhotos { / / RPC method ' photos . deletePhotos ' <nl> public : <nl> MTPVector < MTPInputPhoto > vid ; <nl> <nl> - MTPphotos_deletePhotos ( ) { <nl> - } <nl> - MTPphotos_deletePhotos ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_photos_deletePhotos ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPphotos_deletePhotos ( ) = default ; <nl> MTPphotos_deletePhotos ( const MTPVector < MTPInputPhoto > & _id ) : vid ( _id ) { <nl> } <nl> <nl> class MTPphotos_deletePhotos { / / RPC method ' photos . deletePhotos ' <nl> } ; <nl> class MTPphotos_DeletePhotos : public MTPBoxed < MTPphotos_deletePhotos > { <nl> public : <nl> - MTPphotos_DeletePhotos ( ) { <nl> - } <nl> + MTPphotos_DeletePhotos ( ) = default ; <nl> MTPphotos_DeletePhotos ( const MTPphotos_deletePhotos & v ) : MTPBoxed < MTPphotos_deletePhotos > ( v ) { <nl> } <nl> - MTPphotos_DeletePhotos ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPphotos_deletePhotos > ( from , end , cons ) { <nl> - } <nl> MTPphotos_DeletePhotos ( const MTPVector < MTPInputPhoto > & _id ) : MTPBoxed < MTPphotos_deletePhotos > ( MTPphotos_deletePhotos ( _id ) ) { <nl> } <nl> } ; <nl> class MTPphotos_getUserPhotos { / / RPC method ' photos . getUserPhotos ' <nl> MTPlong vmax_id ; <nl> MTPint vlimit ; <nl> <nl> - MTPphotos_getUserPhotos ( ) { <nl> - } <nl> - MTPphotos_getUserPhotos ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_photos_getUserPhotos ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPphotos_getUserPhotos ( ) = default ; <nl> MTPphotos_getUserPhotos ( const MTPInputUser & _user_id , MTPint _offset , const MTPlong & _max_id , MTPint _limit ) : vuser_id ( _user_id ) , voffset ( _offset ) , vmax_id ( _max_id ) , vlimit ( _limit ) { <nl> } <nl> <nl> class MTPphotos_getUserPhotos { / / RPC method ' photos . getUserPhotos ' <nl> } ; <nl> class MTPphotos_GetUserPhotos : public MTPBoxed < MTPphotos_getUserPhotos > { <nl> public : <nl> - MTPphotos_GetUserPhotos ( ) { <nl> - } <nl> + MTPphotos_GetUserPhotos ( ) = default ; <nl> MTPphotos_GetUserPhotos ( const MTPphotos_getUserPhotos & v ) : MTPBoxed < MTPphotos_getUserPhotos > ( v ) { <nl> } <nl> - MTPphotos_GetUserPhotos ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPphotos_getUserPhotos > ( from , end , cons ) { <nl> - } <nl> MTPphotos_GetUserPhotos ( const MTPInputUser & _user_id , MTPint _offset , const MTPlong & _max_id , MTPint _limit ) : MTPBoxed < MTPphotos_getUserPhotos > ( MTPphotos_getUserPhotos ( _user_id , _offset , _max_id , _limit ) ) { <nl> } <nl> } ; <nl> class MTPupload_saveFilePart { / / RPC method ' upload . saveFilePart ' <nl> MTPint vfile_part ; <nl> MTPbytes vbytes ; <nl> <nl> - MTPupload_saveFilePart ( ) { <nl> - } <nl> - MTPupload_saveFilePart ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_upload_saveFilePart ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPupload_saveFilePart ( ) = default ; <nl> MTPupload_saveFilePart ( const MTPlong & _file_id , MTPint _file_part , const MTPbytes & _bytes ) : vfile_id ( _file_id ) , vfile_part ( _file_part ) , vbytes ( _bytes ) { <nl> } <nl> <nl> class MTPupload_saveFilePart { / / RPC method ' upload . saveFilePart ' <nl> } ; <nl> class MTPupload_SaveFilePart : public MTPBoxed < MTPupload_saveFilePart > { <nl> public : <nl> - MTPupload_SaveFilePart ( ) { <nl> - } <nl> + MTPupload_SaveFilePart ( ) = default ; <nl> MTPupload_SaveFilePart ( const MTPupload_saveFilePart & v ) : MTPBoxed < MTPupload_saveFilePart > ( v ) { <nl> } <nl> - MTPupload_SaveFilePart ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPupload_saveFilePart > ( from , end , cons ) { <nl> - } <nl> MTPupload_SaveFilePart ( const MTPlong & _file_id , MTPint _file_part , const MTPbytes & _bytes ) : MTPBoxed < MTPupload_saveFilePart > ( MTPupload_saveFilePart ( _file_id , _file_part , _bytes ) ) { <nl> } <nl> } ; <nl> class MTPupload_getFile { / / RPC method ' upload . getFile ' <nl> MTPint voffset ; <nl> MTPint vlimit ; <nl> <nl> - MTPupload_getFile ( ) { <nl> - } <nl> - MTPupload_getFile ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_upload_getFile ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPupload_getFile ( ) = default ; <nl> MTPupload_getFile ( const MTPInputFileLocation & _location , MTPint _offset , MTPint _limit ) : vlocation ( _location ) , voffset ( _offset ) , vlimit ( _limit ) { <nl> } <nl> <nl> class MTPupload_getFile { / / RPC method ' upload . getFile ' <nl> } ; <nl> class MTPupload_GetFile : public MTPBoxed < MTPupload_getFile > { <nl> public : <nl> - MTPupload_GetFile ( ) { <nl> - } <nl> + MTPupload_GetFile ( ) = default ; <nl> MTPupload_GetFile ( const MTPupload_getFile & v ) : MTPBoxed < MTPupload_getFile > ( v ) { <nl> } <nl> - MTPupload_GetFile ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPupload_getFile > ( from , end , cons ) { <nl> - } <nl> MTPupload_GetFile ( const MTPInputFileLocation & _location , MTPint _offset , MTPint _limit ) : MTPBoxed < MTPupload_getFile > ( MTPupload_getFile ( _location , _offset , _limit ) ) { <nl> } <nl> } ; <nl> class MTPupload_saveBigFilePart { / / RPC method ' upload . saveBigFilePart ' <nl> MTPint vfile_total_parts ; <nl> MTPbytes vbytes ; <nl> <nl> - MTPupload_saveBigFilePart ( ) { <nl> - } <nl> - MTPupload_saveBigFilePart ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_upload_saveBigFilePart ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPupload_saveBigFilePart ( ) = default ; <nl> MTPupload_saveBigFilePart ( const MTPlong & _file_id , MTPint _file_part , MTPint _file_total_parts , const MTPbytes & _bytes ) : vfile_id ( _file_id ) , vfile_part ( _file_part ) , vfile_total_parts ( _file_total_parts ) , vbytes ( _bytes ) { <nl> } <nl> <nl> class MTPupload_saveBigFilePart { / / RPC method ' upload . saveBigFilePart ' <nl> } ; <nl> class MTPupload_SaveBigFilePart : public MTPBoxed < MTPupload_saveBigFilePart > { <nl> public : <nl> - MTPupload_SaveBigFilePart ( ) { <nl> - } <nl> + MTPupload_SaveBigFilePart ( ) = default ; <nl> MTPupload_SaveBigFilePart ( const MTPupload_saveBigFilePart & v ) : MTPBoxed < MTPupload_saveBigFilePart > ( v ) { <nl> } <nl> - MTPupload_SaveBigFilePart ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPupload_saveBigFilePart > ( from , end , cons ) { <nl> - } <nl> MTPupload_SaveBigFilePart ( const MTPlong & _file_id , MTPint _file_part , MTPint _file_total_parts , const MTPbytes & _bytes ) : MTPBoxed < MTPupload_saveBigFilePart > ( MTPupload_saveBigFilePart ( _file_id , _file_part , _file_total_parts , _bytes ) ) { <nl> } <nl> } ; <nl> <nl> class MTPhelp_getConfig { / / RPC method ' help . getConfig ' <nl> public : <nl> - MTPhelp_getConfig ( ) { <nl> - } <nl> - MTPhelp_getConfig ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_help_getConfig ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPhelp_getConfig ( ) = default ; <nl> <nl> uint32 innerLength ( ) const { <nl> return 0 ; <nl> class MTPhelp_getConfig { / / RPC method ' help . getConfig ' <nl> } ; <nl> class MTPhelp_GetConfig : public MTPBoxed < MTPhelp_getConfig > { <nl> public : <nl> - MTPhelp_GetConfig ( ) { <nl> - } <nl> + MTPhelp_GetConfig ( ) = default ; <nl> MTPhelp_GetConfig ( const MTPhelp_getConfig & v ) : MTPBoxed < MTPhelp_getConfig > ( v ) { <nl> } <nl> - MTPhelp_GetConfig ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPhelp_getConfig > ( from , end , cons ) { <nl> - } <nl> } ; <nl> <nl> class MTPhelp_getNearestDc { / / RPC method ' help . getNearestDc ' <nl> public : <nl> - MTPhelp_getNearestDc ( ) { <nl> - } <nl> - MTPhelp_getNearestDc ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_help_getNearestDc ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPhelp_getNearestDc ( ) = default ; <nl> <nl> uint32 innerLength ( ) const { <nl> return 0 ; <nl> class MTPhelp_getNearestDc { / / RPC method ' help . getNearestDc ' <nl> } ; <nl> class MTPhelp_GetNearestDc : public MTPBoxed < MTPhelp_getNearestDc > { <nl> public : <nl> - MTPhelp_GetNearestDc ( ) { <nl> - } <nl> + MTPhelp_GetNearestDc ( ) = default ; <nl> MTPhelp_GetNearestDc ( const MTPhelp_getNearestDc & v ) : MTPBoxed < MTPhelp_getNearestDc > ( v ) { <nl> } <nl> - MTPhelp_GetNearestDc ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPhelp_getNearestDc > ( from , end , cons ) { <nl> - } <nl> } ; <nl> <nl> class MTPhelp_getAppUpdate { / / RPC method ' help . getAppUpdate ' <nl> public : <nl> - MTPhelp_getAppUpdate ( ) { <nl> - } <nl> - MTPhelp_getAppUpdate ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_help_getAppUpdate ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPhelp_getAppUpdate ( ) = default ; <nl> <nl> uint32 innerLength ( ) const { <nl> return 0 ; <nl> class MTPhelp_getAppUpdate { / / RPC method ' help . getAppUpdate ' <nl> } ; <nl> class MTPhelp_GetAppUpdate : public MTPBoxed < MTPhelp_getAppUpdate > { <nl> public : <nl> - MTPhelp_GetAppUpdate ( ) { <nl> - } <nl> + MTPhelp_GetAppUpdate ( ) = default ; <nl> MTPhelp_GetAppUpdate ( const MTPhelp_getAppUpdate & v ) : MTPBoxed < MTPhelp_getAppUpdate > ( v ) { <nl> } <nl> - MTPhelp_GetAppUpdate ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPhelp_getAppUpdate > ( from , end , cons ) { <nl> - } <nl> } ; <nl> <nl> class MTPhelp_saveAppLog { / / RPC method ' help . saveAppLog ' <nl> public : <nl> MTPVector < MTPInputAppEvent > vevents ; <nl> <nl> - MTPhelp_saveAppLog ( ) { <nl> - } <nl> - MTPhelp_saveAppLog ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_help_saveAppLog ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPhelp_saveAppLog ( ) = default ; <nl> MTPhelp_saveAppLog ( const MTPVector < MTPInputAppEvent > & _events ) : vevents ( _events ) { <nl> } <nl> <nl> class MTPhelp_saveAppLog { / / RPC method ' help . saveAppLog ' <nl> } ; <nl> class MTPhelp_SaveAppLog : public MTPBoxed < MTPhelp_saveAppLog > { <nl> public : <nl> - MTPhelp_SaveAppLog ( ) { <nl> - } <nl> + MTPhelp_SaveAppLog ( ) = default ; <nl> MTPhelp_SaveAppLog ( const MTPhelp_saveAppLog & v ) : MTPBoxed < MTPhelp_saveAppLog > ( v ) { <nl> } <nl> - MTPhelp_SaveAppLog ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPhelp_saveAppLog > ( from , end , cons ) { <nl> - } <nl> MTPhelp_SaveAppLog ( const MTPVector < MTPInputAppEvent > & _events ) : MTPBoxed < MTPhelp_saveAppLog > ( MTPhelp_saveAppLog ( _events ) ) { <nl> } <nl> } ; <nl> <nl> class MTPhelp_getInviteText { / / RPC method ' help . getInviteText ' <nl> public : <nl> - MTPhelp_getInviteText ( ) { <nl> - } <nl> - MTPhelp_getInviteText ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_help_getInviteText ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPhelp_getInviteText ( ) = default ; <nl> <nl> uint32 innerLength ( ) const { <nl> return 0 ; <nl> class MTPhelp_getInviteText { / / RPC method ' help . getInviteText ' <nl> } ; <nl> class MTPhelp_GetInviteText : public MTPBoxed < MTPhelp_getInviteText > { <nl> public : <nl> - MTPhelp_GetInviteText ( ) { <nl> - } <nl> + MTPhelp_GetInviteText ( ) = default ; <nl> MTPhelp_GetInviteText ( const MTPhelp_getInviteText & v ) : MTPBoxed < MTPhelp_getInviteText > ( v ) { <nl> } <nl> - MTPhelp_GetInviteText ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPhelp_getInviteText > ( from , end , cons ) { <nl> - } <nl> } ; <nl> <nl> class MTPhelp_getSupport { / / RPC method ' help . getSupport ' <nl> public : <nl> - MTPhelp_getSupport ( ) { <nl> - } <nl> - MTPhelp_getSupport ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_help_getSupport ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPhelp_getSupport ( ) = default ; <nl> <nl> uint32 innerLength ( ) const { <nl> return 0 ; <nl> class MTPhelp_getSupport { / / RPC method ' help . getSupport ' <nl> } ; <nl> class MTPhelp_GetSupport : public MTPBoxed < MTPhelp_getSupport > { <nl> public : <nl> - MTPhelp_GetSupport ( ) { <nl> - } <nl> + MTPhelp_GetSupport ( ) = default ; <nl> MTPhelp_GetSupport ( const MTPhelp_getSupport & v ) : MTPBoxed < MTPhelp_getSupport > ( v ) { <nl> } <nl> - MTPhelp_GetSupport ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPhelp_getSupport > ( from , end , cons ) { <nl> - } <nl> } ; <nl> <nl> class MTPhelp_getAppChangelog { / / RPC method ' help . getAppChangelog ' <nl> public : <nl> - MTPhelp_getAppChangelog ( ) { <nl> - } <nl> - MTPhelp_getAppChangelog ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_help_getAppChangelog ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPhelp_getAppChangelog ( ) = default ; <nl> <nl> uint32 innerLength ( ) const { <nl> return 0 ; <nl> class MTPhelp_getAppChangelog { / / RPC method ' help . getAppChangelog ' <nl> } ; <nl> class MTPhelp_GetAppChangelog : public MTPBoxed < MTPhelp_getAppChangelog > { <nl> public : <nl> - MTPhelp_GetAppChangelog ( ) { <nl> - } <nl> + MTPhelp_GetAppChangelog ( ) = default ; <nl> MTPhelp_GetAppChangelog ( const MTPhelp_getAppChangelog & v ) : MTPBoxed < MTPhelp_getAppChangelog > ( v ) { <nl> } <nl> - MTPhelp_GetAppChangelog ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPhelp_getAppChangelog > ( from , end , cons ) { <nl> - } <nl> } ; <nl> <nl> class MTPhelp_getTermsOfService { / / RPC method ' help . getTermsOfService ' <nl> public : <nl> - MTPhelp_getTermsOfService ( ) { <nl> - } <nl> - MTPhelp_getTermsOfService ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_help_getTermsOfService ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPhelp_getTermsOfService ( ) = default ; <nl> <nl> uint32 innerLength ( ) const { <nl> return 0 ; <nl> class MTPhelp_getTermsOfService { / / RPC method ' help . getTermsOfService ' <nl> } ; <nl> class MTPhelp_GetTermsOfService : public MTPBoxed < MTPhelp_getTermsOfService > { <nl> public : <nl> - MTPhelp_GetTermsOfService ( ) { <nl> - } <nl> + MTPhelp_GetTermsOfService ( ) = default ; <nl> MTPhelp_GetTermsOfService ( const MTPhelp_getTermsOfService & v ) : MTPBoxed < MTPhelp_getTermsOfService > ( v ) { <nl> } <nl> - MTPhelp_GetTermsOfService ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPhelp_getTermsOfService > ( from , end , cons ) { <nl> - } <nl> } ; <nl> <nl> class MTPhelp_setBotUpdatesStatus { / / RPC method ' help . setBotUpdatesStatus ' <nl> class MTPhelp_setBotUpdatesStatus { / / RPC method ' help . setBotUpdatesStatus ' <nl> MTPint vpending_updates_count ; <nl> MTPstring vmessage ; <nl> <nl> - MTPhelp_setBotUpdatesStatus ( ) { <nl> - } <nl> - MTPhelp_setBotUpdatesStatus ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_help_setBotUpdatesStatus ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPhelp_setBotUpdatesStatus ( ) = default ; <nl> MTPhelp_setBotUpdatesStatus ( MTPint _pending_updates_count , const MTPstring & _message ) : vpending_updates_count ( _pending_updates_count ) , vmessage ( _message ) { <nl> } <nl> <nl> class MTPhelp_setBotUpdatesStatus { / / RPC method ' help . setBotUpdatesStatus ' <nl> } ; <nl> class MTPhelp_SetBotUpdatesStatus : public MTPBoxed < MTPhelp_setBotUpdatesStatus > { <nl> public : <nl> - MTPhelp_SetBotUpdatesStatus ( ) { <nl> - } <nl> + MTPhelp_SetBotUpdatesStatus ( ) = default ; <nl> MTPhelp_SetBotUpdatesStatus ( const MTPhelp_setBotUpdatesStatus & v ) : MTPBoxed < MTPhelp_setBotUpdatesStatus > ( v ) { <nl> } <nl> - MTPhelp_SetBotUpdatesStatus ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPhelp_setBotUpdatesStatus > ( from , end , cons ) { <nl> - } <nl> MTPhelp_SetBotUpdatesStatus ( MTPint _pending_updates_count , const MTPstring & _message ) : MTPBoxed < MTPhelp_setBotUpdatesStatus > ( MTPhelp_setBotUpdatesStatus ( _pending_updates_count , _message ) ) { <nl> } <nl> } ; <nl> class MTPchannels_readHistory { / / RPC method ' channels . readHistory ' <nl> MTPInputChannel vchannel ; <nl> MTPint vmax_id ; <nl> <nl> - MTPchannels_readHistory ( ) { <nl> - } <nl> - MTPchannels_readHistory ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_channels_readHistory ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPchannels_readHistory ( ) = default ; <nl> MTPchannels_readHistory ( const MTPInputChannel & _channel , MTPint _max_id ) : vchannel ( _channel ) , vmax_id ( _max_id ) { <nl> } <nl> <nl> class MTPchannels_readHistory { / / RPC method ' channels . readHistory ' <nl> } ; <nl> class MTPchannels_ReadHistory : public MTPBoxed < MTPchannels_readHistory > { <nl> public : <nl> - MTPchannels_ReadHistory ( ) { <nl> - } <nl> + MTPchannels_ReadHistory ( ) = default ; <nl> MTPchannels_ReadHistory ( const MTPchannels_readHistory & v ) : MTPBoxed < MTPchannels_readHistory > ( v ) { <nl> } <nl> - MTPchannels_ReadHistory ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPchannels_readHistory > ( from , end , cons ) { <nl> - } <nl> MTPchannels_ReadHistory ( const MTPInputChannel & _channel , MTPint _max_id ) : MTPBoxed < MTPchannels_readHistory > ( MTPchannels_readHistory ( _channel , _max_id ) ) { <nl> } <nl> } ; <nl> class MTPchannels_deleteMessages { / / RPC method ' channels . deleteMessages ' <nl> MTPInputChannel vchannel ; <nl> MTPVector < MTPint > vid ; <nl> <nl> - MTPchannels_deleteMessages ( ) { <nl> - } <nl> - MTPchannels_deleteMessages ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_channels_deleteMessages ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPchannels_deleteMessages ( ) = default ; <nl> MTPchannels_deleteMessages ( const MTPInputChannel & _channel , const MTPVector < MTPint > & _id ) : vchannel ( _channel ) , vid ( _id ) { <nl> } <nl> <nl> class MTPchannels_deleteMessages { / / RPC method ' channels . deleteMessages ' <nl> } ; <nl> class MTPchannels_DeleteMessages : public MTPBoxed < MTPchannels_deleteMessages > { <nl> public : <nl> - MTPchannels_DeleteMessages ( ) { <nl> - } <nl> + MTPchannels_DeleteMessages ( ) = default ; <nl> MTPchannels_DeleteMessages ( const MTPchannels_deleteMessages & v ) : MTPBoxed < MTPchannels_deleteMessages > ( v ) { <nl> } <nl> - MTPchannels_DeleteMessages ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPchannels_deleteMessages > ( from , end , cons ) { <nl> - } <nl> MTPchannels_DeleteMessages ( const MTPInputChannel & _channel , const MTPVector < MTPint > & _id ) : MTPBoxed < MTPchannels_deleteMessages > ( MTPchannels_deleteMessages ( _channel , _id ) ) { <nl> } <nl> } ; <nl> class MTPchannels_deleteUserHistory { / / RPC method ' channels . deleteUserHistory ' <nl> MTPInputChannel vchannel ; <nl> MTPInputUser vuser_id ; <nl> <nl> - MTPchannels_deleteUserHistory ( ) { <nl> - } <nl> - MTPchannels_deleteUserHistory ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_channels_deleteUserHistory ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPchannels_deleteUserHistory ( ) = default ; <nl> MTPchannels_deleteUserHistory ( const MTPInputChannel & _channel , const MTPInputUser & _user_id ) : vchannel ( _channel ) , vuser_id ( _user_id ) { <nl> } <nl> <nl> class MTPchannels_deleteUserHistory { / / RPC method ' channels . deleteUserHistory ' <nl> } ; <nl> class MTPchannels_DeleteUserHistory : public MTPBoxed < MTPchannels_deleteUserHistory > { <nl> public : <nl> - MTPchannels_DeleteUserHistory ( ) { <nl> - } <nl> + MTPchannels_DeleteUserHistory ( ) = default ; <nl> MTPchannels_DeleteUserHistory ( const MTPchannels_deleteUserHistory & v ) : MTPBoxed < MTPchannels_deleteUserHistory > ( v ) { <nl> } <nl> - MTPchannels_DeleteUserHistory ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPchannels_deleteUserHistory > ( from , end , cons ) { <nl> - } <nl> MTPchannels_DeleteUserHistory ( const MTPInputChannel & _channel , const MTPInputUser & _user_id ) : MTPBoxed < MTPchannels_deleteUserHistory > ( MTPchannels_deleteUserHistory ( _channel , _user_id ) ) { <nl> } <nl> } ; <nl> class MTPchannels_reportSpam { / / RPC method ' channels . reportSpam ' <nl> MTPInputUser vuser_id ; <nl> MTPVector < MTPint > vid ; <nl> <nl> - MTPchannels_reportSpam ( ) { <nl> - } <nl> - MTPchannels_reportSpam ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_channels_reportSpam ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPchannels_reportSpam ( ) = default ; <nl> MTPchannels_reportSpam ( const MTPInputChannel & _channel , const MTPInputUser & _user_id , const MTPVector < MTPint > & _id ) : vchannel ( _channel ) , vuser_id ( _user_id ) , vid ( _id ) { <nl> } <nl> <nl> class MTPchannels_reportSpam { / / RPC method ' channels . reportSpam ' <nl> } ; <nl> class MTPchannels_ReportSpam : public MTPBoxed < MTPchannels_reportSpam > { <nl> public : <nl> - MTPchannels_ReportSpam ( ) { <nl> - } <nl> + MTPchannels_ReportSpam ( ) = default ; <nl> MTPchannels_ReportSpam ( const MTPchannels_reportSpam & v ) : MTPBoxed < MTPchannels_reportSpam > ( v ) { <nl> } <nl> - MTPchannels_ReportSpam ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPchannels_reportSpam > ( from , end , cons ) { <nl> - } <nl> MTPchannels_ReportSpam ( const MTPInputChannel & _channel , const MTPInputUser & _user_id , const MTPVector < MTPint > & _id ) : MTPBoxed < MTPchannels_reportSpam > ( MTPchannels_reportSpam ( _channel , _user_id , _id ) ) { <nl> } <nl> } ; <nl> class MTPchannels_getMessages { / / RPC method ' channels . getMessages ' <nl> MTPInputChannel vchannel ; <nl> MTPVector < MTPint > vid ; <nl> <nl> - MTPchannels_getMessages ( ) { <nl> - } <nl> - MTPchannels_getMessages ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_channels_getMessages ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPchannels_getMessages ( ) = default ; <nl> MTPchannels_getMessages ( const MTPInputChannel & _channel , const MTPVector < MTPint > & _id ) : vchannel ( _channel ) , vid ( _id ) { <nl> } <nl> <nl> class MTPchannels_getMessages { / / RPC method ' channels . getMessages ' <nl> } ; <nl> class MTPchannels_GetMessages : public MTPBoxed < MTPchannels_getMessages > { <nl> public : <nl> - MTPchannels_GetMessages ( ) { <nl> - } <nl> + MTPchannels_GetMessages ( ) = default ; <nl> MTPchannels_GetMessages ( const MTPchannels_getMessages & v ) : MTPBoxed < MTPchannels_getMessages > ( v ) { <nl> } <nl> - MTPchannels_GetMessages ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPchannels_getMessages > ( from , end , cons ) { <nl> - } <nl> MTPchannels_GetMessages ( const MTPInputChannel & _channel , const MTPVector < MTPint > & _id ) : MTPBoxed < MTPchannels_getMessages > ( MTPchannels_getMessages ( _channel , _id ) ) { <nl> } <nl> } ; <nl> class MTPchannels_getParticipants { / / RPC method ' channels . getParticipants ' <nl> MTPint voffset ; <nl> MTPint vlimit ; <nl> <nl> - MTPchannels_getParticipants ( ) { <nl> - } <nl> - MTPchannels_getParticipants ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_channels_getParticipants ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPchannels_getParticipants ( ) = default ; <nl> MTPchannels_getParticipants ( const MTPInputChannel & _channel , const MTPChannelParticipantsFilter & _filter , MTPint _offset , MTPint _limit ) : vchannel ( _channel ) , vfilter ( _filter ) , voffset ( _offset ) , vlimit ( _limit ) { <nl> } <nl> <nl> class MTPchannels_getParticipants { / / RPC method ' channels . getParticipants ' <nl> } ; <nl> class MTPchannels_GetParticipants : public MTPBoxed < MTPchannels_getParticipants > { <nl> public : <nl> - MTPchannels_GetParticipants ( ) { <nl> - } <nl> + MTPchannels_GetParticipants ( ) = default ; <nl> MTPchannels_GetParticipants ( const MTPchannels_getParticipants & v ) : MTPBoxed < MTPchannels_getParticipants > ( v ) { <nl> } <nl> - MTPchannels_GetParticipants ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPchannels_getParticipants > ( from , end , cons ) { <nl> - } <nl> MTPchannels_GetParticipants ( const MTPInputChannel & _channel , const MTPChannelParticipantsFilter & _filter , MTPint _offset , MTPint _limit ) : MTPBoxed < MTPchannels_getParticipants > ( MTPchannels_getParticipants ( _channel , _filter , _offset , _limit ) ) { <nl> } <nl> } ; <nl> class MTPchannels_getParticipant { / / RPC method ' channels . getParticipant ' <nl> MTPInputChannel vchannel ; <nl> MTPInputUser vuser_id ; <nl> <nl> - MTPchannels_getParticipant ( ) { <nl> - } <nl> - MTPchannels_getParticipant ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_channels_getParticipant ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPchannels_getParticipant ( ) = default ; <nl> MTPchannels_getParticipant ( const MTPInputChannel & _channel , const MTPInputUser & _user_id ) : vchannel ( _channel ) , vuser_id ( _user_id ) { <nl> } <nl> <nl> class MTPchannels_getParticipant { / / RPC method ' channels . getParticipant ' <nl> } ; <nl> class MTPchannels_GetParticipant : public MTPBoxed < MTPchannels_getParticipant > { <nl> public : <nl> - MTPchannels_GetParticipant ( ) { <nl> - } <nl> + MTPchannels_GetParticipant ( ) = default ; <nl> MTPchannels_GetParticipant ( const MTPchannels_getParticipant & v ) : MTPBoxed < MTPchannels_getParticipant > ( v ) { <nl> } <nl> - MTPchannels_GetParticipant ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPchannels_getParticipant > ( from , end , cons ) { <nl> - } <nl> MTPchannels_GetParticipant ( const MTPInputChannel & _channel , const MTPInputUser & _user_id ) : MTPBoxed < MTPchannels_getParticipant > ( MTPchannels_getParticipant ( _channel , _user_id ) ) { <nl> } <nl> } ; <nl> class MTPchannels_getChannels { / / RPC method ' channels . getChannels ' <nl> public : <nl> MTPVector < MTPInputChannel > vid ; <nl> <nl> - MTPchannels_getChannels ( ) { <nl> - } <nl> - MTPchannels_getChannels ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_channels_getChannels ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPchannels_getChannels ( ) = default ; <nl> MTPchannels_getChannels ( const MTPVector < MTPInputChannel > & _id ) : vid ( _id ) { <nl> } <nl> <nl> class MTPchannels_getChannels { / / RPC method ' channels . getChannels ' <nl> } ; <nl> class MTPchannels_GetChannels : public MTPBoxed < MTPchannels_getChannels > { <nl> public : <nl> - MTPchannels_GetChannels ( ) { <nl> - } <nl> + MTPchannels_GetChannels ( ) = default ; <nl> MTPchannels_GetChannels ( const MTPchannels_getChannels & v ) : MTPBoxed < MTPchannels_getChannels > ( v ) { <nl> } <nl> - MTPchannels_GetChannels ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPchannels_getChannels > ( from , end , cons ) { <nl> - } <nl> MTPchannels_GetChannels ( const MTPVector < MTPInputChannel > & _id ) : MTPBoxed < MTPchannels_getChannels > ( MTPchannels_getChannels ( _id ) ) { <nl> } <nl> } ; <nl> class MTPchannels_getFullChannel { / / RPC method ' channels . getFullChannel ' <nl> public : <nl> MTPInputChannel vchannel ; <nl> <nl> - MTPchannels_getFullChannel ( ) { <nl> - } <nl> - MTPchannels_getFullChannel ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_channels_getFullChannel ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPchannels_getFullChannel ( ) = default ; <nl> MTPchannels_getFullChannel ( const MTPInputChannel & _channel ) : vchannel ( _channel ) { <nl> } <nl> <nl> class MTPchannels_getFullChannel { / / RPC method ' channels . getFullChannel ' <nl> } ; <nl> class MTPchannels_GetFullChannel : public MTPBoxed < MTPchannels_getFullChannel > { <nl> public : <nl> - MTPchannels_GetFullChannel ( ) { <nl> - } <nl> + MTPchannels_GetFullChannel ( ) = default ; <nl> MTPchannels_GetFullChannel ( const MTPchannels_getFullChannel & v ) : MTPBoxed < MTPchannels_getFullChannel > ( v ) { <nl> } <nl> - MTPchannels_GetFullChannel ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPchannels_getFullChannel > ( from , end , cons ) { <nl> - } <nl> MTPchannels_GetFullChannel ( const MTPInputChannel & _channel ) : MTPBoxed < MTPchannels_getFullChannel > ( MTPchannels_getFullChannel ( _channel ) ) { <nl> } <nl> } ; <nl> class MTPchannels_createChannel { / / RPC method ' channels . createChannel ' <nl> MTPstring vtitle ; <nl> MTPstring vabout ; <nl> <nl> - MTPchannels_createChannel ( ) { <nl> - } <nl> - MTPchannels_createChannel ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_channels_createChannel ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPchannels_createChannel ( ) = default ; <nl> MTPchannels_createChannel ( const MTPflags < MTPchannels_createChannel : : Flags > & _flags , const MTPstring & _title , const MTPstring & _about ) : vflags ( _flags ) , vtitle ( _title ) , vabout ( _about ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPchannels_createChannel : : Flags ) <nl> <nl> class MTPchannels_CreateChannel : public MTPBoxed < MTPchannels_createChannel > { <nl> public : <nl> - MTPchannels_CreateChannel ( ) { <nl> - } <nl> + MTPchannels_CreateChannel ( ) = default ; <nl> MTPchannels_CreateChannel ( const MTPchannels_createChannel & v ) : MTPBoxed < MTPchannels_createChannel > ( v ) { <nl> } <nl> - MTPchannels_CreateChannel ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPchannels_createChannel > ( from , end , cons ) { <nl> - } <nl> MTPchannels_CreateChannel ( const MTPflags < MTPchannels_createChannel : : Flags > & _flags , const MTPstring & _title , const MTPstring & _about ) : MTPBoxed < MTPchannels_createChannel > ( MTPchannels_createChannel ( _flags , _title , _about ) ) { <nl> } <nl> } ; <nl> class MTPchannels_editAbout { / / RPC method ' channels . editAbout ' <nl> MTPInputChannel vchannel ; <nl> MTPstring vabout ; <nl> <nl> - MTPchannels_editAbout ( ) { <nl> - } <nl> - MTPchannels_editAbout ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_channels_editAbout ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPchannels_editAbout ( ) = default ; <nl> MTPchannels_editAbout ( const MTPInputChannel & _channel , const MTPstring & _about ) : vchannel ( _channel ) , vabout ( _about ) { <nl> } <nl> <nl> class MTPchannels_editAbout { / / RPC method ' channels . editAbout ' <nl> } ; <nl> class MTPchannels_EditAbout : public MTPBoxed < MTPchannels_editAbout > { <nl> public : <nl> - MTPchannels_EditAbout ( ) { <nl> - } <nl> + MTPchannels_EditAbout ( ) = default ; <nl> MTPchannels_EditAbout ( const MTPchannels_editAbout & v ) : MTPBoxed < MTPchannels_editAbout > ( v ) { <nl> } <nl> - MTPchannels_EditAbout ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPchannels_editAbout > ( from , end , cons ) { <nl> - } <nl> MTPchannels_EditAbout ( const MTPInputChannel & _channel , const MTPstring & _about ) : MTPBoxed < MTPchannels_editAbout > ( MTPchannels_editAbout ( _channel , _about ) ) { <nl> } <nl> } ; <nl> class MTPchannels_editAdmin { / / RPC method ' channels . editAdmin ' <nl> MTPInputUser vuser_id ; <nl> MTPChannelParticipantRole vrole ; <nl> <nl> - MTPchannels_editAdmin ( ) { <nl> - } <nl> - MTPchannels_editAdmin ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_channels_editAdmin ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPchannels_editAdmin ( ) = default ; <nl> MTPchannels_editAdmin ( const MTPInputChannel & _channel , const MTPInputUser & _user_id , const MTPChannelParticipantRole & _role ) : vchannel ( _channel ) , vuser_id ( _user_id ) , vrole ( _role ) { <nl> } <nl> <nl> class MTPchannels_editAdmin { / / RPC method ' channels . editAdmin ' <nl> } ; <nl> class MTPchannels_EditAdmin : public MTPBoxed < MTPchannels_editAdmin > { <nl> public : <nl> - MTPchannels_EditAdmin ( ) { <nl> - } <nl> + MTPchannels_EditAdmin ( ) = default ; <nl> MTPchannels_EditAdmin ( const MTPchannels_editAdmin & v ) : MTPBoxed < MTPchannels_editAdmin > ( v ) { <nl> } <nl> - MTPchannels_EditAdmin ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPchannels_editAdmin > ( from , end , cons ) { <nl> - } <nl> MTPchannels_EditAdmin ( const MTPInputChannel & _channel , const MTPInputUser & _user_id , const MTPChannelParticipantRole & _role ) : MTPBoxed < MTPchannels_editAdmin > ( MTPchannels_editAdmin ( _channel , _user_id , _role ) ) { <nl> } <nl> } ; <nl> class MTPchannels_editTitle { / / RPC method ' channels . editTitle ' <nl> MTPInputChannel vchannel ; <nl> MTPstring vtitle ; <nl> <nl> - MTPchannels_editTitle ( ) { <nl> - } <nl> - MTPchannels_editTitle ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_channels_editTitle ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPchannels_editTitle ( ) = default ; <nl> MTPchannels_editTitle ( const MTPInputChannel & _channel , const MTPstring & _title ) : vchannel ( _channel ) , vtitle ( _title ) { <nl> } <nl> <nl> class MTPchannels_editTitle { / / RPC method ' channels . editTitle ' <nl> } ; <nl> class MTPchannels_EditTitle : public MTPBoxed < MTPchannels_editTitle > { <nl> public : <nl> - MTPchannels_EditTitle ( ) { <nl> - } <nl> + MTPchannels_EditTitle ( ) = default ; <nl> MTPchannels_EditTitle ( const MTPchannels_editTitle & v ) : MTPBoxed < MTPchannels_editTitle > ( v ) { <nl> } <nl> - MTPchannels_EditTitle ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPchannels_editTitle > ( from , end , cons ) { <nl> - } <nl> MTPchannels_EditTitle ( const MTPInputChannel & _channel , const MTPstring & _title ) : MTPBoxed < MTPchannels_editTitle > ( MTPchannels_editTitle ( _channel , _title ) ) { <nl> } <nl> } ; <nl> class MTPchannels_editPhoto { / / RPC method ' channels . editPhoto ' <nl> MTPInputChannel vchannel ; <nl> MTPInputChatPhoto vphoto ; <nl> <nl> - MTPchannels_editPhoto ( ) { <nl> - } <nl> - MTPchannels_editPhoto ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_channels_editPhoto ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPchannels_editPhoto ( ) = default ; <nl> MTPchannels_editPhoto ( const MTPInputChannel & _channel , const MTPInputChatPhoto & _photo ) : vchannel ( _channel ) , vphoto ( _photo ) { <nl> } <nl> <nl> class MTPchannels_editPhoto { / / RPC method ' channels . editPhoto ' <nl> } ; <nl> class MTPchannels_EditPhoto : public MTPBoxed < MTPchannels_editPhoto > { <nl> public : <nl> - MTPchannels_EditPhoto ( ) { <nl> - } <nl> + MTPchannels_EditPhoto ( ) = default ; <nl> MTPchannels_EditPhoto ( const MTPchannels_editPhoto & v ) : MTPBoxed < MTPchannels_editPhoto > ( v ) { <nl> } <nl> - MTPchannels_EditPhoto ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPchannels_editPhoto > ( from , end , cons ) { <nl> - } <nl> MTPchannels_EditPhoto ( const MTPInputChannel & _channel , const MTPInputChatPhoto & _photo ) : MTPBoxed < MTPchannels_editPhoto > ( MTPchannels_editPhoto ( _channel , _photo ) ) { <nl> } <nl> } ; <nl> class MTPchannels_checkUsername { / / RPC method ' channels . checkUsername ' <nl> MTPInputChannel vchannel ; <nl> MTPstring vusername ; <nl> <nl> - MTPchannels_checkUsername ( ) { <nl> - } <nl> - MTPchannels_checkUsername ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_channels_checkUsername ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPchannels_checkUsername ( ) = default ; <nl> MTPchannels_checkUsername ( const MTPInputChannel & _channel , const MTPstring & _username ) : vchannel ( _channel ) , vusername ( _username ) { <nl> } <nl> <nl> class MTPchannels_checkUsername { / / RPC method ' channels . checkUsername ' <nl> } ; <nl> class MTPchannels_CheckUsername : public MTPBoxed < MTPchannels_checkUsername > { <nl> public : <nl> - MTPchannels_CheckUsername ( ) { <nl> - } <nl> + MTPchannels_CheckUsername ( ) = default ; <nl> MTPchannels_CheckUsername ( const MTPchannels_checkUsername & v ) : MTPBoxed < MTPchannels_checkUsername > ( v ) { <nl> } <nl> - MTPchannels_CheckUsername ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPchannels_checkUsername > ( from , end , cons ) { <nl> - } <nl> MTPchannels_CheckUsername ( const MTPInputChannel & _channel , const MTPstring & _username ) : MTPBoxed < MTPchannels_checkUsername > ( MTPchannels_checkUsername ( _channel , _username ) ) { <nl> } <nl> } ; <nl> class MTPchannels_updateUsername { / / RPC method ' channels . updateUsername ' <nl> MTPInputChannel vchannel ; <nl> MTPstring vusername ; <nl> <nl> - MTPchannels_updateUsername ( ) { <nl> - } <nl> - MTPchannels_updateUsername ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_channels_updateUsername ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPchannels_updateUsername ( ) = default ; <nl> MTPchannels_updateUsername ( const MTPInputChannel & _channel , const MTPstring & _username ) : vchannel ( _channel ) , vusername ( _username ) { <nl> } <nl> <nl> class MTPchannels_updateUsername { / / RPC method ' channels . updateUsername ' <nl> } ; <nl> class MTPchannels_UpdateUsername : public MTPBoxed < MTPchannels_updateUsername > { <nl> public : <nl> - MTPchannels_UpdateUsername ( ) { <nl> - } <nl> + MTPchannels_UpdateUsername ( ) = default ; <nl> MTPchannels_UpdateUsername ( const MTPchannels_updateUsername & v ) : MTPBoxed < MTPchannels_updateUsername > ( v ) { <nl> } <nl> - MTPchannels_UpdateUsername ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPchannels_updateUsername > ( from , end , cons ) { <nl> - } <nl> MTPchannels_UpdateUsername ( const MTPInputChannel & _channel , const MTPstring & _username ) : MTPBoxed < MTPchannels_updateUsername > ( MTPchannels_updateUsername ( _channel , _username ) ) { <nl> } <nl> } ; <nl> class MTPchannels_joinChannel { / / RPC method ' channels . joinChannel ' <nl> public : <nl> MTPInputChannel vchannel ; <nl> <nl> - MTPchannels_joinChannel ( ) { <nl> - } <nl> - MTPchannels_joinChannel ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_channels_joinChannel ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPchannels_joinChannel ( ) = default ; <nl> MTPchannels_joinChannel ( const MTPInputChannel & _channel ) : vchannel ( _channel ) { <nl> } <nl> <nl> class MTPchannels_joinChannel { / / RPC method ' channels . joinChannel ' <nl> } ; <nl> class MTPchannels_JoinChannel : public MTPBoxed < MTPchannels_joinChannel > { <nl> public : <nl> - MTPchannels_JoinChannel ( ) { <nl> - } <nl> + MTPchannels_JoinChannel ( ) = default ; <nl> MTPchannels_JoinChannel ( const MTPchannels_joinChannel & v ) : MTPBoxed < MTPchannels_joinChannel > ( v ) { <nl> } <nl> - MTPchannels_JoinChannel ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPchannels_joinChannel > ( from , end , cons ) { <nl> - } <nl> MTPchannels_JoinChannel ( const MTPInputChannel & _channel ) : MTPBoxed < MTPchannels_joinChannel > ( MTPchannels_joinChannel ( _channel ) ) { <nl> } <nl> } ; <nl> class MTPchannels_leaveChannel { / / RPC method ' channels . leaveChannel ' <nl> public : <nl> MTPInputChannel vchannel ; <nl> <nl> - MTPchannels_leaveChannel ( ) { <nl> - } <nl> - MTPchannels_leaveChannel ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_channels_leaveChannel ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPchannels_leaveChannel ( ) = default ; <nl> MTPchannels_leaveChannel ( const MTPInputChannel & _channel ) : vchannel ( _channel ) { <nl> } <nl> <nl> class MTPchannels_leaveChannel { / / RPC method ' channels . leaveChannel ' <nl> } ; <nl> class MTPchannels_LeaveChannel : public MTPBoxed < MTPchannels_leaveChannel > { <nl> public : <nl> - MTPchannels_LeaveChannel ( ) { <nl> - } <nl> + MTPchannels_LeaveChannel ( ) = default ; <nl> MTPchannels_LeaveChannel ( const MTPchannels_leaveChannel & v ) : MTPBoxed < MTPchannels_leaveChannel > ( v ) { <nl> } <nl> - MTPchannels_LeaveChannel ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPchannels_leaveChannel > ( from , end , cons ) { <nl> - } <nl> MTPchannels_LeaveChannel ( const MTPInputChannel & _channel ) : MTPBoxed < MTPchannels_leaveChannel > ( MTPchannels_leaveChannel ( _channel ) ) { <nl> } <nl> } ; <nl> class MTPchannels_inviteToChannel { / / RPC method ' channels . inviteToChannel ' <nl> MTPInputChannel vchannel ; <nl> MTPVector < MTPInputUser > vusers ; <nl> <nl> - MTPchannels_inviteToChannel ( ) { <nl> - } <nl> - MTPchannels_inviteToChannel ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_channels_inviteToChannel ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPchannels_inviteToChannel ( ) = default ; <nl> MTPchannels_inviteToChannel ( const MTPInputChannel & _channel , const MTPVector < MTPInputUser > & _users ) : vchannel ( _channel ) , vusers ( _users ) { <nl> } <nl> <nl> class MTPchannels_inviteToChannel { / / RPC method ' channels . inviteToChannel ' <nl> } ; <nl> class MTPchannels_InviteToChannel : public MTPBoxed < MTPchannels_inviteToChannel > { <nl> public : <nl> - MTPchannels_InviteToChannel ( ) { <nl> - } <nl> + MTPchannels_InviteToChannel ( ) = default ; <nl> MTPchannels_InviteToChannel ( const MTPchannels_inviteToChannel & v ) : MTPBoxed < MTPchannels_inviteToChannel > ( v ) { <nl> } <nl> - MTPchannels_InviteToChannel ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPchannels_inviteToChannel > ( from , end , cons ) { <nl> - } <nl> MTPchannels_InviteToChannel ( const MTPInputChannel & _channel , const MTPVector < MTPInputUser > & _users ) : MTPBoxed < MTPchannels_inviteToChannel > ( MTPchannels_inviteToChannel ( _channel , _users ) ) { <nl> } <nl> } ; <nl> class MTPchannels_kickFromChannel { / / RPC method ' channels . kickFromChannel ' <nl> MTPInputUser vuser_id ; <nl> MTPBool vkicked ; <nl> <nl> - MTPchannels_kickFromChannel ( ) { <nl> - } <nl> - MTPchannels_kickFromChannel ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_channels_kickFromChannel ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPchannels_kickFromChannel ( ) = default ; <nl> MTPchannels_kickFromChannel ( const MTPInputChannel & _channel , const MTPInputUser & _user_id , MTPBool _kicked ) : vchannel ( _channel ) , vuser_id ( _user_id ) , vkicked ( _kicked ) { <nl> } <nl> <nl> class MTPchannels_kickFromChannel { / / RPC method ' channels . kickFromChannel ' <nl> } ; <nl> class MTPchannels_KickFromChannel : public MTPBoxed < MTPchannels_kickFromChannel > { <nl> public : <nl> - MTPchannels_KickFromChannel ( ) { <nl> - } <nl> + MTPchannels_KickFromChannel ( ) = default ; <nl> MTPchannels_KickFromChannel ( const MTPchannels_kickFromChannel & v ) : MTPBoxed < MTPchannels_kickFromChannel > ( v ) { <nl> } <nl> - MTPchannels_KickFromChannel ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPchannels_kickFromChannel > ( from , end , cons ) { <nl> - } <nl> MTPchannels_KickFromChannel ( const MTPInputChannel & _channel , const MTPInputUser & _user_id , MTPBool _kicked ) : MTPBoxed < MTPchannels_kickFromChannel > ( MTPchannels_kickFromChannel ( _channel , _user_id , _kicked ) ) { <nl> } <nl> } ; <nl> class MTPchannels_exportInvite { / / RPC method ' channels . exportInvite ' <nl> public : <nl> MTPInputChannel vchannel ; <nl> <nl> - MTPchannels_exportInvite ( ) { <nl> - } <nl> - MTPchannels_exportInvite ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_channels_exportInvite ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPchannels_exportInvite ( ) = default ; <nl> MTPchannels_exportInvite ( const MTPInputChannel & _channel ) : vchannel ( _channel ) { <nl> } <nl> <nl> class MTPchannels_exportInvite { / / RPC method ' channels . exportInvite ' <nl> } ; <nl> class MTPchannels_ExportInvite : public MTPBoxed < MTPchannels_exportInvite > { <nl> public : <nl> - MTPchannels_ExportInvite ( ) { <nl> - } <nl> + MTPchannels_ExportInvite ( ) = default ; <nl> MTPchannels_ExportInvite ( const MTPchannels_exportInvite & v ) : MTPBoxed < MTPchannels_exportInvite > ( v ) { <nl> } <nl> - MTPchannels_ExportInvite ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPchannels_exportInvite > ( from , end , cons ) { <nl> - } <nl> MTPchannels_ExportInvite ( const MTPInputChannel & _channel ) : MTPBoxed < MTPchannels_exportInvite > ( MTPchannels_exportInvite ( _channel ) ) { <nl> } <nl> } ; <nl> class MTPchannels_deleteChannel { / / RPC method ' channels . deleteChannel ' <nl> public : <nl> MTPInputChannel vchannel ; <nl> <nl> - MTPchannels_deleteChannel ( ) { <nl> - } <nl> - MTPchannels_deleteChannel ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_channels_deleteChannel ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPchannels_deleteChannel ( ) = default ; <nl> MTPchannels_deleteChannel ( const MTPInputChannel & _channel ) : vchannel ( _channel ) { <nl> } <nl> <nl> class MTPchannels_deleteChannel { / / RPC method ' channels . deleteChannel ' <nl> } ; <nl> class MTPchannels_DeleteChannel : public MTPBoxed < MTPchannels_deleteChannel > { <nl> public : <nl> - MTPchannels_DeleteChannel ( ) { <nl> - } <nl> + MTPchannels_DeleteChannel ( ) = default ; <nl> MTPchannels_DeleteChannel ( const MTPchannels_deleteChannel & v ) : MTPBoxed < MTPchannels_deleteChannel > ( v ) { <nl> } <nl> - MTPchannels_DeleteChannel ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPchannels_deleteChannel > ( from , end , cons ) { <nl> - } <nl> MTPchannels_DeleteChannel ( const MTPInputChannel & _channel ) : MTPBoxed < MTPchannels_deleteChannel > ( MTPchannels_deleteChannel ( _channel ) ) { <nl> } <nl> } ; <nl> class MTPchannels_toggleInvites { / / RPC method ' channels . toggleInvites ' <nl> MTPInputChannel vchannel ; <nl> MTPBool venabled ; <nl> <nl> - MTPchannels_toggleInvites ( ) { <nl> - } <nl> - MTPchannels_toggleInvites ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_channels_toggleInvites ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPchannels_toggleInvites ( ) = default ; <nl> MTPchannels_toggleInvites ( const MTPInputChannel & _channel , MTPBool _enabled ) : vchannel ( _channel ) , venabled ( _enabled ) { <nl> } <nl> <nl> class MTPchannels_toggleInvites { / / RPC method ' channels . toggleInvites ' <nl> } ; <nl> class MTPchannels_ToggleInvites : public MTPBoxed < MTPchannels_toggleInvites > { <nl> public : <nl> - MTPchannels_ToggleInvites ( ) { <nl> - } <nl> + MTPchannels_ToggleInvites ( ) = default ; <nl> MTPchannels_ToggleInvites ( const MTPchannels_toggleInvites & v ) : MTPBoxed < MTPchannels_toggleInvites > ( v ) { <nl> } <nl> - MTPchannels_ToggleInvites ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPchannels_toggleInvites > ( from , end , cons ) { <nl> - } <nl> MTPchannels_ToggleInvites ( const MTPInputChannel & _channel , MTPBool _enabled ) : MTPBoxed < MTPchannels_toggleInvites > ( MTPchannels_toggleInvites ( _channel , _enabled ) ) { <nl> } <nl> } ; <nl> class MTPchannels_exportMessageLink { / / RPC method ' channels . exportMessageLink ' <nl> MTPInputChannel vchannel ; <nl> MTPint vid ; <nl> <nl> - MTPchannels_exportMessageLink ( ) { <nl> - } <nl> - MTPchannels_exportMessageLink ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_channels_exportMessageLink ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPchannels_exportMessageLink ( ) = default ; <nl> MTPchannels_exportMessageLink ( const MTPInputChannel & _channel , MTPint _id ) : vchannel ( _channel ) , vid ( _id ) { <nl> } <nl> <nl> class MTPchannels_exportMessageLink { / / RPC method ' channels . exportMessageLink ' <nl> } ; <nl> class MTPchannels_ExportMessageLink : public MTPBoxed < MTPchannels_exportMessageLink > { <nl> public : <nl> - MTPchannels_ExportMessageLink ( ) { <nl> - } <nl> + MTPchannels_ExportMessageLink ( ) = default ; <nl> MTPchannels_ExportMessageLink ( const MTPchannels_exportMessageLink & v ) : MTPBoxed < MTPchannels_exportMessageLink > ( v ) { <nl> } <nl> - MTPchannels_ExportMessageLink ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPchannels_exportMessageLink > ( from , end , cons ) { <nl> - } <nl> MTPchannels_ExportMessageLink ( const MTPInputChannel & _channel , MTPint _id ) : MTPBoxed < MTPchannels_exportMessageLink > ( MTPchannels_exportMessageLink ( _channel , _id ) ) { <nl> } <nl> } ; <nl> class MTPchannels_toggleSignatures { / / RPC method ' channels . toggleSignatures ' <nl> MTPInputChannel vchannel ; <nl> MTPBool venabled ; <nl> <nl> - MTPchannels_toggleSignatures ( ) { <nl> - } <nl> - MTPchannels_toggleSignatures ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_channels_toggleSignatures ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPchannels_toggleSignatures ( ) = default ; <nl> MTPchannels_toggleSignatures ( const MTPInputChannel & _channel , MTPBool _enabled ) : vchannel ( _channel ) , venabled ( _enabled ) { <nl> } <nl> <nl> class MTPchannels_toggleSignatures { / / RPC method ' channels . toggleSignatures ' <nl> } ; <nl> class MTPchannels_ToggleSignatures : public MTPBoxed < MTPchannels_toggleSignatures > { <nl> public : <nl> - MTPchannels_ToggleSignatures ( ) { <nl> - } <nl> + MTPchannels_ToggleSignatures ( ) = default ; <nl> MTPchannels_ToggleSignatures ( const MTPchannels_toggleSignatures & v ) : MTPBoxed < MTPchannels_toggleSignatures > ( v ) { <nl> } <nl> - MTPchannels_ToggleSignatures ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPchannels_toggleSignatures > ( from , end , cons ) { <nl> - } <nl> MTPchannels_ToggleSignatures ( const MTPInputChannel & _channel , MTPBool _enabled ) : MTPBoxed < MTPchannels_toggleSignatures > ( MTPchannels_toggleSignatures ( _channel , _enabled ) ) { <nl> } <nl> } ; <nl> class MTPchannels_updatePinnedMessage { / / RPC method ' channels . updatePinnedMess <nl> MTPInputChannel vchannel ; <nl> MTPint vid ; <nl> <nl> - MTPchannels_updatePinnedMessage ( ) { <nl> - } <nl> - MTPchannels_updatePinnedMessage ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_channels_updatePinnedMessage ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPchannels_updatePinnedMessage ( ) = default ; <nl> MTPchannels_updatePinnedMessage ( const MTPflags < MTPchannels_updatePinnedMessage : : Flags > & _flags , const MTPInputChannel & _channel , MTPint _id ) : vflags ( _flags ) , vchannel ( _channel ) , vid ( _id ) { <nl> } <nl> <nl> Q_DECLARE_OPERATORS_FOR_FLAGS ( MTPchannels_updatePinnedMessage : : Flags ) <nl> <nl> class MTPchannels_UpdatePinnedMessage : public MTPBoxed < MTPchannels_updatePinnedMessage > { <nl> public : <nl> - MTPchannels_UpdatePinnedMessage ( ) { <nl> - } <nl> + MTPchannels_UpdatePinnedMessage ( ) = default ; <nl> MTPchannels_UpdatePinnedMessage ( const MTPchannels_updatePinnedMessage & v ) : MTPBoxed < MTPchannels_updatePinnedMessage > ( v ) { <nl> } <nl> - MTPchannels_UpdatePinnedMessage ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPchannels_updatePinnedMessage > ( from , end , cons ) { <nl> - } <nl> MTPchannels_UpdatePinnedMessage ( const MTPflags < MTPchannels_updatePinnedMessage : : Flags > & _flags , const MTPInputChannel & _channel , MTPint _id ) : MTPBoxed < MTPchannels_updatePinnedMessage > ( MTPchannels_updatePinnedMessage ( _flags , _channel , _id ) ) { <nl> } <nl> } ; <nl> <nl> class MTPchannels_getAdminedPublicChannels { / / RPC method ' channels . getAdminedPublicChannels ' <nl> public : <nl> - MTPchannels_getAdminedPublicChannels ( ) { <nl> - } <nl> - MTPchannels_getAdminedPublicChannels ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_channels_getAdminedPublicChannels ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPchannels_getAdminedPublicChannels ( ) = default ; <nl> <nl> uint32 innerLength ( ) const { <nl> return 0 ; <nl> class MTPchannels_getAdminedPublicChannels { / / RPC method ' channels . getAdminedP <nl> } ; <nl> class MTPchannels_GetAdminedPublicChannels : public MTPBoxed < MTPchannels_getAdminedPublicChannels > { <nl> public : <nl> - MTPchannels_GetAdminedPublicChannels ( ) { <nl> - } <nl> + MTPchannels_GetAdminedPublicChannels ( ) = default ; <nl> MTPchannels_GetAdminedPublicChannels ( const MTPchannels_getAdminedPublicChannels & v ) : MTPBoxed < MTPchannels_getAdminedPublicChannels > ( v ) { <nl> } <nl> - MTPchannels_GetAdminedPublicChannels ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPchannels_getAdminedPublicChannels > ( from , end , cons ) { <nl> - } <nl> } ; <nl> <nl> class MTPphone_requestCall { / / RPC method ' phone . requestCall ' <nl> class MTPphone_requestCall { / / RPC method ' phone . requestCall ' <nl> MTPbytes vg_a ; <nl> MTPPhoneCallProtocol vprotocol ; <nl> <nl> - MTPphone_requestCall ( ) { <nl> - } <nl> - MTPphone_requestCall ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_phone_requestCall ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPphone_requestCall ( ) = default ; <nl> MTPphone_requestCall ( const MTPInputUser & _user_id , MTPint _random_id , const MTPbytes & _g_a , const MTPPhoneCallProtocol & _protocol ) : vuser_id ( _user_id ) , vrandom_id ( _random_id ) , vg_a ( _g_a ) , vprotocol ( _protocol ) { <nl> } <nl> <nl> class MTPphone_requestCall { / / RPC method ' phone . requestCall ' <nl> } ; <nl> class MTPphone_RequestCall : public MTPBoxed < MTPphone_requestCall > { <nl> public : <nl> - MTPphone_RequestCall ( ) { <nl> - } <nl> + MTPphone_RequestCall ( ) = default ; <nl> MTPphone_RequestCall ( const MTPphone_requestCall & v ) : MTPBoxed < MTPphone_requestCall > ( v ) { <nl> } <nl> - MTPphone_RequestCall ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPphone_requestCall > ( from , end , cons ) { <nl> - } <nl> MTPphone_RequestCall ( const MTPInputUser & _user_id , MTPint _random_id , const MTPbytes & _g_a , const MTPPhoneCallProtocol & _protocol ) : MTPBoxed < MTPphone_requestCall > ( MTPphone_requestCall ( _user_id , _random_id , _g_a , _protocol ) ) { <nl> } <nl> } ; <nl> class MTPphone_acceptCall { / / RPC method ' phone . acceptCall ' <nl> MTPlong vkey_fingerprint ; <nl> MTPPhoneCallProtocol vprotocol ; <nl> <nl> - MTPphone_acceptCall ( ) { <nl> - } <nl> - MTPphone_acceptCall ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_phone_acceptCall ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPphone_acceptCall ( ) = default ; <nl> MTPphone_acceptCall ( const MTPInputPhoneCall & _peer , const MTPbytes & _g_b , const MTPlong & _key_fingerprint , const MTPPhoneCallProtocol & _protocol ) : vpeer ( _peer ) , vg_b ( _g_b ) , vkey_fingerprint ( _key_fingerprint ) , vprotocol ( _protocol ) { <nl> } <nl> <nl> class MTPphone_acceptCall { / / RPC method ' phone . acceptCall ' <nl> } ; <nl> class MTPphone_AcceptCall : public MTPBoxed < MTPphone_acceptCall > { <nl> public : <nl> - MTPphone_AcceptCall ( ) { <nl> - } <nl> + MTPphone_AcceptCall ( ) = default ; <nl> MTPphone_AcceptCall ( const MTPphone_acceptCall & v ) : MTPBoxed < MTPphone_acceptCall > ( v ) { <nl> } <nl> - MTPphone_AcceptCall ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPphone_acceptCall > ( from , end , cons ) { <nl> - } <nl> MTPphone_AcceptCall ( const MTPInputPhoneCall & _peer , const MTPbytes & _g_b , const MTPlong & _key_fingerprint , const MTPPhoneCallProtocol & _protocol ) : MTPBoxed < MTPphone_acceptCall > ( MTPphone_acceptCall ( _peer , _g_b , _key_fingerprint , _protocol ) ) { <nl> } <nl> } ; <nl> class MTPphone_discardCall { / / RPC method ' phone . discardCall ' <nl> MTPPhoneCallDiscardReason vreason ; <nl> MTPlong vconnection_id ; <nl> <nl> - MTPphone_discardCall ( ) { <nl> - } <nl> - MTPphone_discardCall ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_phone_discardCall ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPphone_discardCall ( ) = default ; <nl> MTPphone_discardCall ( const MTPInputPhoneCall & _peer , MTPint _duration , const MTPPhoneCallDiscardReason & _reason , const MTPlong & _connection_id ) : vpeer ( _peer ) , vduration ( _duration ) , vreason ( _reason ) , vconnection_id ( _connection_id ) { <nl> } <nl> <nl> class MTPphone_discardCall { / / RPC method ' phone . discardCall ' <nl> } ; <nl> class MTPphone_DiscardCall : public MTPBoxed < MTPphone_discardCall > { <nl> public : <nl> - MTPphone_DiscardCall ( ) { <nl> - } <nl> + MTPphone_DiscardCall ( ) = default ; <nl> MTPphone_DiscardCall ( const MTPphone_discardCall & v ) : MTPBoxed < MTPphone_discardCall > ( v ) { <nl> } <nl> - MTPphone_DiscardCall ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPphone_discardCall > ( from , end , cons ) { <nl> - } <nl> MTPphone_DiscardCall ( const MTPInputPhoneCall & _peer , MTPint _duration , const MTPPhoneCallDiscardReason & _reason , const MTPlong & _connection_id ) : MTPBoxed < MTPphone_discardCall > ( MTPphone_discardCall ( _peer , _duration , _reason , _connection_id ) ) { <nl> } <nl> } ; <nl> class MTPphone_receivedCall { / / RPC method ' phone . receivedCall ' <nl> public : <nl> MTPInputPhoneCall vpeer ; <nl> <nl> - MTPphone_receivedCall ( ) { <nl> - } <nl> - MTPphone_receivedCall ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = mtpc_phone_receivedCall ) { <nl> - read ( from , end , cons ) ; <nl> - } <nl> + MTPphone_receivedCall ( ) = default ; <nl> MTPphone_receivedCall ( const MTPInputPhoneCall & _peer ) : vpeer ( _peer ) { <nl> } <nl> <nl> class MTPphone_receivedCall { / / RPC method ' phone . receivedCall ' <nl> } ; <nl> class MTPphone_ReceivedCall : public MTPBoxed < MTPphone_receivedCall > { <nl> public : <nl> - MTPphone_ReceivedCall ( ) { <nl> - } <nl> + MTPphone_ReceivedCall ( ) = default ; <nl> MTPphone_ReceivedCall ( const MTPphone_receivedCall & v ) : MTPBoxed < MTPphone_receivedCall > ( v ) { <nl> } <nl> - MTPphone_ReceivedCall ( const mtpPrime * & from , const mtpPrime * end , mtpTypeId cons = 0 ) : MTPBoxed < MTPphone_receivedCall > ( from , end , cons ) { <nl> - } <nl> MTPphone_ReceivedCall ( const MTPInputPhoneCall & _peer ) : MTPBoxed < MTPphone_receivedCall > ( MTPphone_receivedCall ( _peer ) ) { <nl> } <nl> } ; <nl> inline void MTPserver_DH_Params : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPserver_DH_Params : : MTPserver_DH_Params ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPserver_DH_Params : : MTPserver_DH_Params ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_server_DH_params_fail : data = std : : make_shared < MTPDserver_DH_params_fail > ( ) ; break ; <nl> case mtpc_server_DH_params_ok : data = std : : make_shared < MTPDserver_DH_params_ok > ( ) ; break ; <nl> inline void MTPset_client_DH_params_answer : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPset_client_DH_params_answer : : MTPset_client_DH_params_answer ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPset_client_DH_params_answer : : MTPset_client_DH_params_answer ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_dh_gen_ok : data = std : : make_shared < MTPDdh_gen_ok > ( ) ; break ; <nl> case mtpc_dh_gen_retry : data = std : : make_shared < MTPDdh_gen_retry > ( ) ; break ; <nl> inline void MTPbadMsgNotification : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPbadMsgNotification : : MTPbadMsgNotification ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPbadMsgNotification : : MTPbadMsgNotification ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_bad_msg_notification : data = std : : make_shared < MTPDbad_msg_notification > ( ) ; break ; <nl> case mtpc_bad_server_salt : data = std : : make_shared < MTPDbad_server_salt > ( ) ; break ; <nl> inline void MTPmsgDetailedInfo : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPmsgDetailedInfo : : MTPmsgDetailedInfo ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPmsgDetailedInfo : : MTPmsgDetailedInfo ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_msg_detailed_info : data = std : : make_shared < MTPDmsg_detailed_info > ( ) ; break ; <nl> case mtpc_msg_new_detailed_info : data = std : : make_shared < MTPDmsg_new_detailed_info > ( ) ; break ; <nl> inline void MTPrpcDropAnswer : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPrpcDropAnswer : : MTPrpcDropAnswer ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPrpcDropAnswer : : MTPrpcDropAnswer ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_rpc_answer_unknown : break ; <nl> case mtpc_rpc_answer_dropped_running : break ; <nl> inline void MTPdestroySessionRes : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPdestroySessionRes : : MTPdestroySessionRes ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPdestroySessionRes : : MTPdestroySessionRes ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_destroy_session_ok : data = std : : make_shared < MTPDdestroy_session_ok > ( ) ; break ; <nl> case mtpc_destroy_session_none : data = std : : make_shared < MTPDdestroy_session_none > ( ) ; break ; <nl> inline void MTPinputPeer : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPinputPeer : : MTPinputPeer ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPinputPeer : : MTPinputPeer ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_inputPeerEmpty : break ; <nl> case mtpc_inputPeerSelf : break ; <nl> inline void MTPinputUser : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPinputUser : : MTPinputUser ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPinputUser : : MTPinputUser ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_inputUserEmpty : break ; <nl> case mtpc_inputUserSelf : break ; <nl> inline void MTPinputFile : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPinputFile : : MTPinputFile ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPinputFile : : MTPinputFile ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_inputFile : data = std : : make_shared < MTPDinputFile > ( ) ; break ; <nl> case mtpc_inputFileBig : data = std : : make_shared < MTPDinputFileBig > ( ) ; break ; <nl> inline void MTPinputMedia : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPinputMedia : : MTPinputMedia ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPinputMedia : : MTPinputMedia ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_inputMediaEmpty : break ; <nl> case mtpc_inputMediaUploadedPhoto : data = std : : make_shared < MTPDinputMediaUploadedPhoto > ( ) ; break ; <nl> inline void MTPinputChatPhoto : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPinputChatPhoto : : MTPinputChatPhoto ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPinputChatPhoto : : MTPinputChatPhoto ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_inputChatPhotoEmpty : break ; <nl> case mtpc_inputChatUploadedPhoto : data = std : : make_shared < MTPDinputChatUploadedPhoto > ( ) ; break ; <nl> inline void MTPinputGeoPoint : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPinputGeoPoint : : MTPinputGeoPoint ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPinputGeoPoint : : MTPinputGeoPoint ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_inputGeoPointEmpty : break ; <nl> case mtpc_inputGeoPoint : data = std : : make_shared < MTPDinputGeoPoint > ( ) ; break ; <nl> inline void MTPinputPhoto : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPinputPhoto : : MTPinputPhoto ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPinputPhoto : : MTPinputPhoto ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_inputPhotoEmpty : break ; <nl> case mtpc_inputPhoto : data = std : : make_shared < MTPDinputPhoto > ( ) ; break ; <nl> inline void MTPinputFileLocation : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPinputFileLocation : : MTPinputFileLocation ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPinputFileLocation : : MTPinputFileLocation ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_inputFileLocation : data = std : : make_shared < MTPDinputFileLocation > ( ) ; break ; <nl> case mtpc_inputEncryptedFileLocation : data = std : : make_shared < MTPDinputEncryptedFileLocation > ( ) ; break ; <nl> inline void MTPpeer : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPpeer : : MTPpeer ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPpeer : : MTPpeer ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_peerUser : data = std : : make_shared < MTPDpeerUser > ( ) ; break ; <nl> case mtpc_peerChat : data = std : : make_shared < MTPDpeerChat > ( ) ; break ; <nl> inline void MTPfileLocation : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPfileLocation : : MTPfileLocation ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPfileLocation : : MTPfileLocation ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_fileLocationUnavailable : data = std : : make_shared < MTPDfileLocationUnavailable > ( ) ; break ; <nl> case mtpc_fileLocation : data = std : : make_shared < MTPDfileLocation > ( ) ; break ; <nl> inline void MTPuser : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPuser : : MTPuser ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPuser : : MTPuser ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_userEmpty : data = std : : make_shared < MTPDuserEmpty > ( ) ; break ; <nl> case mtpc_user : data = std : : make_shared < MTPDuser > ( ) ; break ; <nl> inline void MTPuserProfilePhoto : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPuserProfilePhoto : : MTPuserProfilePhoto ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPuserProfilePhoto : : MTPuserProfilePhoto ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_userProfilePhotoEmpty : break ; <nl> case mtpc_userProfilePhoto : data = std : : make_shared < MTPDuserProfilePhoto > ( ) ; break ; <nl> inline void MTPuserStatus : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPuserStatus : : MTPuserStatus ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPuserStatus : : MTPuserStatus ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_userStatusEmpty : break ; <nl> case mtpc_userStatusOnline : data = std : : make_shared < MTPDuserStatusOnline > ( ) ; break ; <nl> inline void MTPchat : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPchat : : MTPchat ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPchat : : MTPchat ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_chatEmpty : data = std : : make_shared < MTPDchatEmpty > ( ) ; break ; <nl> case mtpc_chat : data = std : : make_shared < MTPDchat > ( ) ; break ; <nl> inline void MTPchatFull : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPchatFull : : MTPchatFull ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPchatFull : : MTPchatFull ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_chatFull : data = std : : make_shared < MTPDchatFull > ( ) ; break ; <nl> case mtpc_channelFull : data = std : : make_shared < MTPDchannelFull > ( ) ; break ; <nl> inline void MTPchatParticipant : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPchatParticipant : : MTPchatParticipant ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPchatParticipant : : MTPchatParticipant ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_chatParticipant : data = std : : make_shared < MTPDchatParticipant > ( ) ; break ; <nl> case mtpc_chatParticipantCreator : data = std : : make_shared < MTPDchatParticipantCreator > ( ) ; break ; <nl> inline void MTPchatParticipants : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPchatParticipants : : MTPchatParticipants ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPchatParticipants : : MTPchatParticipants ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_chatParticipantsForbidden : data = std : : make_shared < MTPDchatParticipantsForbidden > ( ) ; break ; <nl> case mtpc_chatParticipants : data = std : : make_shared < MTPDchatParticipants > ( ) ; break ; <nl> inline void MTPchatPhoto : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPchatPhoto : : MTPchatPhoto ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPchatPhoto : : MTPchatPhoto ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_chatPhotoEmpty : break ; <nl> case mtpc_chatPhoto : data = std : : make_shared < MTPDchatPhoto > ( ) ; break ; <nl> inline void MTPmessage : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPmessage : : MTPmessage ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPmessage : : MTPmessage ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_messageEmpty : data = std : : make_shared < MTPDmessageEmpty > ( ) ; break ; <nl> case mtpc_message : data = std : : make_shared < MTPDmessage > ( ) ; break ; <nl> inline void MTPmessageMedia : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPmessageMedia : : MTPmessageMedia ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPmessageMedia : : MTPmessageMedia ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_messageMediaEmpty : break ; <nl> case mtpc_messageMediaPhoto : data = std : : make_shared < MTPDmessageMediaPhoto > ( ) ; break ; <nl> inline void MTPmessageAction : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPmessageAction : : MTPmessageAction ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPmessageAction : : MTPmessageAction ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_messageActionEmpty : break ; <nl> case mtpc_messageActionChatCreate : data = std : : make_shared < MTPDmessageActionChatCreate > ( ) ; break ; <nl> inline void MTPphoto : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPphoto : : MTPphoto ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPphoto : : MTPphoto ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_photoEmpty : data = std : : make_shared < MTPDphotoEmpty > ( ) ; break ; <nl> case mtpc_photo : data = std : : make_shared < MTPDphoto > ( ) ; break ; <nl> inline void MTPphotoSize : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPphotoSize : : MTPphotoSize ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPphotoSize : : MTPphotoSize ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_photoSizeEmpty : data = std : : make_shared < MTPDphotoSizeEmpty > ( ) ; break ; <nl> case mtpc_photoSize : data = std : : make_shared < MTPDphotoSize > ( ) ; break ; <nl> inline void MTPgeoPoint : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPgeoPoint : : MTPgeoPoint ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPgeoPoint : : MTPgeoPoint ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_geoPointEmpty : break ; <nl> case mtpc_geoPoint : data = std : : make_shared < MTPDgeoPoint > ( ) ; break ; <nl> inline void MTPinputNotifyPeer : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPinputNotifyPeer : : MTPinputNotifyPeer ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPinputNotifyPeer : : MTPinputNotifyPeer ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_inputNotifyPeer : data = std : : make_shared < MTPDinputNotifyPeer > ( ) ; break ; <nl> case mtpc_inputNotifyUsers : break ; <nl> inline void MTPpeerNotifySettings : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPpeerNotifySettings : : MTPpeerNotifySettings ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPpeerNotifySettings : : MTPpeerNotifySettings ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_peerNotifySettingsEmpty : break ; <nl> case mtpc_peerNotifySettings : data = std : : make_shared < MTPDpeerNotifySettings > ( ) ; break ; <nl> inline void MTPwallPaper : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPwallPaper : : MTPwallPaper ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPwallPaper : : MTPwallPaper ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_wallPaper : data = std : : make_shared < MTPDwallPaper > ( ) ; break ; <nl> case mtpc_wallPaperSolid : data = std : : make_shared < MTPDwallPaperSolid > ( ) ; break ; <nl> inline void MTPreportReason : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPreportReason : : MTPreportReason ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPreportReason : : MTPreportReason ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_inputReportReasonSpam : break ; <nl> case mtpc_inputReportReasonViolence : break ; <nl> inline void MTPcontacts_contacts : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPcontacts_contacts : : MTPcontacts_contacts ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPcontacts_contacts : : MTPcontacts_contacts ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_contacts_contactsNotModified : break ; <nl> case mtpc_contacts_contacts : data = std : : make_shared < MTPDcontacts_contacts > ( ) ; break ; <nl> inline void MTPcontacts_blocked : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPcontacts_blocked : : MTPcontacts_blocked ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPcontacts_blocked : : MTPcontacts_blocked ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_contacts_blocked : data = std : : make_shared < MTPDcontacts_blocked > ( ) ; break ; <nl> case mtpc_contacts_blockedSlice : data = std : : make_shared < MTPDcontacts_blockedSlice > ( ) ; break ; <nl> inline void MTPmessages_dialogs : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPmessages_dialogs : : MTPmessages_dialogs ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPmessages_dialogs : : MTPmessages_dialogs ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_messages_dialogs : data = std : : make_shared < MTPDmessages_dialogs > ( ) ; break ; <nl> case mtpc_messages_dialogsSlice : data = std : : make_shared < MTPDmessages_dialogsSlice > ( ) ; break ; <nl> inline void MTPmessages_messages : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPmessages_messages : : MTPmessages_messages ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPmessages_messages : : MTPmessages_messages ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_messages_messages : data = std : : make_shared < MTPDmessages_messages > ( ) ; break ; <nl> case mtpc_messages_messagesSlice : data = std : : make_shared < MTPDmessages_messagesSlice > ( ) ; break ; <nl> inline void MTPmessages_chats : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPmessages_chats : : MTPmessages_chats ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPmessages_chats : : MTPmessages_chats ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_messages_chats : data = std : : make_shared < MTPDmessages_chats > ( ) ; break ; <nl> case mtpc_messages_chatsSlice : data = std : : make_shared < MTPDmessages_chatsSlice > ( ) ; break ; <nl> inline void MTPmessagesFilter : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPmessagesFilter : : MTPmessagesFilter ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPmessagesFilter : : MTPmessagesFilter ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_inputMessagesFilterEmpty : break ; <nl> case mtpc_inputMessagesFilterPhotos : break ; <nl> inline void MTPupdate : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPupdate : : MTPupdate ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPupdate : : MTPupdate ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_updateNewMessage : data = std : : make_shared < MTPDupdateNewMessage > ( ) ; break ; <nl> case mtpc_updateMessageID : data = std : : make_shared < MTPDupdateMessageID > ( ) ; break ; <nl> inline void MTPupdates_difference : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPupdates_difference : : MTPupdates_difference ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPupdates_difference : : MTPupdates_difference ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_updates_differenceEmpty : data = std : : make_shared < MTPDupdates_differenceEmpty > ( ) ; break ; <nl> case mtpc_updates_difference : data = std : : make_shared < MTPDupdates_difference > ( ) ; break ; <nl> inline void MTPupdates : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPupdates : : MTPupdates ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPupdates : : MTPupdates ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_updatesTooLong : break ; <nl> case mtpc_updateShortMessage : data = std : : make_shared < MTPDupdateShortMessage > ( ) ; break ; <nl> inline void MTPphotos_photos : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPphotos_photos : : MTPphotos_photos ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPphotos_photos : : MTPphotos_photos ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_photos_photos : data = std : : make_shared < MTPDphotos_photos > ( ) ; break ; <nl> case mtpc_photos_photosSlice : data = std : : make_shared < MTPDphotos_photosSlice > ( ) ; break ; <nl> inline void MTPhelp_appUpdate : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPhelp_appUpdate : : MTPhelp_appUpdate ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPhelp_appUpdate : : MTPhelp_appUpdate ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_help_appUpdate : data = std : : make_shared < MTPDhelp_appUpdate > ( ) ; break ; <nl> case mtpc_help_noAppUpdate : break ; <nl> inline void MTPencryptedChat : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPencryptedChat : : MTPencryptedChat ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPencryptedChat : : MTPencryptedChat ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_encryptedChatEmpty : data = std : : make_shared < MTPDencryptedChatEmpty > ( ) ; break ; <nl> case mtpc_encryptedChatWaiting : data = std : : make_shared < MTPDencryptedChatWaiting > ( ) ; break ; <nl> inline void MTPencryptedFile : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPencryptedFile : : MTPencryptedFile ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPencryptedFile : : MTPencryptedFile ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_encryptedFileEmpty : break ; <nl> case mtpc_encryptedFile : data = std : : make_shared < MTPDencryptedFile > ( ) ; break ; <nl> inline void MTPinputEncryptedFile : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPinputEncryptedFile : : MTPinputEncryptedFile ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPinputEncryptedFile : : MTPinputEncryptedFile ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_inputEncryptedFileEmpty : break ; <nl> case mtpc_inputEncryptedFileUploaded : data = std : : make_shared < MTPDinputEncryptedFileUploaded > ( ) ; break ; <nl> inline void MTPencryptedMessage : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPencryptedMessage : : MTPencryptedMessage ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPencryptedMessage : : MTPencryptedMessage ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_encryptedMessage : data = std : : make_shared < MTPDencryptedMessage > ( ) ; break ; <nl> case mtpc_encryptedMessageService : data = std : : make_shared < MTPDencryptedMessageService > ( ) ; break ; <nl> inline void MTPmessages_dhConfig : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPmessages_dhConfig : : MTPmessages_dhConfig ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPmessages_dhConfig : : MTPmessages_dhConfig ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_messages_dhConfigNotModified : data = std : : make_shared < MTPDmessages_dhConfigNotModified > ( ) ; break ; <nl> case mtpc_messages_dhConfig : data = std : : make_shared < MTPDmessages_dhConfig > ( ) ; break ; <nl> inline void MTPmessages_sentEncryptedMessage : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPmessages_sentEncryptedMessage : : MTPmessages_sentEncryptedMessage ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPmessages_sentEncryptedMessage : : MTPmessages_sentEncryptedMessage ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_messages_sentEncryptedMessage : data = std : : make_shared < MTPDmessages_sentEncryptedMessage > ( ) ; break ; <nl> case mtpc_messages_sentEncryptedFile : data = std : : make_shared < MTPDmessages_sentEncryptedFile > ( ) ; break ; <nl> inline void MTPinputDocument : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPinputDocument : : MTPinputDocument ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPinputDocument : : MTPinputDocument ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_inputDocumentEmpty : break ; <nl> case mtpc_inputDocument : data = std : : make_shared < MTPDinputDocument > ( ) ; break ; <nl> inline void MTPdocument : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPdocument : : MTPdocument ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPdocument : : MTPdocument ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_documentEmpty : data = std : : make_shared < MTPDdocumentEmpty > ( ) ; break ; <nl> case mtpc_document : data = std : : make_shared < MTPDdocument > ( ) ; break ; <nl> inline void MTPnotifyPeer : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPnotifyPeer : : MTPnotifyPeer ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPnotifyPeer : : MTPnotifyPeer ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_notifyPeer : data = std : : make_shared < MTPDnotifyPeer > ( ) ; break ; <nl> case mtpc_notifyUsers : break ; <nl> inline void MTPsendMessageAction : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPsendMessageAction : : MTPsendMessageAction ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPsendMessageAction : : MTPsendMessageAction ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_sendMessageTypingAction : break ; <nl> case mtpc_sendMessageCancelAction : break ; <nl> inline void MTPinputPrivacyRule : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPinputPrivacyRule : : MTPinputPrivacyRule ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPinputPrivacyRule : : MTPinputPrivacyRule ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_inputPrivacyValueAllowContacts : break ; <nl> case mtpc_inputPrivacyValueAllowAll : break ; <nl> inline void MTPprivacyRule : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPprivacyRule : : MTPprivacyRule ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPprivacyRule : : MTPprivacyRule ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_privacyValueAllowContacts : break ; <nl> case mtpc_privacyValueAllowAll : break ; <nl> inline void MTPdocumentAttribute : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPdocumentAttribute : : MTPdocumentAttribute ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPdocumentAttribute : : MTPdocumentAttribute ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_documentAttributeImageSize : data = std : : make_shared < MTPDdocumentAttributeImageSize > ( ) ; break ; <nl> case mtpc_documentAttributeAnimated : break ; <nl> inline void MTPmessages_stickers : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPmessages_stickers : : MTPmessages_stickers ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPmessages_stickers : : MTPmessages_stickers ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_messages_stickersNotModified : break ; <nl> case mtpc_messages_stickers : data = std : : make_shared < MTPDmessages_stickers > ( ) ; break ; <nl> inline void MTPmessages_allStickers : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPmessages_allStickers : : MTPmessages_allStickers ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPmessages_allStickers : : MTPmessages_allStickers ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_messages_allStickersNotModified : break ; <nl> case mtpc_messages_allStickers : data = std : : make_shared < MTPDmessages_allStickers > ( ) ; break ; <nl> inline void MTPwebPage : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPwebPage : : MTPwebPage ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPwebPage : : MTPwebPage ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_webPageEmpty : data = std : : make_shared < MTPDwebPageEmpty > ( ) ; break ; <nl> case mtpc_webPagePending : data = std : : make_shared < MTPDwebPagePending > ( ) ; break ; <nl> inline void MTPaccount_password : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPaccount_password : : MTPaccount_password ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPaccount_password : : MTPaccount_password ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_account_noPassword : data = std : : make_shared < MTPDaccount_noPassword > ( ) ; break ; <nl> case mtpc_account_password : data = std : : make_shared < MTPDaccount_password > ( ) ; break ; <nl> inline void MTPexportedChatInvite : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPexportedChatInvite : : MTPexportedChatInvite ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPexportedChatInvite : : MTPexportedChatInvite ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_chatInviteEmpty : break ; <nl> case mtpc_chatInviteExported : data = std : : make_shared < MTPDchatInviteExported > ( ) ; break ; <nl> inline void MTPchatInvite : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPchatInvite : : MTPchatInvite ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPchatInvite : : MTPchatInvite ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_chatInviteAlready : data = std : : make_shared < MTPDchatInviteAlready > ( ) ; break ; <nl> case mtpc_chatInvite : data = std : : make_shared < MTPDchatInvite > ( ) ; break ; <nl> inline void MTPinputStickerSet : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPinputStickerSet : : MTPinputStickerSet ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPinputStickerSet : : MTPinputStickerSet ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_inputStickerSetEmpty : break ; <nl> case mtpc_inputStickerSetID : data = std : : make_shared < MTPDinputStickerSetID > ( ) ; break ; <nl> inline void MTPkeyboardButton : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPkeyboardButton : : MTPkeyboardButton ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPkeyboardButton : : MTPkeyboardButton ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_keyboardButton : data = std : : make_shared < MTPDkeyboardButton > ( ) ; break ; <nl> case mtpc_keyboardButtonUrl : data = std : : make_shared < MTPDkeyboardButtonUrl > ( ) ; break ; <nl> inline void MTPreplyMarkup : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPreplyMarkup : : MTPreplyMarkup ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPreplyMarkup : : MTPreplyMarkup ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_replyKeyboardHide : data = std : : make_shared < MTPDreplyKeyboardHide > ( ) ; break ; <nl> case mtpc_replyKeyboardForceReply : data = std : : make_shared < MTPDreplyKeyboardForceReply > ( ) ; break ; <nl> inline void MTPhelp_appChangelog : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPhelp_appChangelog : : MTPhelp_appChangelog ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPhelp_appChangelog : : MTPhelp_appChangelog ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_help_appChangelogEmpty : break ; <nl> case mtpc_help_appChangelog : data = std : : make_shared < MTPDhelp_appChangelog > ( ) ; break ; <nl> inline void MTPmessageEntity : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPmessageEntity : : MTPmessageEntity ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPmessageEntity : : MTPmessageEntity ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_messageEntityUnknown : data = std : : make_shared < MTPDmessageEntityUnknown > ( ) ; break ; <nl> case mtpc_messageEntityMention : data = std : : make_shared < MTPDmessageEntityMention > ( ) ; break ; <nl> inline void MTPinputChannel : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPinputChannel : : MTPinputChannel ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPinputChannel : : MTPinputChannel ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_inputChannelEmpty : break ; <nl> case mtpc_inputChannel : data = std : : make_shared < MTPDinputChannel > ( ) ; break ; <nl> inline void MTPupdates_channelDifference : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPupdates_channelDifference : : MTPupdates_channelDifference ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPupdates_channelDifference : : MTPupdates_channelDifference ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_updates_channelDifferenceEmpty : data = std : : make_shared < MTPDupdates_channelDifferenceEmpty > ( ) ; break ; <nl> case mtpc_updates_channelDifferenceTooLong : data = std : : make_shared < MTPDupdates_channelDifferenceTooLong > ( ) ; break ; <nl> inline void MTPchannelMessagesFilter : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPchannelMessagesFilter : : MTPchannelMessagesFilter ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPchannelMessagesFilter : : MTPchannelMessagesFilter ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_channelMessagesFilterEmpty : break ; <nl> case mtpc_channelMessagesFilter : data = std : : make_shared < MTPDchannelMessagesFilter > ( ) ; break ; <nl> inline void MTPchannelParticipant : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPchannelParticipant : : MTPchannelParticipant ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPchannelParticipant : : MTPchannelParticipant ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_channelParticipant : data = std : : make_shared < MTPDchannelParticipant > ( ) ; break ; <nl> case mtpc_channelParticipantSelf : data = std : : make_shared < MTPDchannelParticipantSelf > ( ) ; break ; <nl> inline void MTPfoundGif : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPfoundGif : : MTPfoundGif ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPfoundGif : : MTPfoundGif ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_foundGif : data = std : : make_shared < MTPDfoundGif > ( ) ; break ; <nl> case mtpc_foundGifCached : data = std : : make_shared < MTPDfoundGifCached > ( ) ; break ; <nl> inline void MTPmessages_savedGifs : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPmessages_savedGifs : : MTPmessages_savedGifs ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPmessages_savedGifs : : MTPmessages_savedGifs ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_messages_savedGifsNotModified : break ; <nl> case mtpc_messages_savedGifs : data = std : : make_shared < MTPDmessages_savedGifs > ( ) ; break ; <nl> inline void MTPinputBotInlineMessage : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPinputBotInlineMessage : : MTPinputBotInlineMessage ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPinputBotInlineMessage : : MTPinputBotInlineMessage ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_inputBotInlineMessageMediaAuto : data = std : : make_shared < MTPDinputBotInlineMessageMediaAuto > ( ) ; break ; <nl> case mtpc_inputBotInlineMessageText : data = std : : make_shared < MTPDinputBotInlineMessageText > ( ) ; break ; <nl> inline void MTPinputBotInlineResult : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPinputBotInlineResult : : MTPinputBotInlineResult ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPinputBotInlineResult : : MTPinputBotInlineResult ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_inputBotInlineResult : data = std : : make_shared < MTPDinputBotInlineResult > ( ) ; break ; <nl> case mtpc_inputBotInlineResultPhoto : data = std : : make_shared < MTPDinputBotInlineResultPhoto > ( ) ; break ; <nl> inline void MTPbotInlineMessage : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPbotInlineMessage : : MTPbotInlineMessage ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPbotInlineMessage : : MTPbotInlineMessage ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_botInlineMessageMediaAuto : data = std : : make_shared < MTPDbotInlineMessageMediaAuto > ( ) ; break ; <nl> case mtpc_botInlineMessageText : data = std : : make_shared < MTPDbotInlineMessageText > ( ) ; break ; <nl> inline void MTPbotInlineResult : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPbotInlineResult : : MTPbotInlineResult ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPbotInlineResult : : MTPbotInlineResult ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_botInlineResult : data = std : : make_shared < MTPDbotInlineResult > ( ) ; break ; <nl> case mtpc_botInlineMediaResult : data = std : : make_shared < MTPDbotInlineMediaResult > ( ) ; break ; <nl> inline void MTPauth_sentCodeType : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPauth_sentCodeType : : MTPauth_sentCodeType ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPauth_sentCodeType : : MTPauth_sentCodeType ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_auth_sentCodeTypeApp : data = std : : make_shared < MTPDauth_sentCodeTypeApp > ( ) ; break ; <nl> case mtpc_auth_sentCodeTypeSms : data = std : : make_shared < MTPDauth_sentCodeTypeSms > ( ) ; break ; <nl> inline void MTPcontacts_topPeers : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPcontacts_topPeers : : MTPcontacts_topPeers ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPcontacts_topPeers : : MTPcontacts_topPeers ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_contacts_topPeersNotModified : break ; <nl> case mtpc_contacts_topPeers : data = std : : make_shared < MTPDcontacts_topPeers > ( ) ; break ; <nl> inline void MTPdraftMessage : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPdraftMessage : : MTPdraftMessage ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPdraftMessage : : MTPdraftMessage ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_draftMessageEmpty : break ; <nl> case mtpc_draftMessage : data = std : : make_shared < MTPDdraftMessage > ( ) ; break ; <nl> inline void MTPmessages_featuredStickers : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPmessages_featuredStickers : : MTPmessages_featuredStickers ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPmessages_featuredStickers : : MTPmessages_featuredStickers ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_messages_featuredStickersNotModified : break ; <nl> case mtpc_messages_featuredStickers : data = std : : make_shared < MTPDmessages_featuredStickers > ( ) ; break ; <nl> inline void MTPmessages_recentStickers : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPmessages_recentStickers : : MTPmessages_recentStickers ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPmessages_recentStickers : : MTPmessages_recentStickers ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_messages_recentStickersNotModified : break ; <nl> case mtpc_messages_recentStickers : data = std : : make_shared < MTPDmessages_recentStickers > ( ) ; break ; <nl> inline void MTPmessages_stickerSetInstallResult : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPmessages_stickerSetInstallResult : : MTPmessages_stickerSetInstallResult ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPmessages_stickerSetInstallResult : : MTPmessages_stickerSetInstallResult ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_messages_stickerSetInstallResultSuccess : break ; <nl> case mtpc_messages_stickerSetInstallResultArchive : data = std : : make_shared < MTPDmessages_stickerSetInstallResultArchive > ( ) ; break ; <nl> inline void MTPstickerSetCovered : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPstickerSetCovered : : MTPstickerSetCovered ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPstickerSetCovered : : MTPstickerSetCovered ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_stickerSetCovered : data = std : : make_shared < MTPDstickerSetCovered > ( ) ; break ; <nl> case mtpc_stickerSetMultiCovered : data = std : : make_shared < MTPDstickerSetMultiCovered > ( ) ; break ; <nl> inline void MTPinputStickeredMedia : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPinputStickeredMedia : : MTPinputStickeredMedia ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPinputStickeredMedia : : MTPinputStickeredMedia ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_inputStickeredMediaPhoto : data = std : : make_shared < MTPDinputStickeredMediaPhoto > ( ) ; break ; <nl> case mtpc_inputStickeredMediaDocument : data = std : : make_shared < MTPDinputStickeredMediaDocument > ( ) ; break ; <nl> inline void MTPinputGame : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPinputGame : : MTPinputGame ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPinputGame : : MTPinputGame ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_inputGameID : data = std : : make_shared < MTPDinputGameID > ( ) ; break ; <nl> case mtpc_inputGameShortName : data = std : : make_shared < MTPDinputGameShortName > ( ) ; break ; <nl> inline void MTPrichText : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPrichText : : MTPrichText ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPrichText : : MTPrichText ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_textEmpty : break ; <nl> case mtpc_textPlain : data = std : : make_shared < MTPDtextPlain > ( ) ; break ; <nl> inline void MTPpageBlock : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPpageBlock : : MTPpageBlock ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPpageBlock : : MTPpageBlock ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_pageBlockUnsupported : break ; <nl> case mtpc_pageBlockTitle : data = std : : make_shared < MTPDpageBlockTitle > ( ) ; break ; <nl> inline void MTPpage : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPpage : : MTPpage ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPpage : : MTPpage ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_pagePart : data = std : : make_shared < MTPDpagePart > ( ) ; break ; <nl> case mtpc_pageFull : data = std : : make_shared < MTPDpageFull > ( ) ; break ; <nl> inline void MTPphoneCall : : write ( mtpBuffer & to ) const { <nl> } break ; <nl> } <nl> } <nl> - inline MTPphoneCall : : MTPphoneCall ( mtpTypeId type ) : mtpDataOwner ( nullptr ) , _type ( type ) { <nl> + inline MTPphoneCall : : MTPphoneCall ( mtpTypeId type ) : _type ( type ) { <nl> switch ( type ) { <nl> case mtpc_phoneCallEmpty : data = std : : make_shared < MTPDphoneCallEmpty > ( ) ; break ; <nl> case mtpc_phoneCallWaiting : data = std : : make_shared < MTPDphoneCallWaiting > ( ) ; break ; <nl> | Remove read ( ) constructors from MTP types . | telegramdesktop/tdesktop | 02da80439b37567670d21f76362db1cf83d34770 | 2017-03-10T20:27:24Z |
mmm a / tensorflow / lite / delegates / gpu / metal / kernels / BUILD <nl> ppp b / tensorflow / lite / delegates / gpu / metal / kernels / BUILD <nl> <nl> + load ( " @ build_bazel_rules_apple / / apple : ios . bzl " , " ios_unit_test " ) <nl> + load ( " / / tensorflow / lite : special_rules . bzl " , " tflite_portable_test_suite " ) <nl> + <nl> package ( <nl> default_visibility = [ " / / visibility : public " ] , <nl> licenses = [ " notice " ] , # Apache 2 . 0 <nl> objc_library ( <nl> " / / tensorflow / lite / delegates / gpu / metal : inference_context " , <nl> ] , <nl> ) <nl> + <nl> + objc_library ( <nl> + name = " add_test_lib " , <nl> + testonly = 1 , <nl> + srcs = [ " add_test . mm " ] , <nl> + sdk_frameworks = [ " XCTest " ] , <nl> + deps = [ <nl> + " : add " , <nl> + " : test_util " , <nl> + ] , <nl> + ) <nl> + <nl> + ios_unit_test ( <nl> + name = " add_test " , <nl> + testonly = 1 , <nl> + minimum_os_version = " 9 . 0 " , <nl> + tags = [ <nl> + " notap " , <nl> + " tflite_not_portable_android " , <nl> + ] , <nl> + deps = [ " : add_test_lib " ] , <nl> + ) <nl> + <nl> + tflite_portable_test_suite ( ) <nl> new file mode 100644 <nl> index 0000000000000 . . 941ab08b20018 <nl> mmm / dev / null <nl> ppp b / tensorflow / lite / delegates / gpu / metal / kernels / add_test . mm <nl> <nl> + / * Copyright 2019 The TensorFlow Authors . All Rights Reserved . <nl> + <nl> + Licensed under the Apache License , Version 2 . 0 ( the " License " ) ; <nl> + you may not use this file except in compliance with the License . <nl> + You may obtain a copy of the License at <nl> + <nl> + http : / / www . apache . org / licenses / LICENSE - 2 . 0 <nl> + <nl> + Unless required by applicable law or agreed to in writing , software <nl> + distributed under the License is distributed on an " AS IS " BASIS , <nl> + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND , either express or implied . <nl> + See the License for the specific language governing permissions and <nl> + limitations under the License . <nl> + = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = * / <nl> + <nl> + # include " tensorflow / lite / delegates / gpu / metal / kernels / add . h " <nl> + <nl> + # import < XCTest / XCTest . h > <nl> + <nl> + # include < vector > <nl> + <nl> + # include " tensorflow / lite / delegates / gpu / common / operations . h " <nl> + # include " tensorflow / lite / delegates / gpu / common / shape . h " <nl> + # include " tensorflow / lite / delegates / gpu / common / status . h " <nl> + # include " tensorflow / lite / delegates / gpu / common / tensor . h " <nl> + # include " tensorflow / lite / delegates / gpu / common / util . h " <nl> + # include " tensorflow / lite / delegates / gpu / metal / compute_task_descriptor . h " <nl> + # include " tensorflow / lite / delegates / gpu / metal / kernels / test_util . h " <nl> + # include " tensorflow / lite / delegates / gpu / metal / runtime_options . h " <nl> + <nl> + using : : tflite : : gpu : : AddAttributes ; <nl> + using : : tflite : : gpu : : BHWC ; <nl> + using : : tflite : : gpu : : DataType ; <nl> + using : : tflite : : gpu : : metal : : CompareVectors ; <nl> + using : : tflite : : gpu : : metal : : SingleOpModel ; <nl> + using : : tflite : : gpu : : TensorRef ; <nl> + using : : tflite : : gpu : : OperationType ; <nl> + <nl> + @ interface AddTest : XCTestCase <nl> + @ end <nl> + <nl> + @ implementation AddTest <nl> + - ( void ) setUp { <nl> + [ super setUp ] ; <nl> + } <nl> + <nl> + - ( void ) testTwoInputTensorsOfTheSameShape { <nl> + TensorRef < BHWC > augend , addend , output ; <nl> + augend . type = DataType : : FLOAT32 ; <nl> + augend . ref = 0 ; <nl> + augend . shape = BHWC ( 1 , 2 , 2 , 1 ) ; <nl> + <nl> + addend . type = DataType : : FLOAT32 ; <nl> + addend . ref = 1 ; <nl> + addend . shape = BHWC ( 1 , 2 , 2 , 1 ) ; <nl> + <nl> + output . type = DataType : : FLOAT32 ; <nl> + output . ref = 2 ; <nl> + output . shape = BHWC ( 1 , 2 , 2 , 1 ) ; <nl> + <nl> + AddAttributes attr ; <nl> + SingleOpModel model ( { ToString ( OperationType : : ADD ) , std : : move ( attr ) } , { augend , addend } , { output } ) ; <nl> + XCTAssertTrue ( model . PopulateTensor ( 0 , { - 2 . 0 , 0 . 2 , 0 . 7 , 0 . 8 } ) ) ; <nl> + XCTAssertTrue ( model . PopulateTensor ( 1 , { 0 . 1 , 0 . 2 , 0 . 3 , 0 . 5 } ) ) ; <nl> + auto status = model . Invoke ( ) ; <nl> + XCTAssertTrue ( status . ok ( ) , @ " % s " , status . ToString ( ) . c_str ( ) ) ; <nl> + status = CompareVectors ( { - 1 . 9 , 0 . 4 , 1 . 0 , 1 . 3 } , model . GetOutput ( 0 ) , 1e - 6f ) ; <nl> + XCTAssertTrue ( status . ok ( ) , @ " % s " , status . ToString ( ) . c_str ( ) ) ; <nl> + } <nl> + <nl> + @ end <nl> | Metal : ' add ' operation test ( take two ) | tensorflow/tensorflow | 7103facdadb046740e7698a9a23371cb4e29c612 | 2019-07-12T17:14:42Z |
mmm a / CMakeLists . txt <nl> ppp b / CMakeLists . txt <nl> elseif ( CENTOS ) <nl> message ( " - - Building for CentOS " ) <nl> endif ( ) <nl> <nl> + # Make sure deps were built before compiling <nl> + execute_process ( <nl> + COMMAND $ { CMAKE_SOURCE_DIR } / tools / provision . sh check $ { CMAKE_BINARY_DIR } <nl> + WORKING_DIRECTORY $ { CMAKE_SOURCE_DIR } <nl> + OUTPUT_VARIABLE OSQUERY_DEPS_MESSAGE <nl> + RESULT_VARIABLE OSQUERY_DEPS_CHECK <nl> + OUTPUT_STRIP_TRAILING_WHITESPACE <nl> + ) <nl> + <nl> + if ( OSQUERY_DEPS_CHECK ) <nl> + string ( ASCII 27 Esc ) <nl> + message ( FATAL_ERROR " $ { Esc } [ 31m $ { OSQUERY_DEPS_MESSAGE } $ { Esc } [ m " ) <nl> + endif ( ) <nl> + <nl> if ( BUILD_SHARED_LIBS ) <nl> set ( USER_COMPILE_FLAGS " - fPIC " ) <nl> else ( ) <nl> | Revert " removing make deps check , as it causes automated builds to fail " | osquery/osquery | 898c6e7a40c3a080e634df5f4593bfb9c7c2e4ef | 2014-11-11T15:55:04Z |
mmm a / bindings / python / doc / examples . rst <nl> ppp b / bindings / python / doc / examples . rst <nl> Examples for logistic regression you find here : ` < https : / / github . com / Microsoft / C <nl> LSTM - based sequence classification <nl> mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - <nl> An Example for training an LSTM - based sequence classification model with embedding you find here : ` < https : / / github . com / Microsoft / CNTK / tree / master / contrib / Python / cntk / examples / LSTM / > ` _ . <nl> - A typical application would be text classification where we leverage a precomputed word - embedding . <nl> + A typical application would be text classification where we leverage a pre - computed word - embedding . <nl> This is also a good example to see how to provide * input data for sequences * and using * sparse input * . <nl> <nl> - In ` Train_sparse . txt < https : / / github . com / Microsoft / CNTK / tree / master / contrib / Python / cntk / examples / LSTM / > ` _ we have two inputs . The input * x * provides the sequence data in sparse form , while * y * provides the classes in dense form . <nl> mmm a / bindings / python / doc / gettingstarted . rst <nl> ppp b / bindings / python / doc / gettingstarted . rst <nl> In the example above , we first create a synthetic data set of 500 samples , each <nl> one - hot vector representing 0 ( ` ` [ 1 0 ] ` ` ) or 1 ( ` ` [ 0 1 ] ` ` ) . We then begin describing the topology of our network <nl> by setting up the data inputs . This is typically done using the : class : ` cntk . reader . CNTKTextFormatReader ` by reading data <nl> in from a file , but for interactive experimentation and small examples we can use the ` ` input_numpy ` ` reader to <nl> - access numpy data . <nl> + access NumPy data . <nl> <nl> Next , we define our network . In this case it ' s a simple 1 - layer network with a weight tensor and a bias . <nl> We multiply our data ` x ` with the weight tensor ` W ` and add the bias ` b ` . We then input the model prediction <nl> Examples section . <nl> How to pass Python data as train / test data <nl> ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ <nl> <nl> - The Python CNTK API allows to pass training / testing data either by specifing external input files or by using Python data directly to CNTK . <nl> - This second alternative - using internal Python data - is usefull especially if you want to do some quick experimentation with small synthetic data sets . <nl> + The Python CNTK API allows to pass training / testing data either by specifying external input files or by using Python data directly to CNTK . <nl> + This second alternative - using internal Python data - is useful especially if you want to do some quick experimentation with small synthetic data sets . <nl> In what follows you will learn in what structure these data has to be provided . <nl> <nl> Let us start with a scenario coming from one of our code examples ( ` logreg_numpy . py < https : / / github . com / Microsoft / CNTK / tree / master / contrib / Python / cntk / examples / LogReg / logreg_numpy . py > ` _ ) . <nl> - In this example we want to classify a 250 dimensional feature vector into one of two classes . In this case whe have two * inputs * : <nl> + In this example we want to classify a 250 dimensional feature vector into one of two classes . In this case we have two * inputs * : <nl> - The features values for each training item . In the example these are 500 vectors each of dimension 250 . <nl> - - The expected class . In this example the class is encoded with a two - dimensonal vector where the element for expected class is set to 1 and the other to 0 . <nl> + - The expected class . In this example the class is encoded with a two - dimensional vector where the element for expected class is set to 1 and the other to 0 . <nl> <nl> For each of these inputs we have to provide one data structure containing all training instances . <nl> <nl> You might notice that this is conceptually different to the case where we provide the data from external files using the CNTKTextReader . <nl> - In the input file for CNTKTextReader we provide data for different * inputs * of one instance on the same line , so the data from different inputs are much more interwined . <nl> + In the input file for CNTKTextReader we provide data for different * inputs * of one instance on the same line , so the data from different inputs are much more intertwined . <nl> <nl> - In Python the feature data are reprensented by a NumPy array of dimension ` ` number_of_instances X dimension_of_feature_space ` ` so in out example its a NumPy array of dimension ` ` 500 X 250 ` ` . <nl> - Likewise the expected output is reprensented by another NumPy array of dimension ` ` 500 X 2 ` ` . <nl> + In Python the feature data are represented by a NumPy array of dimension ` ` number_of_instances X dimension_of_feature_space ` ` so in out example its a NumPy array of dimension ` ` 500 X 250 ` ` . <nl> + Likewise the expected output is represented by another NumPy array of dimension ` ` 500 X 2 ` ` . <nl> <nl> Passing sequence data from Python <nl> ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ <nl> <nl> CNTK can handle sequences with arbitrary maximal length . This feature is also called * dynamic - axis * . <nl> To represent an input with a dynamic - axis in Python you have to provide each sequence as a NumPy - array where the first axis has a dimension equal to the sequence length . <nl> - The complete dataset is then just a normal one - dimensional numpy array of these sequences . <nl> + The complete dataset is then just a normal one - dimensional NumPy array of these sequences . <nl> <nl> - Take as an artifical example a sentence classification problem . Each sentence has a different number of words , i . e . it is a * sequence * of words . The individual words might each be represented by some lantent vector . <nl> + Take as an artificial example a sentence classification problem . Each sentence has a different number of words , i . e . it is a * sequence * of words . The individual words might each be represented by some latent vector . <nl> So each sentence is represented by a NumPy array of dimension ` ` sequence_length X embedding_dimension ` ` . The whole set of instances ( sentences ) is then represented by putting them into a one - dimensional array with the size equal to the number of instances . <nl> <nl> <nl> | fixed some typos | microsoft/CNTK | 057a4cbff7eb3e0b23ea30b4a2527cbb5264cdf1 | 2016-09-26T17:03:15Z |
mmm a / trunk / conf / srs . conf <nl> ppp b / trunk / conf / srs . conf <nl> vhost demo . srs . com { <nl> gop_cache on ; <nl> queue_length 30 ; <nl> forward 127 . 0 . 0 . 1 : 19350 ; <nl> + bandcheck { <nl> + enabled off ; <nl> + } <nl> hls { <nl> enabled on ; <nl> hls_path . / objs / nginx / html ; <nl> vhost dev { <nl> } <nl> } <nl> <nl> + # vhost for bandwidth check <nl> + # generally , the bandcheck vhost must be : bandcheck . srs . com , <nl> + # or need to modify the vhost of client . <nl> + vhost bandcheck . srs . com { <nl> + enabled on ; <nl> + chunk_size 65000 ; <nl> + # bandwidth check config . <nl> + bandcheck { <nl> + # whether support bandwidth check , <nl> + # default : off . <nl> + enabled on ; <nl> + # the key for server to valid , <nl> + # if invalid key , server disconnect and abort the bandwidth check . <nl> + key 35c9b402c12a7246868752e2878f7e0e ; <nl> + # the interval in seconds for bandwidth check , <nl> + # server donot allow new test request . <nl> + # default : 30 <nl> + interval 30 ; <nl> + # the max available check bandwidth in kbps . <nl> + # to avoid attack of bandwidth check . <nl> + # default : 1000 <nl> + limit_kbps 4000 ; <nl> + } <nl> + } <nl> + <nl> # set the chunk size of vhost . <nl> vhost chunksize . vhost . com { <nl> # the default chunk size is 128 , max is 65536 , <nl> old mode 100644 <nl> new mode 100755 <nl> index 090dfe80f . . 8ef6cceca <nl> mmm a / trunk / src / core / srs_core . cpp <nl> ppp b / trunk / src / core / srs_core . cpp <nl> void srs_update_system_time_ms ( ) <nl> gettimeofday ( & now , NULL ) ; <nl> <nl> / / we must convert the tv_sec / tv_usec to int64_t . <nl> - _srs_system_time_us_cache = now . tv_sec * 1000 * 1000 + now . tv_usec ; <nl> + _srs_system_time_us_cache = ( ( int64_t ) now . tv_sec ) * 1000 * 1000 + ( int64_t ) now . tv_usec ; <nl> <nl> _srs_system_time_us_cache = srs_max ( 0 , _srs_system_time_us_cache ) ; <nl> } <nl> mmm a / trunk / src / core / srs_core . hpp <nl> ppp b / trunk / src / core / srs_core . hpp <nl> <nl> The MIT License ( MIT ) <nl> <nl> Copyright ( c ) 2013 winlin <nl> - Copyright ( c ) 2013 wenjiegit <nl> <nl> Permission is hereby granted , free of charge , to any person obtaining a copy of <nl> this software and associated documentation files ( the " Software " ) , to deal in <nl> old mode 100644 <nl> new mode 100755 <nl> index aa2d1a1e3 . . 897746b5b <nl> mmm a / trunk / src / core / srs_core_config . cpp <nl> ppp b / trunk / src / core / srs_core_config . cpp <nl> <nl> The MIT License ( MIT ) <nl> <nl> Copyright ( c ) 2013 winlin <nl> - Copyright ( c ) 2013 wenjiegit <nl> <nl> Permission is hereby granted , free of charge , to any person obtaining a copy of <nl> this software and associated documentation files ( the " Software " ) , to deal in <nl> old mode 100644 <nl> new mode 100755 <nl> index d165490ea . . e9f2e3977 <nl> mmm a / trunk / src / core / srs_core_config . hpp <nl> ppp b / trunk / src / core / srs_core_config . hpp <nl> <nl> The MIT License ( MIT ) <nl> <nl> Copyright ( c ) 2013 winlin <nl> - Copyright ( c ) 2013 wenjiegit <nl> <nl> Permission is hereby granted , free of charge , to any person obtaining a copy of <nl> this software and associated documentation files ( the " Software " ) , to deal in <nl> | revert the copyrigh , only when commit feature , add the copyright field | ossrs/srs | bad6f0d3a8ca15e6f7eecd3f4b3c60109f333d00 | 2013-12-22T04:40:46Z |
mmm a / Telegram / Resources / langs / lang . strings <nl> ppp b / Telegram / Resources / langs / lang . strings <nl> Copyright ( c ) 2014 - 2017 John Preston , https : / / desktop . telegram . org <nl> " lng_admin_log_banned " = " banned { user } " ; <nl> " lng_admin_log_restricted " = " changed restrictions for { user } { until } " ; <nl> " lng_admin_log_promoted " = " changed privileges for { user } " ; <nl> + " lng_admin_log_changed_stickers_group " = " { from } changed group sticker set " ; <nl> + " lng_admin_log_removed_stickers_group " = " { from } removed group sticker set " ; <nl> " lng_admin_log_user_with_username " = " { name } ( { mention } ) " ; <nl> " lng_admin_log_restricted_forever " = " indefinitely " ; <nl> " lng_admin_log_restricted_until " = " until { date } " ; <nl> mmm a / Telegram / Resources / scheme . tl <nl> ppp b / Telegram / Resources / scheme . tl <nl> channel # cb44b1c flags : # creator : flags . 0 ? true left : flags . 2 ? true editor : flags . 3 ? tr <nl> channelForbidden # 289da732 flags : # broadcast : flags . 5 ? true megagroup : flags . 8 ? true id : int access_hash : long title : string until_date : flags . 16 ? int = Chat ; <nl> <nl> chatFull # 2e02a614 id : int participants : ChatParticipants chat_photo : Photo notify_settings : PeerNotifySettings exported_invite : ExportedChatInvite bot_info : Vector < BotInfo > = ChatFull ; <nl> - channelFull # 95cb5f57 flags : # can_view_participants : flags . 3 ? true can_set_username : flags . 6 ? true id : int about : string participants_count : flags . 0 ? int admins_count : flags . 1 ? int kicked_count : flags . 2 ? int banned_count : flags . 2 ? int read_inbox_max_id : int read_outbox_max_id : int unread_count : int chat_photo : Photo notify_settings : PeerNotifySettings exported_invite : ExportedChatInvite bot_info : Vector < BotInfo > migrated_from_chat_id : flags . 4 ? int migrated_from_max_id : flags . 4 ? int pinned_msg_id : flags . 5 ? int = ChatFull ; <nl> + channelFull # 17f45fcf flags : # can_view_participants : flags . 3 ? true can_set_username : flags . 6 ? true can_set_stickers : flags . 7 ? true id : int about : string participants_count : flags . 0 ? int admins_count : flags . 1 ? int kicked_count : flags . 2 ? int banned_count : flags . 2 ? int read_inbox_max_id : int read_outbox_max_id : int unread_count : int chat_photo : Photo notify_settings : PeerNotifySettings exported_invite : ExportedChatInvite bot_info : Vector < BotInfo > migrated_from_chat_id : flags . 4 ? int migrated_from_max_id : flags . 4 ? int pinned_msg_id : flags . 5 ? int stickerset : flags . 8 ? StickerSet = ChatFull ; <nl> <nl> chatParticipant # c8d7493e user_id : int inviter_id : int date : int = ChatParticipant ; <nl> chatParticipantCreator # da13538a user_id : int = ChatParticipant ; <nl> messageActionPaymentSent # 40699cd0 currency : string total_amount : long = MessageAct <nl> messageActionPhoneCall # 80e11a7f flags : # call_id : long reason : flags . 0 ? PhoneCallDiscardReason duration : flags . 1 ? int = MessageAction ; <nl> messageActionScreenshotTaken # 4792929b = MessageAction ; <nl> <nl> - dialog # 66ffba14 flags : # pinned : flags . 2 ? true peer : Peer top_message : int read_inbox_max_id : int read_outbox_max_id : int unread_count : int notify_settings : PeerNotifySettings pts : flags . 0 ? int draft : flags . 1 ? DraftMessage = Dialog ; <nl> + dialog # e4def5db flags : # pinned : flags . 2 ? true peer : Peer top_message : int read_inbox_max_id : int read_outbox_max_id : int unread_count : int unread_mentions_count : int notify_settings : PeerNotifySettings pts : flags . 0 ? int draft : flags . 1 ? DraftMessage = Dialog ; <nl> <nl> photoEmpty # 2331b22d id : long = Photo ; <nl> photo # 9288dd29 flags : # has_stickers : flags . 0 ? true id : long access_hash : long date : int sizes : Vector < PhotoSize > = Photo ; <nl> contactStatus # d3680c61 user_id : int status : UserStatus = ContactStatus ; <nl> contacts . link # 3ace484c my_link : ContactLink foreign_link : ContactLink user : User = contacts . Link ; <nl> <nl> contacts . contactsNotModified # b74ba9d2 = contacts . Contacts ; <nl> - contacts . contacts # 6f8b8cb2 contacts : Vector < Contact > users : Vector < User > = contacts . Contacts ; <nl> + contacts . contacts # eae87e42 contacts : Vector < Contact > saved_count : int users : Vector < User > = contacts . Contacts ; <nl> <nl> contacts . importedContacts # 77d01c3b imported : Vector < ImportedContact > popular_invites : Vector < PopularContact > retry_contacts : Vector < long > users : Vector < User > = contacts . ImportedContacts ; <nl> <nl> inputMessagesFilterChatPhotos # 3a20ecb8 = MessagesFilter ; <nl> inputMessagesFilterPhoneCalls # 80c99768 flags : # missed : flags . 0 ? true = MessagesFilter ; <nl> inputMessagesFilterRoundVoice # 7a7c17a4 = MessagesFilter ; <nl> inputMessagesFilterRoundVideo # b549da53 = MessagesFilter ; <nl> + inputMessagesFilterMyMentions # c1f8e69a = MessagesFilter ; <nl> <nl> updateNewMessage # 1f2b0afd message : Message pts : int pts_count : int = Update ; <nl> updateMessageID # 4e90bfd6 id : int random_id : long = Update ; <nl> updateBotPrecheckoutQuery # 5d2f3aa9 flags : # query_id : long user_id : int payload : byt <nl> updatePhoneCall # ab0f6b1e phone_call : PhoneCall = Update ; <nl> updateLangPackTooLong # 10c2404b = Update ; <nl> updateLangPack # 56022f4d difference : LangPackDifference = Update ; <nl> + updateFavedStickers # e511996d = Update ; <nl> + updateChannelReadMessagesContents # 89893b45 channel_id : int messages : Vector < int > = Update ; <nl> + updateContactsReset # 7084a7be = Update ; <nl> <nl> updates . state # a56c2a3e pts : int qts : int date : int seq : int unread_count : int = updates . State ; <nl> <nl> upload . fileCdnRedirect # ea52fe5a dc_id : int file_token : bytes encryption_key : bytes <nl> <nl> dcOption # 5d8c6cc flags : # ipv6 : flags . 0 ? true media_only : flags . 1 ? true tcpo_only : flags . 2 ? true cdn : flags . 3 ? true static : flags . 4 ? true id : int ip_address : string port : int = DcOption ; <nl> <nl> - config # 7feec888 flags : # phonecalls_enabled : flags . 1 ? true date : int expires : int test_mode : Bool this_dc : int dc_options : Vector < DcOption > chat_size_max : int megagroup_size_max : int forwarded_count_max : int online_update_period_ms : int offline_blur_timeout_ms : int offline_idle_timeout_ms : int online_cloud_timeout_ms : int notify_cloud_delay_ms : int notify_default_delay_ms : int chat_big_size : int push_chat_period_ms : int push_chat_limit : int saved_gifs_limit : int edit_time_limit : int rating_e_decay : int stickers_recent_limit : int tmp_sessions : flags . 0 ? int pinned_dialogs_count_max : int call_receive_timeout_ms : int call_ring_timeout_ms : int call_connect_timeout_ms : int call_packet_timeout_ms : int me_url_prefix : string suggested_lang_code : flags . 2 ? string lang_pack_version : flags . 2 ? int disabled_features : Vector < DisabledFeature > = Config ; <nl> + config # 8df376a4 flags : # phonecalls_enabled : flags . 1 ? true date : int expires : int test_mode : Bool this_dc : int dc_options : Vector < DcOption > chat_size_max : int megagroup_size_max : int forwarded_count_max : int online_update_period_ms : int offline_blur_timeout_ms : int offline_idle_timeout_ms : int online_cloud_timeout_ms : int notify_cloud_delay_ms : int notify_default_delay_ms : int chat_big_size : int push_chat_period_ms : int push_chat_limit : int saved_gifs_limit : int edit_time_limit : int rating_e_decay : int stickers_recent_limit : int stickers_faved_limit : int tmp_sessions : flags . 0 ? int pinned_dialogs_count_max : int call_receive_timeout_ms : int call_ring_timeout_ms : int call_connect_timeout_ms : int call_packet_timeout_ms : int me_url_prefix : string suggested_lang_code : flags . 2 ? string lang_pack_version : flags . 2 ? int disabled_features : Vector < DisabledFeature > = Config ; <nl> <nl> nearestDc # 8e1a1775 country : string this_dc : int nearest_dc : int = NearestDc ; <nl> <nl> contacts . resolvedPeer # 7f077ad9 peer : Peer chats : Vector < Chat > users : Vector < User > = <nl> messageRange # ae30253 min_id : int max_id : int = MessageRange ; <nl> <nl> updates . channelDifferenceEmpty # 3e11affb flags : # final : flags . 0 ? true pts : int timeout : flags . 1 ? int = updates . ChannelDifference ; <nl> - updates . channelDifferenceTooLong # 410dee07 flags : # final : flags . 0 ? true pts : int timeout : flags . 1 ? int top_message : int read_inbox_max_id : int read_outbox_max_id : int unread_count : int messages : Vector < Message > chats : Vector < Chat > users : Vector < User > = updates . ChannelDifference ; <nl> + updates . channelDifferenceTooLong # 6a9d7b35 flags : # final : flags . 0 ? true pts : int timeout : flags . 1 ? int top_message : int read_inbox_max_id : int read_outbox_max_id : int unread_count : int unread_mentions_count : int messages : Vector < Message > chats : Vector < Chat > users : Vector < User > = updates . ChannelDifference ; <nl> updates . channelDifference # 2064674e flags : # final : flags . 0 ? true pts : int timeout : flags . 1 ? int new_messages : Vector < Message > other_updates : Vector < Update > chats : Vector < Chat > users : Vector < User > = updates . ChannelDifference ; <nl> <nl> channelMessagesFilterEmpty # 94d42ee7 = ChannelMessagesFilter ; <nl> channelAdminLogEventActionParticipantLeave # f89777f2 = ChannelAdminLogEventAction <nl> channelAdminLogEventActionParticipantInvite # e31c34d8 participant : ChannelParticipant = ChannelAdminLogEventAction ; <nl> channelAdminLogEventActionParticipantToggleBan # e6d83d7e prev_participant : ChannelParticipant new_participant : ChannelParticipant = ChannelAdminLogEventAction ; <nl> channelAdminLogEventActionParticipantToggleAdmin # d5676710 prev_participant : ChannelParticipant new_participant : ChannelParticipant = ChannelAdminLogEventAction ; <nl> + channelAdminLogEventActionChangeStickerSet # b1c3caa7 prev_stickerset : InputStickerSet new_stickerset : InputStickerSet = ChannelAdminLogEventAction ; <nl> <nl> channelAdminLogEvent # 3b5a3e40 id : long date : int user_id : int action : ChannelAdminLogEventAction = ChannelAdminLogEvent ; <nl> <nl> popularContact # 5ce14175 client_id : long importers : int = PopularContact ; <nl> <nl> cdnFileHash # 77eec38f offset : int limit : int hash : bytes = CdnFileHash ; <nl> <nl> + messages . favedStickersNotModified # 9e8fa6d3 = messages . FavedStickers ; <nl> + messages . favedStickers # f37f2f16 hash : int packs : Vector < StickerPack > stickers : Vector < Document > = messages . FavedStickers ; <nl> + <nl> mmmfunctionsmmm <nl> <nl> invokeAfterMsg # cb9f372d { X : Type } msg_id : long query : ! X = X ; <nl> users . getUsers # d91a548 id : Vector < InputUser > = Vector < User > ; <nl> users . getFullUser # ca30a5b1 id : InputUser = UserFull ; <nl> <nl> contacts . getStatuses # c4a353ee = Vector < ContactStatus > ; <nl> - contacts . getContacts # 22c6aa08 hash : string = contacts . Contacts ; <nl> - contacts . importContacts # da30b32d contacts : Vector < InputContact > replace : Bool = contacts . ImportedContacts ; <nl> + contacts . getContacts # c023849f hash : int = contacts . Contacts ; <nl> + contacts . importContacts # 2c800be5 contacts : Vector < InputContact > = contacts . ImportedContacts ; <nl> contacts . deleteContact # 8e953744 id : InputUser = contacts . Link ; <nl> contacts . deleteContacts # 59ab389e id : Vector < InputUser > = Bool ; <nl> contacts . block # 332b49fc id : InputUser = Bool ; <nl> contacts . search # 11f812d8 q : string limit : int = contacts . Found ; <nl> contacts . resolveUsername # f93ccba3 username : string = contacts . ResolvedPeer ; <nl> contacts . getTopPeers # d4982db5 flags : # correspondents : flags . 0 ? true bots_pm : flags . 1 ? true bots_inline : flags . 2 ? true phone_calls : flags . 3 ? true groups : flags . 10 ? true channels : flags . 15 ? true offset : int limit : int hash : int = contacts . TopPeers ; <nl> contacts . resetTopPeerRating # 1ae373ac category : TopPeerCategory peer : InputPeer = Bool ; <nl> + contacts . resetSaved # 879537f1 = Bool ; <nl> <nl> messages . getMessages # 4222fa74 id : Vector < int > = messages . Messages ; <nl> messages . getDialogs # 191ba9c5 flags : # exclude_pinned : flags . 0 ? true offset_date : int offset_id : int offset_peer : InputPeer limit : int = messages . Dialogs ; <nl> messages . getHistory # afa92846 peer : InputPeer offset_id : int offset_date : int add_offset : int limit : int max_id : int min_id : int = messages . Messages ; <nl> - messages . search # f288a275 flags : # peer : InputPeer q : string from_id : flags . 0 ? InputUser filter : MessagesFilter min_date : int max_date : int offset : int max_id : int limit : int = messages . Messages ; <nl> + messages . search # 39e9ea0 flags : # peer : InputPeer q : string from_id : flags . 0 ? InputUser filter : MessagesFilter min_date : int max_date : int offset_id : int add_offset : int limit : int max_id : int min_id : int = messages . Messages ; <nl> messages . readHistory # e306d3a peer : InputPeer max_id : int = messages . AffectedMessages ; <nl> messages . deleteHistory # 1c015b09 flags : # just_clear : flags . 0 ? true peer : InputPeer max_id : int = messages . AffectedHistory ; <nl> messages . deleteMessages # e58e95d2 flags : # revoke : flags . 0 ? true id : Vector < int > = messages . AffectedMessages ; <nl> messages . setBotShippingResults # e5f672fa flags : # query_id : long error : flags . 0 ? stri <nl> messages . setBotPrecheckoutResults # 9c2dd95 flags : # success : flags . 1 ? true query_id : long error : flags . 0 ? string = Bool ; <nl> messages . uploadMedia # 519bc2b1 peer : InputPeer media : InputMedia = MessageMedia ; <nl> messages . sendScreenshotNotification # c97df020 peer : InputPeer reply_to_msg_id : int random_id : long = Updates ; <nl> + messages . getFavedStickers # 21ce0b0e hash : int = messages . FavedStickers ; <nl> + messages . faveSticker # b9ffc55b id : InputDocument unfave : Bool = Bool ; <nl> + messages . getUnreadMentions # 46578472 peer : InputPeer offset_id : int add_offset : int limit : int max_id : int min_id : int = messages . Messages ; <nl> <nl> updates . getState # edd4882a = updates . State ; <nl> updates . getDifference # 25939651 flags : # pts : int pts_total_limit : flags . 0 ? int date : int qts : int = updates . Difference ; <nl> channels . updatePinnedMessage # a72ded52 flags : # silent : flags . 0 ? true channel : InputC <nl> channels . getAdminedPublicChannels # 8d8d82d7 = messages . Chats ; <nl> channels . editBanned # bfd915cd channel : InputChannel user_id : InputUser banned_rights : ChannelBannedRights = Updates ; <nl> channels . getAdminLog # 33ddf480 flags : # channel : InputChannel q : string events_filter : flags . 0 ? ChannelAdminLogEventsFilter admins : flags . 1 ? Vector < InputUser > max_id : long min_id : long limit : int = channels . AdminLogResults ; <nl> + channels . setStickers # ea8ca4f9 channel : InputChannel stickerset : InputStickerSet = Bool ; <nl> + channels . readMessageContents # eab5dc38 channel : InputChannel id : Vector < int > = Bool ; <nl> <nl> bots . sendCustomRequest # aa2769ed custom_method : string params : DataJSON = DataJSON ; <nl> bots . answerWebhookJSONQuery # e6213f4d query_id : long data : DataJSON = Bool ; <nl> langpack . getStrings # 2e1ee318 lang_code : string keys : Vector < string > = Vector < LangP <nl> langpack . getDifference # b2e4d7d from_version : int = LangPackDifference ; <nl> langpack . getLanguages # 800fd57d = Vector < LangPackLanguage > ; <nl> <nl> - / / LAYER 70 <nl> + / / LAYER 71 <nl> mmm a / Telegram / SourceFiles / boxes / add_contact_box . cpp <nl> ppp b / Telegram / SourceFiles / boxes / add_contact_box . cpp <nl> void AddContactBox : : onSave ( ) { <nl> if ( _user ) { <nl> _contactId = rand_value < uint64 > ( ) ; <nl> QVector < MTPInputContact > v ( 1 , MTP_inputPhoneContact ( MTP_long ( _contactId ) , MTP_string ( _user - > phone ( ) ) , MTP_string ( firstName ) , MTP_string ( lastName ) ) ) ; <nl> - _addRequest = MTP : : send ( MTPcontacts_ImportContacts ( MTP_vector < MTPInputContact > ( v ) , MTP_bool ( false ) ) , rpcDone ( & AddContactBox : : onSaveUserDone ) , rpcFail ( & AddContactBox : : onSaveUserFail ) ) ; <nl> + _addRequest = MTP : : send ( MTPcontacts_ImportContacts ( MTP_vector < MTPInputContact > ( v ) ) , rpcDone ( & AddContactBox : : onSaveUserDone ) , rpcFail ( & AddContactBox : : onSaveUserFail ) ) ; <nl> } else { <nl> _contactId = rand_value < uint64 > ( ) ; <nl> QVector < MTPInputContact > v ( 1 , MTP_inputPhoneContact ( MTP_long ( _contactId ) , MTP_string ( phone ) , MTP_string ( firstName ) , MTP_string ( lastName ) ) ) ; <nl> - _addRequest = MTP : : send ( MTPcontacts_ImportContacts ( MTP_vector < MTPInputContact > ( v ) , MTP_bool ( false ) ) , rpcDone ( & AddContactBox : : onImportDone ) ) ; <nl> + _addRequest = MTP : : send ( MTPcontacts_ImportContacts ( MTP_vector < MTPInputContact > ( v ) ) , rpcDone ( & AddContactBox : : onImportDone ) ) ; <nl> } <nl> } <nl> <nl> mmm a / Telegram / SourceFiles / calls / calls_box_controller . cpp <nl> ppp b / Telegram / SourceFiles / calls / calls_box_controller . cpp <nl> void BoxController : : loadMoreRows ( ) { <nl> return ; <nl> } <nl> <nl> - _loadRequestId = request ( MTPmessages_Search ( MTP_flags ( 0 ) , MTP_inputPeerEmpty ( ) , MTP_string ( QString ( ) ) , MTP_inputUserEmpty ( ) , MTP_inputMessagesFilterPhoneCalls ( MTP_flags ( 0 ) ) , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( _offsetId ) , MTP_int ( _offsetId ? kFirstPageCount : kPerPageCount ) ) ) . done ( [ this ] ( const MTPmessages_Messages & result ) { <nl> + _loadRequestId = request ( MTPmessages_Search ( MTP_flags ( 0 ) , MTP_inputPeerEmpty ( ) , MTP_string ( QString ( ) ) , MTP_inputUserEmpty ( ) , MTP_inputMessagesFilterPhoneCalls ( MTP_flags ( 0 ) ) , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( _offsetId ) , MTP_int ( 0 ) , MTP_int ( _offsetId ? kFirstPageCount : kPerPageCount ) , MTP_int ( 0 ) , MTP_int ( 0 ) ) ) . done ( [ this ] ( const MTPmessages_Messages & result ) { <nl> _loadRequestId = 0 ; <nl> <nl> auto handleResult = [ this ] ( auto & data ) { <nl> mmm a / Telegram / SourceFiles / dialogs / dialogs_widget . cpp <nl> ppp b / Telegram / SourceFiles / dialogs / dialogs_widget . cpp <nl> void DialogsWidget : : dialogsReceived ( const MTPmessages_Dialogs & dialogs , mtpReque <nl> } <nl> <nl> if ( ! AuthSession : : Current ( ) . data ( ) . contactsLoaded ( ) . value ( ) & & ! _contactsRequestId ) { <nl> - _contactsRequestId = MTP : : send ( MTPcontacts_GetContacts ( MTP_string ( " " ) ) , rpcDone ( & DialogsWidget : : contactsReceived ) , rpcFail ( & DialogsWidget : : contactsFailed ) ) ; <nl> + _contactsRequestId = MTP : : send ( MTPcontacts_GetContacts ( MTP_int ( 0 ) ) , rpcDone ( & DialogsWidget : : contactsReceived ) , rpcFail ( & DialogsWidget : : contactsFailed ) ) ; <nl> } <nl> <nl> if ( dialogsList ) { <nl> bool DialogsWidget : : onSearchMessages ( bool searchCache ) { <nl> MTP : : cancel ( base : : take ( _searchRequest ) ) ; <nl> if ( _searchInPeer ) { <nl> auto flags = _searchQueryFrom ? MTP_flags ( MTPmessages_Search : : Flag : : f_from_id ) : MTP_flags ( 0 ) ; <nl> - _searchRequest = MTP : : send ( MTPmessages_Search ( flags , _searchInPeer - > input , MTP_string ( _searchQuery ) , _searchQueryFrom ? _searchQueryFrom - > inputUser : MTP_inputUserEmpty ( ) , MTP_inputMessagesFilterEmpty ( ) , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( SearchPerPage ) ) , rpcDone ( & DialogsWidget : : searchReceived , DialogsSearchPeerFromStart ) , rpcFail ( & DialogsWidget : : searchFailed , DialogsSearchPeerFromStart ) ) ; <nl> + _searchRequest = MTP : : send ( MTPmessages_Search ( flags , _searchInPeer - > input , MTP_string ( _searchQuery ) , _searchQueryFrom ? _searchQueryFrom - > inputUser : MTP_inputUserEmpty ( ) , MTP_inputMessagesFilterEmpty ( ) , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( SearchPerPage ) , MTP_int ( 0 ) , MTP_int ( 0 ) ) , rpcDone ( & DialogsWidget : : searchReceived , DialogsSearchPeerFromStart ) , rpcFail ( & DialogsWidget : : searchFailed , DialogsSearchPeerFromStart ) ) ; <nl> } else { <nl> _searchRequest = MTP : : send ( MTPmessages_SearchGlobal ( MTP_string ( _searchQuery ) , MTP_int ( 0 ) , MTP_inputPeerEmpty ( ) , MTP_int ( 0 ) , MTP_int ( SearchPerPage ) ) , rpcDone ( & DialogsWidget : : searchReceived , DialogsSearchFromStart ) , rpcFail ( & DialogsWidget : : searchFailed , DialogsSearchFromStart ) ) ; <nl> } <nl> void DialogsWidget : : onSearchMore ( ) { <nl> auto offsetId = _inner - > lastSearchId ( ) ; <nl> if ( _searchInPeer ) { <nl> auto flags = _searchQueryFrom ? MTP_flags ( MTPmessages_Search : : Flag : : f_from_id ) : MTP_flags ( 0 ) ; <nl> - _searchRequest = MTP : : send ( MTPmessages_Search ( flags , _searchInPeer - > input , MTP_string ( _searchQuery ) , _searchQueryFrom ? _searchQueryFrom - > inputUser : MTP_inputUserEmpty ( ) , MTP_inputMessagesFilterEmpty ( ) , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( offsetId ) , MTP_int ( SearchPerPage ) ) , rpcDone ( & DialogsWidget : : searchReceived , offsetId ? DialogsSearchPeerFromOffset : DialogsSearchPeerFromStart ) , rpcFail ( & DialogsWidget : : searchFailed , offsetId ? DialogsSearchPeerFromOffset : DialogsSearchPeerFromStart ) ) ; <nl> + _searchRequest = MTP : : send ( MTPmessages_Search ( flags , _searchInPeer - > input , MTP_string ( _searchQuery ) , _searchQueryFrom ? _searchQueryFrom - > inputUser : MTP_inputUserEmpty ( ) , MTP_inputMessagesFilterEmpty ( ) , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( offsetId ) , MTP_int ( 0 ) , MTP_int ( SearchPerPage ) , MTP_int ( 0 ) , MTP_int ( 0 ) ) , rpcDone ( & DialogsWidget : : searchReceived , offsetId ? DialogsSearchPeerFromOffset : DialogsSearchPeerFromStart ) , rpcFail ( & DialogsWidget : : searchFailed , offsetId ? DialogsSearchPeerFromOffset : DialogsSearchPeerFromStart ) ) ; <nl> } else { <nl> _searchRequest = MTP : : send ( MTPmessages_SearchGlobal ( MTP_string ( _searchQuery ) , MTP_int ( offsetDate ) , offsetPeer ? offsetPeer - > input : MTP_inputPeerEmpty ( ) , MTP_int ( offsetId ) , MTP_int ( SearchPerPage ) ) , rpcDone ( & DialogsWidget : : searchReceived , offsetId ? DialogsSearchFromOffset : DialogsSearchFromStart ) , rpcFail ( & DialogsWidget : : searchFailed , offsetId ? DialogsSearchFromOffset : DialogsSearchFromStart ) ) ; <nl> } <nl> void DialogsWidget : : onSearchMore ( ) { <nl> } else if ( _searchInMigrated & & ! _searchFullMigrated ) { <nl> auto offsetMigratedId = _inner - > lastSearchMigratedId ( ) ; <nl> auto flags = _searchQueryFrom ? MTP_flags ( MTPmessages_Search : : Flag : : f_from_id ) : MTP_flags ( 0 ) ; <nl> - _searchRequest = MTP : : send ( MTPmessages_Search ( flags , _searchInMigrated - > input , MTP_string ( _searchQuery ) , _searchQueryFrom ? _searchQueryFrom - > inputUser : MTP_inputUserEmpty ( ) , MTP_inputMessagesFilterEmpty ( ) , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( offsetMigratedId ) , MTP_int ( SearchPerPage ) ) , rpcDone ( & DialogsWidget : : searchReceived , offsetMigratedId ? DialogsSearchMigratedFromOffset : DialogsSearchMigratedFromStart ) , rpcFail ( & DialogsWidget : : searchFailed , offsetMigratedId ? DialogsSearchMigratedFromOffset : DialogsSearchMigratedFromStart ) ) ; <nl> + _searchRequest = MTP : : send ( MTPmessages_Search ( flags , _searchInMigrated - > input , MTP_string ( _searchQuery ) , _searchQueryFrom ? _searchQueryFrom - > inputUser : MTP_inputUserEmpty ( ) , MTP_inputMessagesFilterEmpty ( ) , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( offsetMigratedId ) , MTP_int ( 0 ) , MTP_int ( SearchPerPage ) , MTP_int ( 0 ) , MTP_int ( 0 ) ) , rpcDone ( & DialogsWidget : : searchReceived , offsetMigratedId ? DialogsSearchMigratedFromOffset : DialogsSearchMigratedFromStart ) , rpcFail ( & DialogsWidget : : searchFailed , offsetMigratedId ? DialogsSearchMigratedFromOffset : DialogsSearchMigratedFromStart ) ) ; <nl> } <nl> } <nl> } <nl> mmm a / Telegram / SourceFiles / history / history_admin_log_item . cpp <nl> ppp b / Telegram / SourceFiles / history / history_admin_log_item . cpp <nl> void GenerateItems ( gsl : : not_null < History * > history , LocalIdManager & idManager , c <nl> addPart ( HistoryMessage : : create ( history , idManager . next ( ) , bodyFlags , bodyReplyTo , bodyViaBotId , : : date ( date ) , peerToUser ( from - > id ) , QString ( ) , bodyText ) ) ; <nl> } ; <nl> <nl> + auto createChangeStickerSet = [ & ] ( const MTPDchannelAdminLogEventActionChangeStickerSet & action ) { <nl> + auto removed = ( action . vnew_stickerset . type ( ) = = mtpc_inputStickerSetEmpty ) ; <nl> + auto text = ( removed ? lng_admin_log_removed_stickers_group : lng_admin_log_changed_stickers_group ) ( lt_from , fromLinkText ) ; <nl> + addSimpleServiceMessage ( text ) ; <nl> + } ; <nl> + <nl> switch ( action . type ( ) ) { <nl> case mtpc_channelAdminLogEventActionChangeTitle : createChangeTitle ( action . c_channelAdminLogEventActionChangeTitle ( ) ) ; break ; <nl> case mtpc_channelAdminLogEventActionChangeAbout : createChangeAbout ( action . c_channelAdminLogEventActionChangeAbout ( ) ) ; break ; <nl> void GenerateItems ( gsl : : not_null < History * > history , LocalIdManager & idManager , c <nl> case mtpc_channelAdminLogEventActionParticipantInvite : createParticipantInvite ( action . c_channelAdminLogEventActionParticipantInvite ( ) ) ; break ; <nl> case mtpc_channelAdminLogEventActionParticipantToggleBan : createParticipantToggleBan ( action . c_channelAdminLogEventActionParticipantToggleBan ( ) ) ; break ; <nl> case mtpc_channelAdminLogEventActionParticipantToggleAdmin : createParticipantToggleAdmin ( action . c_channelAdminLogEventActionParticipantToggleAdmin ( ) ) ; break ; <nl> + case mtpc_channelAdminLogEventActionChangeStickerSet : createChangeStickerSet ( action . c_channelAdminLogEventActionChangeStickerSet ( ) ) ; break ; <nl> default : Unexpected ( " channelAdminLogEventAction type in AdminLog : : Item : : Item ( ) " ) ; <nl> } <nl> } <nl> mmm a / Telegram / SourceFiles / mainwidget . cpp <nl> ppp b / Telegram / SourceFiles / mainwidget . cpp <nl> bool MainWidget : : preloadOverview ( PeerData * peer , MediaOverviewType type ) { <nl> return false ; <nl> } <nl> <nl> - _overviewPreload [ type ] . insert ( peer , MTP : : send ( MTPmessages_Search ( MTP_flags ( 0 ) , peer - > input , MTP_string ( " " ) , MTP_inputUserEmpty ( ) , filter , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( 0 ) ) , rpcDone ( & MainWidget : : overviewPreloaded , peer ) , rpcFail ( & MainWidget : : overviewFailed , peer ) , 0 , 10 ) ) ; <nl> + _overviewPreload [ type ] . insert ( peer , MTP : : send ( MTPmessages_Search ( MTP_flags ( 0 ) , peer - > input , MTP_string ( " " ) , MTP_inputUserEmpty ( ) , filter , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( 0 ) ) , rpcDone ( & MainWidget : : overviewPreloaded , peer ) , rpcFail ( & MainWidget : : overviewFailed , peer ) , 0 , 10 ) ) ; <nl> return true ; <nl> } <nl> <nl> void MainWidget : : loadMediaBack ( PeerData * peer , MediaOverviewType type , bool many <nl> return ; <nl> } <nl> <nl> - _overviewLoad [ type ] . insert ( peer , MTP : : send ( MTPmessages_Search ( MTP_flags ( 0 ) , peer - > input , MTPstring ( ) , MTP_inputUserEmpty ( ) , filter , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( minId ) , MTP_int ( limit ) ) , rpcDone ( & MainWidget : : overviewLoaded , history ) ) ) ; <nl> + _overviewLoad [ type ] . insert ( peer , MTP : : send ( MTPmessages_Search ( MTP_flags ( 0 ) , peer - > input , MTPstring ( ) , MTP_inputUserEmpty ( ) , filter , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( minId ) , MTP_int ( 0 ) , MTP_int ( limit ) , MTP_int ( 0 ) , MTP_int ( 0 ) ) , rpcDone ( & MainWidget : : overviewLoaded , history ) ) ) ; <nl> } <nl> <nl> void MainWidget : : checkLastUpdate ( bool afterSleep ) { <nl> mmm a / Telegram / SourceFiles / overviewwidget . cpp <nl> ppp b / Telegram / SourceFiles / overviewwidget . cpp <nl> void OverviewInner : : preloadMore ( ) { <nl> if ( ! _searchRequest ) { <nl> MTPmessagesFilter filter = ( _type = = OverviewLinks ) ? MTP_inputMessagesFilterUrl ( ) : MTP_inputMessagesFilterDocument ( ) ; <nl> if ( ! _searchFull ) { <nl> - _searchRequest = MTP : : send ( MTPmessages_Search ( MTP_flags ( 0 ) , _history - > peer - > input , MTP_string ( _searchQuery ) , MTP_inputUserEmpty ( ) , filter , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( _lastSearchId ) , MTP_int ( SearchPerPage ) ) , rpcDone ( & OverviewInner : : searchReceived , _lastSearchId ? SearchFromOffset : SearchFromStart ) , rpcFail ( & OverviewInner : : searchFailed , _lastSearchId ? SearchFromOffset : SearchFromStart ) ) ; <nl> + _searchRequest = MTP : : send ( MTPmessages_Search ( MTP_flags ( 0 ) , _history - > peer - > input , MTP_string ( _searchQuery ) , MTP_inputUserEmpty ( ) , filter , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( _lastSearchId ) , MTP_int ( 0 ) , MTP_int ( SearchPerPage ) , MTP_int ( 0 ) , MTP_int ( 0 ) ) , rpcDone ( & OverviewInner : : searchReceived , _lastSearchId ? SearchFromOffset : SearchFromStart ) , rpcFail ( & OverviewInner : : searchFailed , _lastSearchId ? SearchFromOffset : SearchFromStart ) ) ; <nl> if ( ! _lastSearchId ) { <nl> _searchQueries . insert ( _searchRequest , _searchQuery ) ; <nl> } <nl> } else if ( _migrated & & ! _searchFullMigrated ) { <nl> - _searchRequest = MTP : : send ( MTPmessages_Search ( MTP_flags ( 0 ) , _migrated - > peer - > input , MTP_string ( _searchQuery ) , MTP_inputUserEmpty ( ) , filter , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( _lastSearchMigratedId ) , MTP_int ( SearchPerPage ) ) , rpcDone ( & OverviewInner : : searchReceived , _lastSearchMigratedId ? SearchMigratedFromOffset : SearchMigratedFromStart ) , rpcFail ( & OverviewInner : : searchFailed , _lastSearchMigratedId ? SearchMigratedFromOffset : SearchMigratedFromStart ) ) ; <nl> + _searchRequest = MTP : : send ( MTPmessages_Search ( MTP_flags ( 0 ) , _migrated - > peer - > input , MTP_string ( _searchQuery ) , MTP_inputUserEmpty ( ) , filter , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( _lastSearchMigratedId ) , MTP_int ( 0 ) , MTP_int ( SearchPerPage ) , MTP_int ( 0 ) , MTP_int ( 0 ) ) , rpcDone ( & OverviewInner : : searchReceived , _lastSearchMigratedId ? SearchMigratedFromOffset : SearchMigratedFromStart ) , rpcFail ( & OverviewInner : : searchFailed , _lastSearchMigratedId ? SearchMigratedFromOffset : SearchMigratedFromStart ) ) ; <nl> } <nl> } <nl> } else if ( App : : main ( ) ) { <nl> bool OverviewInner : : onSearchMessages ( bool searchCache ) { <nl> _searchQuery = q ; <nl> _searchFull = _searchFullMigrated = false ; <nl> auto filter = ( _type = = OverviewLinks ) ? MTP_inputMessagesFilterUrl ( ) : MTP_inputMessagesFilterDocument ( ) ; <nl> - _searchRequest = MTP : : send ( MTPmessages_Search ( MTP_flags ( 0 ) , _history - > peer - > input , MTP_string ( _searchQuery ) , MTP_inputUserEmpty ( ) , filter , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( SearchPerPage ) ) , rpcDone ( & OverviewInner : : searchReceived , SearchFromStart ) , rpcFail ( & OverviewInner : : searchFailed , SearchFromStart ) ) ; <nl> + _searchRequest = MTP : : send ( MTPmessages_Search ( MTP_flags ( 0 ) , _history - > peer - > input , MTP_string ( _searchQuery ) , MTP_inputUserEmpty ( ) , filter , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( 0 ) , MTP_int ( SearchPerPage ) , MTP_int ( 0 ) , MTP_int ( 0 ) ) , rpcDone ( & OverviewInner : : searchReceived , SearchFromStart ) , rpcFail ( & OverviewInner : : searchFailed , SearchFromStart ) ) ; <nl> _searchQueries . insert ( _searchRequest , _searchQuery ) ; <nl> } <nl> return false ; <nl> | API scheme updated to layer 71 . | telegramdesktop/tdesktop | b0cc61c621c1643c1180921a83540c59be9642a3 | 2017-08-25T09:58:12Z |
mmm a / PowerEditor / installer / nativeLang / ukrainian . xml <nl> ppp b / PowerEditor / installer / nativeLang / ukrainian . xml <nl> <nl> < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> + < ! - - <nl> + The comments are here for explanation , it ' s not necessary to translate them . <nl> + - - > <nl> < NotepadPlus > <nl> < Native - Langue name = " Українська " filename = " ukrainian . xml " version = " 7 . 9 . 1 " > <nl> < Menu > <nl> <nl> < Item subMenuId = " search - unmarkAll " name = " Зняти всі позначення " / > <nl> < Item subMenuId = " search - jumpUp " name = " Вгору " / > <nl> < Item subMenuId = " search - jumpDown " name = " Вниз " / > <nl> + < Item subMenuId = " search - copyStyledText " name = " Копіювати стиль тексту " / > <nl> < Item subMenuId = " search - bookmark " name = " Закладка " / > <nl> < Item subMenuId = " view - currentFileIn " name = " Перегляд поточного файлу в " / > <nl> < Item subMenuId = " view - showSymbol " name = " Показати символ " / > <nl> <nl> < Item id = " 42008 " name = " Збільшити відступ рядка " / > <nl> < Item id = " 42009 " name = " Зменшити відступ рядка " / > <nl> < Item id = " 42010 " name = " Дублювати рядок " / > <nl> + < Item id = " 42079 " name = " Вилучити дублікати рядків " / > <nl> < Item id = " 42077 " name = " Вилучити послідовні дублікати рядків " / > <nl> < Item id = " 42012 " name = " Розділити рядки " / > <nl> < Item id = " 42013 " name = " Об ' єднати рядки " / > <nl> <nl> < Item id = " 42029 " name = " Шлях файлу до буфера " / > <nl> < Item id = " 42030 " name = " Назву файлу до буфера " / > <nl> < Item id = " 42031 " name = " Шлях теки до буфера " / > <nl> - < Item id = " 42079 " name = " Позначений текст до буфера " / > <nl> < Item id = " 42032 " name = " Багаторазовий запуск макросу . . . " / > <nl> < Item id = " 42033 " name = " Прибрати атрибут « Лише читання » " / > <nl> < Item id = " 42035 " name = " Закоментувати рядок " / > <nl> <nl> < Item id = " 43042 " name = " Стиль 4 " / > <nl> < Item id = " 43043 " name = " Стиль 5 " / > <nl> < Item id = " 43044 " name = " Знайти стиль " / > <nl> + < Item id = " 43055 " name = " Стиль 1 " / > <nl> + < Item id = " 43056 " name = " Стиль 2 " / > <nl> + < Item id = " 43057 " name = " Стиль 3 " / > <nl> + < Item id = " 43058 " name = " Стиль 4 " / > <nl> + < Item id = " 43059 " name = " Стиль 5 " / > <nl> + < Item id = " 43060 " name = " Всі стилі " / > <nl> + < Item id = " 43061 " name = " Знайти стиль ( Позначено ) " / > <nl> < Item id = " 43045 " name = " Вікно результатів пошуку " / > <nl> < Item id = " 43046 " name = " Наступний результат пошуку " / > <nl> < Item id = " 43047 " name = " Попередній результат пошуку " / > <nl> <nl> < Item id = " 1703 " name = " & amp ; . новий рядок " / > <nl> < Item id = " 1721 " name = " ▲ " / > <nl> < Item id = " 1723 " name = " ▼ Знайти далі " / > <nl> - < Item id = " 1725 " name = " Копіювати позначений текст до буфера " / > <nl> + < Item id = " 1725 " name = " Копіювати позначений текст " / > <nl> < / Find > <nl> <nl> < FindCharsInRange title = " Знайти символи в діапазоні . . . " > <nl> <nl> < Item id = " 45001 " name = " Конвертування EOL у Windows ( CR LF ) " / > <nl> < Item id = " 45002 " name = " Конвертування EOL в Unix ( LF ) " / > <nl> < Item id = " 45003 " name = " Конвертування EOL у Macintosh ( CR ) " / > <nl> - < Item id = " 43022 " name = " Позначити результати пошуку стилем 1 " / > <nl> - < Item id = " 43024 " name = " Позначити результати пошуку стилем 2 " / > <nl> - < Item id = " 43026 " name = " Позначити результати пошуку стилем 3 " / > <nl> - < Item id = " 43028 " name = " Позначити результати пошуку стилем 4 " / > <nl> - < Item id = " 43030 " name = " Позначити результати пошуку стилем 5 " / > <nl> + < Item id = " 43022 " name = " Позначити текст Стилем 1 " / > <nl> + < Item id = " 43024 " name = " Позначити текст Стилем 2 " / > <nl> + < Item id = " 43026 " name = " Позначити текст Стилем 3 " / > <nl> + < Item id = " 43028 " name = " Позначити текст Стилем 4 " / > <nl> + < Item id = " 43030 " name = " Позначити текст Стилем 5 " / > <nl> < Item id = " 43023 " name = " Очистити позначки стилю 1 " / > <nl> < Item id = " 43025 " name = " Очистити позначки стилю 2 " / > <nl> < Item id = " 43027 " name = " Очистити позначки стилю 3 " / > <nl> <nl> < Item id = " 43042 " name = " Позначити наступне стилем 4 " / > <nl> < Item id = " 43043 " name = " Позначити наступне стилем 5 " / > <nl> < Item id = " 43044 " name = " Наступне позначено Позначкою " / > <nl> + < Item id = " 43055 " name = " Копіювати текст - Стиль 1 " / > <nl> + < Item id = " 43056 " name = " Копіювати текст - Стиль 2 " / > <nl> + < Item id = " 43057 " name = " Копіювати текст - Стиль 3 " / > <nl> + < Item id = " 43058 " name = " Копіювати текст - Стиль 4 " / > <nl> + < Item id = " 43059 " name = " Копіювати текст - Стиль 5 " / > <nl> + < Item id = " 43060 " name = " Копіювати текст - Усі стилі " / > <nl> + < Item id = " 43061 " name = " Копіювати текст - Знайти стиль ( Позначено ) " / > <nl> < Item id = " 44100 " name = " Переглянути цей файл у Firefox " / > <nl> < Item id = " 44101 " name = " Переглянути цей файл у Chrome " / > <nl> < Item id = " 44103 " name = " Переглянути цей файл в IE " / > <nl> <nl> < Item id = " 1 " name = " Гаразд " / > <nl> < Item id = " 2 " name = " Скасувати " / > <nl> < / ColumnEditor > <nl> - < FindInFinder title = " Знайти у пошуковику " > <nl> + < FindInFinder title = " Знайти в результатах пошуку " > <nl> < Item id = " 1 " name = " Знайти все " / > <nl> < Item id = " 2 " name = " Закрити " / > <nl> < Item id = " 1711 " name = " Що шукати : " / > <nl> <nl> < MessageBox > < ! - - $ INT_REPLACE $ is a place holder , don ' t translate it - - > <nl> < ContextMenuXmlEditWarning title = " Зміна contextMenu " message = " Зміна contextMenu . xml дозволяє вам змінювати випадаюче меню Notepad + + . <nl> Для застосування змін необхідно перезапустити Notepad + + . " / > <nl> - < NppHelpAbsentWarning title = " Файл не існує " message = " <nl> - не існує . Завантажте його на сайті Notepad + + . " / > <nl> < SaveCurrentModifWarning title = " Зберегти поточну модифікацію " message = " Ви повинні зберегти поточні зміни . <nl> Всі збережені зміни неможливо відмінити . <nl> <nl> - Продовжити ? " / > <nl> + Продовжити ? " / > < ! - - HowToReproduce : when you openned file is modified but unsaved yet , and you are changing file encoding . - - > <nl> < LoseUndoAbilityWarning title = " Втрата можливості відміни " message = " Ви повинні зберегти поточні зміни . <nl> Всі збережені зміни неможливо відмінити . <nl> <nl> - Продовжити ? " / > <nl> - < CannotMoveDoc title = " Перемістити в новий зразок Notepad + + " message = " Документ змінений . Збережіть його і спробуйте знову . " / > <nl> + Продовжити ? " / > < ! - - HowToReproduce : when you openned file is modified and saved , then you are changing file encoding . - - > <nl> + < CannotMoveDoc title = " Перемістити в новий зразок Notepad + + " message = " Документ змінений . Збережіть його і спробуйте знову . " / > < ! - - HowToReproduce : From your Notepad + + drag & drop a clean ( not dirty ) file to outside of Notepad + + , another instance of Notepad + + will be created . Then from your first Notepad + + drag & drop an unsaved file to the new instance . - - > <nl> < DocReloadWarning title = " Перезавантажити " message = " Ви дійсно хочете перезавантажити поточний файл і втратити зміни , зроблені в Notepad + + ? " / > <nl> < FileLockedWarning title = " Збереження невдале " message = " Перевірте , чи цей файл не відкритий в іншій програмі " / > <nl> - < FileAlreadyOpenedInNpp title = " " message = " Файл вже відкрито в Notepad + + . " / > <nl> - < DeleteFileFailed title = " Видалення файлу " message = " Не вдалося вилучити файл " / > <nl> + < FileAlreadyOpenedInNpp title = " " message = " Файл вже відкрито в Notepad + + . " / > < ! - - HowToReproduce : Open a new document and open a file " c : / tmp / foo " , save this new document by choosing " c : / tmp / foo " as file to save , reply the override popup " yes " , then this message appears . - - > <nl> + < DeleteFileFailed title = " Видалення файлу " message = " Не вдалося вилучити файл " / > < ! - - HowToReproduce : this message prevents from system failure . It ' s hard to reproduce . - - > <nl> <nl> < NbFileToOpenImportantWarning title = " Надто велика кількість файлів для відкриття " message = " $ INT_REPLACE $ файлів невдовзі будуть відкриті . <nl> - Ви дійсно хочете відкрити їх ? " / > <nl> + Ви дійсно хочете відкрити їх ? " / > < ! - - HowToReproduce : Check " Open all files of folder instead of launching Folder as Workspace on folder dropping " in " Default Directory " of Preferences dialog , then drop a folder which contains more then 200 files into Notepad + + . - - > <nl> < SettingsOnCloudError title = " Налаштування в хмарі " message = " Схоже , шлях налаштувань в хмарі встановлений на диск лише для читання , <nl> або в теку , яка потребує відповідних прав на запис . <nl> Ваші налаштування в хмарі будуть скасовані . Будь ласка , скиньте відповідні значення через діалог Налаштування . " / > <nl> - < FilePathNotFoundWarning title = " Відкриття файла " message = " Файл , який ви намагаєтесь відкрити , не існує . " / > <nl> - < SessionFileInvalidError title = " Не вдалося завантажити сеанс " message = " Файл сеансу пошкоджений , або недійсний . " / > <nl> + < FilePathNotFoundWarning title = " Відкриття файла " message = " Файл , який ви намагаєтесь відкрити , не існує . " / > < ! - - HowToReproduce : this message prevents from system failure . It ' s hard to reproduce . - - > <nl> + < SessionFileInvalidError title = " Не вдалося завантажити сеанс " message = " Файл сеансу пошкоджений , або недійсний . " / > < ! - - HowToReproduce : Save current session via menu " File - > Save Session . . . " , use another editor to modify the session you saved to make it an invalid xml file . Then load this invalid session via menu " File - > Load Session . . . " . - - > <nl> < DroppingFolderAsProjectModeWarning title = " Неприпустима дія " message = " Ви можете виключити лише файли або лише теки , але не разом , оскільки ви зараз в режимі & quot ; Тека як проєкт & quot ; . Щоб запрацювала ця операція , вам необхідно активувати & quot ; Відкривати всі файли теки , замість відкриття теки , як робочого простору & quot ; в меню & quot ; Налаштування - Типова тека & quot ; . " / > <nl> - < SortingError title = " Помилка впорядкування " message = " Не вдається виконати впорядкування за числами , через рядок $ INT_REPLACE $ . " / > <nl> + < SortingError title = " Помилка впорядкування " message = " Не вдається виконати впорядкування за числами , через рядок $ INT_REPLACE $ . " / > < ! - - HowToReproduce : this message prevents from system failure . It ' s hard to reproduce . - - > <nl> < ColumnModeTip title = " Порада для режиму стовпців " message = " Використовуйте & quot ; ALT + Вибір мишею & quot ; або & quot ; Alt + Shift + Клавіша стрілки & quot ; , щоб перемкнутися в режим стовпців . " / > <nl> - < BufferInvalidWarning title = " Не вдалося зберегти " message = " Неможливо зберегти : Неправильний буфер . " / > <nl> + < BufferInvalidWarning title = " Не вдалося зберегти " message = " Неможливо зберегти : Неправильний буфер . " / > < ! - - HowToReproduce : this message prevents from system failure . It ' s hard to reproduce . - - > <nl> < DoCloseOrNot title = " Зберегти неіснуючий файл " message = " Файл & quot ; $ STR_REPLACE $ & quot ; більше не існує . <nl> Залишити цей файл в редакторі ? " / > <nl> < DoDeleteOrNot title = " Видалити файл " message = " Файл & quot ; $ STR_REPLACE $ & quot ; <nl> <nl> <nl> Цей файл був змінений іншою програмою . <nl> Хочете перезавантажити його і втратити всі зміни , зроблені в Notepad + + ? " / > <nl> - < PrehistoricSystemDetected title = " Виявлено застарілу систему " message = " Схоже , ви все ще використовуєте застарілу систему . Шкода , але ця функція працює лише на сучасній системі . " / > <nl> + < PrehistoricSystemDetected title = " Виявлено застарілу систему " message = " Схоже , ви все ще використовуєте застарілу систему . Шкода , але ця функція працює лише на сучасній системі . " / > < ! - - HowToReproduce : Launch " Document Map " under Windows XP . - - > <nl> < XpUpdaterProblem title = " Система оновлення Notepad + + " message = " Система оновлення Notepad + + несумісна з XP , у зв ' язку із застарілою системою безпеки XP . <nl> - Хочете перейти на веб - сторінку Notepad + + для завантаження найновішої версії ? " / > <nl> + Хочете перейти на веб - сторінку Notepad + + для завантаження найновішої версії ? " / > < ! - - HowToReproduce : Run menu " ? - > Update Notepad + + " under Windows XP . - - > <nl> < GUpProxyConfNeedAdminMode title = " Параметри проксі " message = " Перезапустіть Notepad + + в режимі Адміністратора для налаштування проксі . " / > <nl> < DocTooDirtyToMonitor title = " Проблема моніторингу " message = " Документ змінено . Будь ласка , збережіть зміни перед його моніторингом . " / > <nl> < DocNoExistToMonitor title = " Проблема моніторингу " message = " Файл повинен існувати для його моніторингу . " / > <nl> - < FileTooBigToOpen title = " Проблема розміру файлу " message = " Файл завеликий для відкриття в Notepad + + " / > <nl> + < FileTooBigToOpen title = " Проблема розміру файлу " message = " Файл завеликий для відкриття в Notepad + + " / > < ! - - HowToReproduce : Try to open a 4GB file ( it ' s not easy to reproduce , it depends on your system ) . - - > <nl> < CreateNewFileOrNot title = " Створити новий файл " message = " & quot ; $ STR_REPLACE $ & quot ; не існує . Створити його ? " / > <nl> - < CreateNewFileError title = " Створити новий файл " message = " Не вдалося створить файл & quot ; $ STR_REPLACE $ & quot ; . " / > <nl> + < CreateNewFileError title = " Створити новий файл " message = " Не вдалося створить файл & quot ; $ STR_REPLACE $ & quot ; . " / > < ! - - HowToReproduce : this message prevents from system failure . It ' s hard to reproduce . - - > <nl> < OpenFileError title = " ПОМИЛКА " message = " Не вдалося відкрити файл & quot ; $ STR_REPLACE $ & quot ; . " / > <nl> - < FileBackupFailed title = " Збій резервного копіювання файлу " message = " Попередня версія файлу може бути не збережена в каталозі для резервного копіювання & quot ; $ STR_REPLACE $ & quot ; . Ви все ще хочете зберегти поточний файл ? " / > <nl> + < FileBackupFailed title = " Збій резервного копіювання файлу " message = " Попередня версія файлу може бути не збережена в каталозі для резервного копіювання & quot ; $ STR_REPLACE $ & quot ; . Ви все ще хочете зберегти поточний файл ? " / > < ! - - HowToReproduce : this message prevents from system failure . It ' s hard to reproduce . - - > <nl> < LoadStylersFailed title = " Збій завантаження stylers . xml " message = " Не вдалося завантажити & quot ; $ STR_REPLACE $ & amp ; quot ! " / > <nl> < LoadLangsFailed title = " Конфігуратор " message = " Збій завантаження langs . xml ! <nl> - Хочете відновити langs . xml ? " / > <nl> - < LoadLangsFailedFinal title = " Конфігуратор " message = " Збій завантаження langs . xml ! " / > <nl> + Хочете відновити langs . xml ? " / > < ! - - HowToReproduce : Close Notepad + + . Use another editor to remove all content of " langs . xml " ( 0 length ) then save it . Open Notepad + + . - - > <nl> + < LoadLangsFailedFinal title = " Конфігуратор " message = " Збій завантаження langs . xml ! " / > < ! - - HowToReproduce : Close Notepad + + . Use another editor to make " langs . xml " an invalid xml file then save it . Open Notepad + + . - - > <nl> < FolderAsWorspaceSubfolderExists title = " Проблема з додаванням теки в якості Робочого простору " message = " Підтека , яку ви хочете додати , вже існує . <nl> - Вилучіть її корінь з панелі перш , ніж додавати теку & quot ; $ STR_REPLACE $ & quot ; . " / > <nl> + Вилучіть її корінь з панелі перш , ніж додавати теку & quot ; $ STR_REPLACE $ & quot ; . " / > < ! - - HowToReproduce : Add a folder like " c : \ temp \ aFolder \ " into " Folder as Workspace " panel , then try to add " c : \ temp \ " . - - > <nl> <nl> < ProjectPanelChanged title = " $ STR_REPLACE $ " message = " Робоча область була змінена . Хочете зберегти її ? " / > <nl> - < ProjectPanelChangedSaveError title = " $ STR_REPLACE $ " message = " Ваша робоча область не була збережена . " / > <nl> + < ProjectPanelChangedSaveError title = " $ STR_REPLACE $ " message = " Ваша робоча область не була збережена . " / > < ! - - HowToReproduce : this message prevents from system failure . It ' s hard to reproduce . - - > <nl> < ProjectPanelOpenDoSaveDirtyWsOrNot title = " Відкрити робочу область " message = " Активна робоча область була змінена . Хочете зберегти цей проєкт ? " / > <nl> < ProjectPanelNewDoSaveDirtyWsOrNot title = " Нова робоча область " message = " Поточна робоча область була змінена . Хочете зберегти поточний проєкт ? " / > <nl> < ProjectPanelOpenFailed title = " Відкрити робочу область " message = " Не вдалося відкрити робочу область . <nl> <nl> Хочете запустити Notepad + + в режимі адміністратора ? " / > <nl> < OpenInAdminModeWithoutCloseCurrent title = " Не вдалося зберегти " message = " Не вдається зберегти файл , він може бути захищеним . <nl> Хочете запустити Notepad + + в режимі адміністратора ? " / > <nl> - < OpenInAdminModeFailed title = " Не вдалося запустити в режимі адміністратора " message = " Notepad + + не може бути відкритий в режимі адміністратора . " / > <nl> + < OpenInAdminModeFailed title = " Не вдалося запустити в режимі адміністратора " message = " Notepad + + не може бути відкритий в режимі адміністратора . " / > < ! - - HowToReproduce : When you have no Admin privilege and you try to save a modified file in a protected location ( for example : any file in sub - folder of " C : \ Program Files \ " . This message will appear after replying " Yes " to " Open in Admin mode " dialog . - - > <nl> < ViewInBrowser title = " Перегляд поточного файлу в браузері " message = " У вашій системі не вдалося знайти програму . " / > <nl> < ExitToUpdatePlugins title = " Ви збираєтеся закрити Notepad + + " message = " Якщо ви оберете ТАК , ви вийдете з Notepad + + для продовження операцій . <nl> Notepad + + перезапуститься після завершення всіх операцій . <nl> Продовжити ? " / > <nl> - < NeedToRestartToLoadPlugins title = " Необхідно перезапустити Notepad + + " message = " Необхідно перезапустити Notepad + + для завантаження встановлених плагінів . " / > <nl> + < NeedToRestartToLoadPlugins title = " Необхідно перезапустити Notepad + + " message = " Необхідно перезапустити Notepad + + для завантаження встановлених плагінів . " / > < ! - - HowToReproduce : Import a plugin via menu " Settings - > Import - > Import Plugin ( s ) . . . " . - - > <nl> < / MessageBox > <nl> < ClipboardHistory > <nl> < PanelTitle name = " Історія буфера " / > <nl> Notepad + + перезапуститься після завершення всі <nl> < / ProjectManager > <nl> < MiscStrings > <nl> < ! - - $ INT_REPLACE $ and $ STR_REPLACE $ are a place holders , don ' t translate these place holders - - > <nl> - < word - chars - list - tip value = " Це дозволяє вам включати додатковий символ у поточні символи слова при подвійному натисканні для вибору , або пошуку за допомогою параметру „ Лише цілі слова “ . " / > <nl> + < word - chars - list - tip value = " Це дозволяє вам включати додатковий символ у поточні символи слова при подвійному натисканні для вибору , або пошуку за допомогою параметру „ Лише цілі слова “ . " / > < ! - - HowToReproduce : In " Delimiter " section of Preferences dialog , hover your mouse on the " ? " button . - - > <nl> + <nl> < word - chars - list - warning - begin value = " Майте на увазі : " / > <nl> < word - chars - list - space - warning value = " $ INT_REPLACE $ пробіл ( и ) " / > <nl> < word - chars - list - tab - warning value = " $ INT_REPLACE $ TAB " / > <nl> - < word - chars - list - warning - end value = " у вашому списку символів . " / > <nl> + < word - chars - list - warning - end value = " у вашому списку символів . " / > < ! - - HowToReproduce : In " Delimiter " section of Preferences dialog , check " Add your character as part of word \ r ( don ' t choose it unless you know what you ' re doing ) " , then type a white - space in the text field . - - > <nl> < cloud - invalid - warning value = " Неправильний шлях . " / > <nl> < cloud - restart - warning value = " Перезапустіть Notepad + + для застосування змін . " / > <nl> - < cloud - select - folder value = " Виберіть теку , звідки / куди в Notepad + + читати / записувати свої параметри " / > <nl> + < cloud - select - folder value = " Виберіть теку , звідки / куди в Notepad + + читати / записувати свої параметри " / > < ! - - HowToReproduce : In " Cloud " section of Preferences dialog , check " Set your cloud location path here : " , then click the button " . . . " . This message is displayed in the " Browse For Folder " dialog . - - > <nl> < shift - change - direction - tip value = " Використовуйте Shift + Enter для пошуку у зворотному напрямку " / > <nl> < two - find - buttons - tip value = " 2 - кнопковий режим пошуку " / > <nl> < find - in - files - filter - tip value = " Знайти в cpp , cxx , h , hxx & amp ; & amp ; hpp : <nl> * . cpp * . cxx * . h * . hxx * . hpp <nl> <nl> Знайти у всіх файлах , за винятком exe , obj & amp ; & amp ; log : <nl> - * . * ! * . exe ! * . obj ! * . log " / > <nl> + * . * ! * . exe ! * . obj ! * . log " / > < ! - - HowToReproduce : Tip of mouse hovered on " Filters " label in " Find in Files " secction of Find dialog . - - > <nl> < find - status - top - reached value = " Знайти : Знайдено 1 - й збіг знизу . Було досягнуто початку документа . " / > <nl> < find - status - end - reached value = " Знайти : Знайдено 1 - й збіг згори . Було досягнуто кінця документа . " / > <nl> < find - status - replaceinfiles - 1 - replaced value = " Замінити у файлах : Виконано 1 заміну " / > <nl> Notepad + + перезапуститься після завершення всі <nl> < find - status - scope - all value = " в цілому файлі " / > <nl> < find - status - scope - backward value = " від початку файлу до каретки " / > <nl> < find - status - scope - forward value = " від каретки до кінця файлу " / > <nl> - < finder - find - in - finder value = " Знайти у цих знайдених результатах . . . " / > <nl> - < finder - close - this value = " Закрити цей пошуковик " / > <nl> + < finder - find - in - finder value = " Знайти в цих результатах пошуку . . . " / > <nl> + < finder - close - this value = " Закрити ці результати пошуку " / > <nl> < finder - collapse - all value = " Згорнути все " / > <nl> < finder - uncollapse - all value = " Розгорнути все " / > <nl> < finder - copy value = " Копіювати " / > <nl> Notepad + + перезапуститься після завершення всі <nl> < replace - in - files - confirm - filetype value = " Для типу файлу : " / > <nl> < replace - in - open - docs - confirm - title value = " Ви впевнені ? " / > <nl> < replace - in - open - docs - confirm - message value = " Ви дійсно хочете замінити всі збіги в усіх відкритих документах ? " / > <nl> - < find - result - caption value = " Знайти результат " / > <nl> + < find - result - caption value = " Результати пошуку " / > <nl> < find - result - title value = " Пошук " / > <nl> < find - result - title - info value = " ( $ INT_REPLACE1 $ збігів у $ INT_REPLACE2 $ файлах для $ INT_REPLACE3 $ пошуків ) " / > <nl> < find - result - title - info - selections value = " ( $ INT_REPLACE1 $ влучань в $ INT_REPLACE2 $ вибраних з $ INT_REPLACE3 $ шуканих ) " / > <nl> | Update ukrainian . xml | notepad-plus-plus/notepad-plus-plus | 1a9c28dacbbd9aa50aac61751d8ab8143c89144e | 2020-12-23T15:00:05Z |
mmm a / CMakeLists . txt <nl> ppp b / CMakeLists . txt <nl> set ( CXX_STANDARD_REQUIRED ON ) <nl> <nl> set ( VERSION_MAJOR 1 ) <nl> set ( VERSION_MINOR 2 ) <nl> - set ( VERSION_PATCH 3 ) <nl> + set ( VERSION_PATCH 4 ) <nl> <nl> set ( CLI_CLIENT_EXECUTABLE_NAME cleos ) <nl> set ( NODE_EXECUTABLE_NAME nodeos ) <nl> mmm a / Docker / README . md <nl> ppp b / Docker / README . md <nl> cd eos / Docker <nl> docker build . - t eosio / eos <nl> ` ` ` <nl> <nl> - The above will build off the most recent commit to the master branch by default . If you would like to target a specific branch / tag , you may use a build argument . For example , if you wished to generate a docker image based off of the v1 . 2 . 3 tag , you could do the following : <nl> + The above will build off the most recent commit to the master branch by default . If you would like to target a specific branch / tag , you may use a build argument . For example , if you wished to generate a docker image based off of the v1 . 2 . 4 tag , you could do the following : <nl> <nl> ` ` ` bash <nl> - docker build - t eosio / eos : v1 . 2 . 3 - - build - arg branch = v1 . 2 . 3 . <nl> + docker build - t eosio / eos : v1 . 2 . 4 - - build - arg branch = v1 . 2 . 4 . <nl> ` ` ` <nl> <nl> By default , the symbol in eosio . system is set to SYS . You can override this using the symbol argument while building the docker image . <nl> | Merge pull request from EOSIO / feature / bump - version - to - 1 . 2 . 4 | EOSIO/eos | 0e8dd017730cc17f6ec1fade42ba9822812ce8ef | 2018-09-05T22:21:04Z |
mmm a / src / yuzu / CMakeLists . txt <nl> ppp b / src / yuzu / CMakeLists . txt <nl> add_executable ( yuzu <nl> applets / profile_select . h <nl> applets / software_keyboard . cpp <nl> applets / software_keyboard . h <nl> + applets / web_browser . cpp <nl> + applets / web_browser . h <nl> bootmanager . cpp <nl> bootmanager . h <nl> compatibility_list . cpp <nl> if ( USE_DISCORD_PRESENCE ) <nl> target_compile_definitions ( yuzu PRIVATE - DUSE_DISCORD_PRESENCE ) <nl> endif ( ) <nl> <nl> + if ( YUZU_USE_QT_WEB_ENGINE ) <nl> + target_link_libraries ( yuzu PRIVATE Qt5 : : WebEngineCore Qt5 : : WebEngineWidgets ) <nl> + target_compile_definitions ( yuzu PRIVATE - DYUZU_USE_QT_WEB_ENGINE ) <nl> + endif ( ) <nl> + <nl> if ( UNIX AND NOT APPLE ) <nl> install ( TARGETS yuzu RUNTIME DESTINATION " $ { CMAKE_INSTALL_PREFIX } / bin " ) <nl> endif ( ) <nl> mmm a / src / yuzu / main . cpp <nl> ppp b / src / yuzu / main . cpp <nl> <nl> / / VFS includes must be before glad as they will conflict with Windows file api , which uses defines . <nl> # include " applets / profile_select . h " <nl> # include " applets / software_keyboard . h " <nl> + # include " applets / web_browser . h " <nl> # include " configuration / configure_per_general . h " <nl> # include " core / file_sys / vfs . h " <nl> # include " core / file_sys / vfs_real . h " <nl> # include " core / hle / service / acc / profile_manager . h " <nl> # include " core / hle / service / am / applets / applets . h " <nl> + # include " core / hle / service / hid / controllers / npad . h " <nl> + # include " core / hle / service / hid / hid . h " <nl> <nl> / / These are wrappers to avoid the calls to CreateDirectory and CreateFile because of the Windows <nl> / / defines . <nl> static FileSys : : VirtualFile VfsDirectoryCreateFileWrapper ( const FileSys : : Virtual <nl> # include " yuzu / discord_impl . h " <nl> # endif <nl> <nl> + # ifdef YUZU_USE_QT_WEB_ENGINE <nl> + # include < QWebEngineProfile > <nl> + # include < QWebEngineScript > <nl> + # include < QWebEngineScriptCollection > <nl> + # include < QWebEngineSettings > <nl> + # include < QWebEngineView > <nl> + # endif <nl> + <nl> # ifdef QT_STATICPLUGIN <nl> Q_IMPORT_PLUGIN ( QWindowsIntegrationPlugin ) ; <nl> # endif <nl> void GMainWindow : : SoftwareKeyboardInvokeCheckDialog ( std : : u16string error_message <nl> emit SoftwareKeyboardFinishedCheckDialog ( ) ; <nl> } <nl> <nl> + # ifdef YUZU_USE_QT_WEB_ENGINE <nl> + <nl> + void GMainWindow : : WebBrowserOpenPage ( std : : string_view filename , std : : string_view additional_args ) { <nl> + NXInputWebEngineView web_browser_view ( this ) ; <nl> + <nl> + / / Scope to contain the QProgressDialog for initalization <nl> + { <nl> + QProgressDialog progress ( this ) ; <nl> + progress . setMinimumDuration ( 200 ) ; <nl> + progress . setLabelText ( tr ( " Loading Web Applet . . . " ) ) ; <nl> + progress . setRange ( 0 , 4 ) ; <nl> + progress . setValue ( 0 ) ; <nl> + progress . show ( ) ; <nl> + <nl> + auto future = QtConcurrent : : run ( [ this ] { emit WebBrowserUnpackRomFS ( ) ; } ) ; <nl> + <nl> + while ( ! future . isFinished ( ) ) <nl> + QApplication : : processEvents ( ) ; <nl> + <nl> + progress . setValue ( 1 ) ; <nl> + <nl> + / / Load the special shim script to handle input and exit . <nl> + QWebEngineScript nx_shim ; <nl> + nx_shim . setSourceCode ( GetNXShimInjectionScript ( ) ) ; <nl> + nx_shim . setWorldId ( QWebEngineScript : : MainWorld ) ; <nl> + nx_shim . setName ( " nx_inject . js " ) ; <nl> + nx_shim . setInjectionPoint ( QWebEngineScript : : DocumentCreation ) ; <nl> + nx_shim . setRunsOnSubFrames ( true ) ; <nl> + web_browser_view . page ( ) - > profile ( ) - > scripts ( ) - > insert ( nx_shim ) ; <nl> + <nl> + web_browser_view . load ( <nl> + QUrl ( QUrl : : fromLocalFile ( QString : : fromStdString ( std : : string ( filename ) ) ) . toString ( ) + <nl> + QString : : fromStdString ( std : : string ( additional_args ) ) ) ) ; <nl> + <nl> + progress . setValue ( 2 ) ; <nl> + <nl> + render_window - > hide ( ) ; <nl> + web_browser_view . setFocus ( ) ; <nl> + <nl> + const auto & layout = render_window - > GetFramebufferLayout ( ) ; <nl> + web_browser_view . resize ( layout . screen . GetWidth ( ) , layout . screen . GetHeight ( ) ) ; <nl> + web_browser_view . move ( layout . screen . left , layout . screen . top + menuBar ( ) - > height ( ) ) ; <nl> + web_browser_view . setZoomFactor ( static_cast < qreal > ( layout . screen . GetWidth ( ) ) / <nl> + Layout : : ScreenUndocked : : Width ) ; <nl> + web_browser_view . settings ( ) - > setAttribute ( <nl> + QWebEngineSettings : : LocalContentCanAccessRemoteUrls , true ) ; <nl> + <nl> + web_browser_view . show ( ) ; <nl> + <nl> + progress . setValue ( 3 ) ; <nl> + <nl> + QApplication : : processEvents ( ) ; <nl> + <nl> + progress . setValue ( 4 ) ; <nl> + } <nl> + <nl> + bool finished = false ; <nl> + QAction * exit_action = new QAction ( tr ( " Exit Web Applet " ) , this ) ; <nl> + connect ( exit_action , & QAction : : triggered , this , [ & finished ] { finished = true ; } ) ; <nl> + ui . menubar - > addAction ( exit_action ) ; <nl> + <nl> + auto & npad = <nl> + Core : : System : : GetInstance ( ) <nl> + . ServiceManager ( ) <nl> + . GetService < Service : : HID : : Hid > ( " hid " ) <nl> + - > GetAppletResource ( ) <nl> + - > GetController < Service : : HID : : Controller_NPad > ( Service : : HID : : HidController : : NPad ) ; <nl> + <nl> + const auto fire_js_keypress = [ & web_browser_view ] ( u32 key_code ) { <nl> + web_browser_view . page ( ) - > runJavaScript ( <nl> + QStringLiteral ( " document . dispatchEvent ( new KeyboardEvent ( ' keydown ' , { ' key ' : % 1 } ) ) ; " ) <nl> + . arg ( QString : : fromStdString ( std : : to_string ( key_code ) ) ) ) ; <nl> + } ; <nl> + <nl> + bool running_exit_check = false ; <nl> + while ( ! finished ) { <nl> + QApplication : : processEvents ( ) ; <nl> + <nl> + if ( ! running_exit_check ) { <nl> + web_browser_view . page ( ) - > runJavaScript ( QStringLiteral ( " applet_done ; " ) , <nl> + [ & ] ( const QVariant & res ) { <nl> + running_exit_check = false ; <nl> + if ( res . toBool ( ) ) <nl> + finished = true ; <nl> + } ) ; <nl> + running_exit_check = true ; <nl> + } <nl> + <nl> + const auto input = npad . GetPressState ( ) ; <nl> + for ( std : : size_t i = 0 ; i < Settings : : NativeButton : : NumButtons ; + + i ) { <nl> + if ( ( input & ( 1 < < i ) ) ! = 0 ) { <nl> + LOG_DEBUG ( Frontend , " firing input for button id = { : 02X } " , i ) ; <nl> + web_browser_view . page ( ) - > runJavaScript ( <nl> + QStringLiteral ( " yuzu_key_callbacks [ % 1 ] ( ) ; " ) . arg ( i ) ) ; <nl> + } <nl> + } <nl> + <nl> + if ( input & 0x00888000 ) / / RStick Down | LStick Down | DPad Down <nl> + fire_js_keypress ( 40 ) ; / / Down Arrow Key <nl> + else if ( input & 0x00444000 ) / / RStick Right | LStick Right | DPad Right <nl> + fire_js_keypress ( 39 ) ; / / Right Arrow Key <nl> + else if ( input & 0x00222000 ) / / RStick Up | LStick Up | DPad Up <nl> + fire_js_keypress ( 38 ) ; / / Up Arrow Key <nl> + else if ( input & 0x00111000 ) / / RStick Left | LStick Left | DPad Left <nl> + fire_js_keypress ( 37 ) ; / / Left Arrow Key <nl> + else if ( input & 0x00000001 ) / / A Button <nl> + fire_js_keypress ( 13 ) ; / / Enter Key <nl> + } <nl> + <nl> + web_browser_view . hide ( ) ; <nl> + render_window - > show ( ) ; <nl> + render_window - > setFocus ( ) ; <nl> + ui . menubar - > removeAction ( exit_action ) ; <nl> + <nl> + / / Needed to update render window focus / show and remove menubar action <nl> + QApplication : : processEvents ( ) ; <nl> + emit WebBrowserFinishedBrowsing ( ) ; <nl> + } <nl> + <nl> + # else <nl> + <nl> + void GMainWindow : : WebBrowserOpenPage ( std : : string_view filename , std : : string_view additional_args ) { <nl> + QMessageBox : : warning ( <nl> + this , tr ( " Web Applet " ) , <nl> + tr ( " This version of yuzu was built without QtWebEngine support , meaning that yuzu cannot " <nl> + " properly display the game manual or web page requested . " ) , <nl> + QMessageBox : : Ok , QMessageBox : : Ok ) ; <nl> + <nl> + LOG_INFO ( Frontend , <nl> + " ( STUBBED ) called - Missing QtWebEngine dependency needed to open website page at " <nl> + " ' { } ' with arguments ' { } ' ! " , <nl> + filename , additional_args ) ; <nl> + <nl> + emit WebBrowserFinishedBrowsing ( ) ; <nl> + } <nl> + <nl> + # endif <nl> + <nl> void GMainWindow : : InitializeWidgets ( ) { <nl> # ifdef YUZU_ENABLE_COMPATIBILITY_REPORTING <nl> ui . action_Report_Compatibility - > setVisible ( true ) ; <nl> bool GMainWindow : : LoadROM ( const QString & filename ) { <nl> <nl> system . SetProfileSelector ( std : : make_unique < QtProfileSelector > ( * this ) ) ; <nl> system . SetSoftwareKeyboard ( std : : make_unique < QtSoftwareKeyboard > ( * this ) ) ; <nl> + system . SetWebBrowser ( std : : make_unique < QtWebBrowser > ( * this ) ) ; <nl> <nl> const Core : : System : : ResultStatus result { system . Load ( * render_window , filename . toStdString ( ) ) } ; <nl> <nl> void GMainWindow : : OnStartGame ( ) { <nl> qRegisterMetaType < Core : : System : : ResultStatus > ( " Core : : System : : ResultStatus " ) ; <nl> qRegisterMetaType < std : : string > ( " std : : string " ) ; <nl> qRegisterMetaType < std : : optional < std : : u16string > > ( " std : : optional < std : : u16string > " ) ; <nl> + qRegisterMetaType < std : : string_view > ( " std : : string_view " ) ; <nl> <nl> connect ( emu_thread . get ( ) , & EmuThread : : ErrorThrown , this , & GMainWindow : : OnCoreError ) ; <nl> <nl> mmm a / src / yuzu / main . h <nl> ppp b / src / yuzu / main . h <nl> class GraphicsSurfaceWidget ; <nl> class GRenderWindow ; <nl> class MicroProfileDialog ; <nl> class ProfilerWidget ; <nl> + class QLabel ; <nl> class WaitTreeWidget ; <nl> enum class GameListOpenTarget ; <nl> <nl> class RegisteredCacheUnion ; <nl> class VfsFilesystem ; <nl> } / / namespace FileSys <nl> <nl> + namespace Service : : Account { <nl> + struct UUID ; <nl> + } / / namespace Service : : Account <nl> + <nl> namespace Tegra { <nl> class DebugContext ; <nl> } <nl> class GMainWindow : public QMainWindow { <nl> void SoftwareKeyboardFinishedText ( std : : optional < std : : u16string > text ) ; <nl> void SoftwareKeyboardFinishedCheckDialog ( ) ; <nl> <nl> + void WebBrowserUnpackRomFS ( ) ; <nl> + void WebBrowserFinishedBrowsing ( ) ; <nl> + <nl> public slots : <nl> void ProfileSelectorSelectProfile ( ) ; <nl> void SoftwareKeyboardGetText ( const Core : : Frontend : : SoftwareKeyboardParameters & parameters ) ; <nl> void SoftwareKeyboardInvokeCheckDialog ( std : : u16string error_message ) ; <nl> <nl> + void WebBrowserOpenPage ( std : : string_view filename , std : : string_view arguments ) ; <nl> + <nl> private : <nl> void InitializeWidgets ( ) ; <nl> void InitializeDebugWidgets ( ) ; <nl> | main : Add main window integrations for QtWebBrowserApplet | yuzu-emu/yuzu | 45da3be40edd71195b7aac633187fc81956e3150 | 2018-12-28T20:32:39Z |
mmm a / src / library . js <nl> ppp b / src / library . js <nl> LibraryManager . library = { <nl> typeof window . prompt = = ' function ' ) { <nl> / / Browser . <nl> result = window . prompt ( ' Input : ' ) ; <nl> + if ( result = = = null ) result = ' \ x00 ' ; / / cancel = = > EOF <nl> } else if ( typeof readline = = ' function ' ) { <nl> / / Command line . <nl> result = readline ( ) ; <nl> | handle cancel in window . prompt | emscripten-core/emscripten | e43219048bb9c0de5ae2a004c4c300992d879d05 | 2012-05-14T18:15:53Z |
mmm a / src / buffer_cache / mirrored / mirrored . cc <nl> ppp b / src / buffer_cache / mirrored / mirrored . cc <nl> mc_transaction_t : : ~ mc_transaction_t ( ) { <nl> <nl> pm_snapshots_per_transaction . record ( owned_buf_snapshots . size ( ) ) ; <nl> pm_registered_snapshot_blocks - = owned_buf_snapshots . size ( ) ; <nl> + <nl> + cache_account_ . reset ( ) ; <nl> } <nl> <nl> mc_buf_t * mc_transaction_t : : allocate ( ) { <nl> | Reset the cache_account_ shared_ptr in the ~ mc_transaciton_t destructor on the right thread , this is completely retarded , we should not use shared pointers like this . | rethinkdb/rethinkdb | 9299a06dc9735a54391bd85de1cc42810eb9e95b | 2011-09-02T00:28:35Z |
mmm a / InMemoryView . cpp <nl> ppp b / InMemoryView . cpp <nl> void InMemoryView : : markDirDeleted ( <nl> auto file = it . second . get ( ) ; <nl> <nl> if ( file - > exists ) { <nl> - w_string full_name ( w_dir_path_cat_str ( dir , file - > getName ( ) ) , false ) ; <nl> + auto full_name = w_dir_path_cat_str ( dir , file - > getName ( ) ) ; <nl> w_log ( W_LOG_DBG , " mark_deleted : % s \ n " , full_name . c_str ( ) ) ; <nl> file - > exists = false ; <nl> markFileChanged ( view , file , now ) ; <nl> void InMemoryView : : ageOutFile ( <nl> watchman_file * file ) { <nl> auto parent = file - > parent ; <nl> <nl> - w_string full_name ( w_dir_path_cat_str ( parent , file - > getName ( ) ) , false ) ; <nl> + auto full_name = w_dir_path_cat_str ( parent , file - > getName ( ) ) ; <nl> w_log ( W_LOG_DBG , " age_out file = % s \ n " , full_name . c_str ( ) ) ; <nl> <nl> / / Revise tick for fresh instance reporting <nl> mmm a / pending . cpp <nl> ppp b / pending . cpp <nl> bool PendingCollectionBase : : add ( <nl> const char * name , <nl> struct timeval now , <nl> int flags ) { <nl> - w_string_t * path_str ; <nl> - bool res ; <nl> - <nl> - path_str = w_dir_path_cat_cstr ( dir , name ) ; <nl> - if ( ! path_str ) { <nl> - return false ; <nl> - } <nl> - res = add ( path_str , now , flags ) ; <nl> - w_string_delref ( path_str ) ; <nl> - <nl> - return res ; <nl> + return add ( w_dir_path_cat_cstr ( dir , name ) , now , flags ) ; <nl> } <nl> <nl> / * Append the contents of src to target , consolidating in target . <nl> mmm a / query / eval . cpp <nl> ppp b / query / eval . cpp <nl> <nl> <nl> / * Query evaluator * / <nl> <nl> - static w_string_t * compute_parent_path ( <nl> + static const w_string & compute_parent_path ( <nl> struct w_query_ctx * ctx , <nl> const watchman_file * file ) { <nl> if ( ctx - > last_parent = = file - > parent ) { <nl> return ctx - > last_parent_path ; <nl> } <nl> <nl> - if ( ctx - > last_parent_path ) { <nl> - w_string_delref ( ctx - > last_parent_path ) ; <nl> - } <nl> - <nl> - ctx - > last_parent_path = w_dir_copy_full_path ( file - > parent ) ; <nl> + ctx - > last_parent_path = file - > parent - > getFullPath ( ) ; <nl> ctx - > last_parent = file - > parent ; <nl> <nl> return ctx - > last_parent_path ; <nl> void w_match_results_free ( uint32_t num_matches , <nl> bool w_query_file_matches_relative_root ( <nl> struct w_query_ctx * ctx , <nl> const watchman_file * f ) { <nl> - w_string_t * parent_path ; <nl> bool result ; <nl> <nl> if ( ! ctx - > query - > relative_root ) { <nl> return true ; <nl> } <nl> <nl> - parent_path = compute_parent_path ( ctx , f ) ; <nl> + auto parent_path = compute_parent_path ( ctx , f ) ; <nl> / / " in relative root " here does not mean exactly the relative root , so compare <nl> / / against the relative root ' s parent . <nl> result = w_string_equal ( parent_path , ctx - > query - > relative_root ) | | <nl> w_query_ctx : : w_query_ctx ( w_query * q , const std : : shared_ptr < w_root_t > & root ) <nl> } <nl> } <nl> <nl> - w_query_ctx : : ~ w_query_ctx ( ) { <nl> - if ( last_parent_path ) { <nl> - w_string_delref ( last_parent_path ) ; <nl> - } <nl> - } <nl> - <nl> bool w_query_execute_locked ( <nl> w_query * query , <nl> const std : : shared_ptr < w_root_t > & root , <nl> mmm a / root / crawler . cpp <nl> ppp b / root / crawler . cpp <nl> void InMemoryView : : crawler ( <nl> file - > maybe_deleted = false ; <nl> } <nl> if ( ! file | | ! file - > exists | | stat_all | | recursive ) { <nl> - w_string full_path ( w_dir_path_cat_str ( dir , name ) , false ) ; <nl> + auto full_path = w_dir_path_cat_str ( dir , name ) ; <nl> w_log ( <nl> W_LOG_DBG , <nl> " in crawler calling process_path on % s \ n " , <nl> mmm a / root / dir . cpp <nl> ppp b / root / dir . cpp <nl> watchman_dir : : ~ watchman_dir ( ) { <nl> } <nl> <nl> w_string watchman_dir : : getFullPath ( ) const { <nl> - return w_string ( w_dir_copy_full_path ( this ) , false ) ; <nl> + return w_dir_path_cat_cstr_len ( this , nullptr , 0 ) ; <nl> } <nl> <nl> watchman_file * watchman_dir : : getChildFile ( w_string name ) const { <nl> mmm a / string . cpp <nl> ppp b / string . cpp <nl> w_string_t * w_string_path_cat_cstr_len ( w_string_t * parent , const char * rhs , <nl> return s ; <nl> } <nl> <nl> - w_string_t * w_dir_path_cat_cstr ( <nl> + w_string w_dir_path_cat_cstr ( <nl> const struct watchman_dir * dir , <nl> const char * extra ) { <nl> return w_dir_path_cat_cstr_len ( dir , extra , strlen_uint32 ( extra ) ) ; <nl> } <nl> <nl> - w_string_t * w_dir_path_cat_cstr_len ( <nl> + w_string w_dir_path_cat_cstr_len ( <nl> const struct watchman_dir * dir , <nl> const char * extra , <nl> uint32_t extra_len ) { <nl> w_string_t * w_dir_path_cat_cstr_len ( <nl> } <nl> <nl> s - > buf = buf ; <nl> - return s ; <nl> - } <nl> - <nl> - w_string_t * w_dir_copy_full_path ( const struct watchman_dir * dir ) { <nl> - return w_dir_path_cat_cstr_len ( dir , NULL , 0 ) ; <nl> + return w_string ( s , false ) ; <nl> } <nl> <nl> - w_string_t * w_dir_path_cat_str ( <nl> + w_string w_dir_path_cat_str ( <nl> const struct watchman_dir * dir , <nl> - w_string_t * str ) { <nl> - return w_dir_path_cat_cstr_len ( dir , str - > buf , str - > len ) ; <nl> + const w_string & str ) { <nl> + return w_dir_path_cat_cstr_len ( dir , str . data ( ) , str . size ( ) ) ; <nl> } <nl> <nl> char * w_string_dup_buf ( const w_string_t * str ) <nl> mmm a / watcher / kqueue . cpp <nl> ppp b / watcher / kqueue . cpp <nl> KQueueWatcher : : ~ KQueueWatcher ( ) { <nl> bool KQueueWatcher : : startWatchFile ( struct watchman_file * file ) { <nl> struct kevent k ; <nl> <nl> - w_string full_name ( w_dir_path_cat_str ( file - > parent , file - > getName ( ) ) , false ) ; <nl> + auto full_name = w_dir_path_cat_str ( file - > parent , file - > getName ( ) ) ; <nl> { <nl> auto rlock = maps_ . rlock ( ) ; <nl> if ( rlock - > name_to_fd . find ( full_name ) ! = rlock - > name_to_fd . end ( ) ) { <nl> struct watchman_dir_handle * KQueueWatcher : : startWatchDir ( <nl> } <nl> <nl> memset ( & k , 0 , sizeof ( k ) ) ; <nl> - w_string dir_name ( w_dir_copy_full_path ( dir ) , false ) ; <nl> + auto dir_name = dir - > getFullPath ( ) ; <nl> EV_SET ( <nl> & k , <nl> rawFd , <nl> mmm a / watcher / portfs . cpp <nl> ppp b / watcher / portfs . cpp <nl> struct watchman_dir_handle * PortFSWatcher : : startWatchDir ( <nl> const char * path ) { <nl> struct watchman_dir_handle * osdir ; <nl> struct stat st ; <nl> - w_string_t * dir_name ; <nl> <nl> osdir = w_dir_open ( path ) ; <nl> if ( ! osdir ) { <nl> struct watchman_dir_handle * PortFSWatcher : : startWatchDir ( <nl> return nullptr ; <nl> } <nl> <nl> - dir_name = w_dir_copy_full_path ( dir ) ; <nl> + auto dir_name = dir - > getFullPath ( ) ; <nl> if ( ! do_watch ( dir_name , & st ) ) { <nl> w_dir_close ( osdir ) ; <nl> w_string_delref ( dir_name ) ; <nl> mmm a / watchman_query . h <nl> ppp b / watchman_query . h <nl> struct w_query_ctx { <nl> <nl> / / Cache for dir name lookups when computing wholename <nl> watchman_dir * last_parent { nullptr } ; <nl> - w_string_t * last_parent_path { nullptr } ; <nl> + w_string last_parent_path ; <nl> <nl> / / When deduping the results , set < wholename > of <nl> / / the files held in results <nl> struct w_query_ctx { <nl> uint32_t num_deduped { 0 } ; <nl> <nl> w_query_ctx ( w_query * q , const std : : shared_ptr < w_root_t > & root ) ; <nl> - ~ w_query_ctx ( ) ; <nl> w_query_ctx ( const w_query_ctx & ) = delete ; <nl> w_query_ctx & operator = ( const w_query_ctx & ) = delete ; <nl> } ; <nl> mmm a / watchman_string . h <nl> ppp b / watchman_string . h <nl> uint32_t strlen_uint32 ( const char * str ) ; <nl> uint32_t w_string_embedded_size ( w_string_t * str ) ; <nl> void w_string_embedded_copy ( w_string_t * dest , w_string_t * src ) ; <nl> <nl> - struct watchman_dir ; <nl> - w_string_t * w_dir_copy_full_path ( const struct watchman_dir * dir ) ; <nl> - w_string_t * w_dir_path_cat_cstr_len ( <nl> - const struct watchman_dir * dir , <nl> - const char * extra , <nl> - uint32_t extra_len ) ; <nl> - w_string_t * w_dir_path_cat_cstr ( <nl> - const struct watchman_dir * dir , <nl> - const char * extra ) ; <nl> - w_string_t * w_dir_path_cat_str ( const struct watchman_dir * dir , w_string_t * str ) ; <nl> - <nl> bool w_is_path_absolute_cstr ( const char * path ) ; <nl> bool w_is_path_absolute_cstr_len ( const char * path , uint32_t len ) ; <nl> <nl> inline bool is_slash ( char c ) { <nl> <nl> class w_string ; <nl> <nl> + struct watchman_dir ; <nl> + w_string w_dir_path_cat_str ( <nl> + const struct watchman_dir * dir , <nl> + const w_string & str ) ; <nl> + w_string w_dir_path_cat_cstr_len ( <nl> + const struct watchman_dir * dir , <nl> + const char * extra , <nl> + uint32_t extra_len ) ; <nl> + w_string w_dir_path_cat_cstr ( const struct watchman_dir * dir , const char * extra ) ; <nl> + <nl> / * * Represents a view over some externally managed string storage . <nl> * It is simply a pair of pointers that define the start and end <nl> * of the valid region . * / <nl> | tidy up some dir path concatenation ; return w_string | facebook/watchman | 67b967cf11c542b7bede07fa7792f659bb733e79 | 2016-11-18T20:48:13Z |
mmm a / src / qt / transactionrecord . cpp <nl> ppp b / src / qt / transactionrecord . cpp <nl> QList < TransactionRecord > TransactionRecord : : decomposeTransaction ( const CWallet * <nl> sub . credit = nUnmatured ; <nl> } <nl> } <nl> - else if ( ! mapValue [ " from " ] . empty ( ) | | ! mapValue [ " message " ] . empty ( ) ) <nl> - { <nl> - / / Received by IP connection <nl> - sub . type = TransactionRecord : : RecvFromIP ; <nl> - if ( ! mapValue [ " from " ] . empty ( ) ) <nl> - sub . address = mapValue [ " from " ] ; <nl> - } <nl> else <nl> { <nl> + bool foundAddress = false ; <nl> / / Received by Bitcoin Address <nl> - sub . type = TransactionRecord : : RecvWithAddress ; <nl> BOOST_FOREACH ( const CTxOut & txout , wtx . vout ) <nl> { <nl> if ( wallet - > IsMine ( txout ) ) <nl> QList < TransactionRecord > TransactionRecord : : decomposeTransaction ( const CWallet * <nl> CBitcoinAddress address ; <nl> if ( ExtractAddress ( txout . scriptPubKey , address ) & & wallet - > HaveKey ( address ) ) <nl> { <nl> + sub . type = TransactionRecord : : RecvWithAddress ; <nl> sub . address = address . ToString ( ) ; <nl> + foundAddress = true ; <nl> + break ; <nl> } <nl> - break ; <nl> } <nl> } <nl> + if ( ! foundAddress ) <nl> + { <nl> + / / Received by IP connection , or other non - address transaction like OP_EVAL <nl> + sub . type = TransactionRecord : : RecvFromOther ; <nl> + sub . address = mapValue [ " from " ] ; <nl> + } <nl> } <nl> parts . append ( sub ) ; <nl> } <nl> QList < TransactionRecord > TransactionRecord : : decomposeTransaction ( const CWallet * <nl> / / from a transaction sent back to our own address . <nl> continue ; <nl> } <nl> - else if ( ! mapValue [ " to " ] . empty ( ) ) <nl> + <nl> + CBitcoinAddress address ; <nl> + if ( ExtractAddress ( txout . scriptPubKey , address ) ) <nl> { <nl> - / / Sent to IP <nl> - sub . type = TransactionRecord : : SendToIP ; <nl> - sub . address = mapValue [ " to " ] ; <nl> + / / Sent to Bitcoin Address <nl> + sub . type = TransactionRecord : : SendToAddress ; <nl> + sub . address = address . ToString ( ) ; <nl> } <nl> else <nl> { <nl> - / / Sent to Bitcoin Address <nl> - sub . type = TransactionRecord : : SendToAddress ; <nl> - CBitcoinAddress address ; <nl> - if ( ExtractAddress ( txout . scriptPubKey , address ) ) <nl> - { <nl> - sub . address = address . ToString ( ) ; <nl> - } <nl> + / / Sent to IP , or other non - address transaction like OP_EVAL <nl> + sub . type = TransactionRecord : : SendToOther ; <nl> + sub . address = mapValue [ " to " ] ; <nl> } <nl> <nl> int64 nValue = txout . nValue ; <nl> mmm a / src / qt / transactionrecord . h <nl> ppp b / src / qt / transactionrecord . h <nl> class TransactionRecord <nl> Other , <nl> Generated , <nl> SendToAddress , <nl> - SendToIP , <nl> + SendToOther , <nl> RecvWithAddress , <nl> - RecvFromIP , <nl> + RecvFromOther , <nl> SendToSelf <nl> } ; <nl> <nl> mmm a / src / qt / transactiontablemodel . cpp <nl> ppp b / src / qt / transactiontablemodel . cpp <nl> QString TransactionTableModel : : formatTxType ( const TransactionRecord * wtx ) const <nl> { <nl> case TransactionRecord : : RecvWithAddress : <nl> return tr ( " Received with " ) ; <nl> - case TransactionRecord : : RecvFromIP : <nl> - return tr ( " Received from IP " ) ; <nl> + case TransactionRecord : : RecvFromOther : <nl> + return tr ( " Received from " ) ; <nl> case TransactionRecord : : SendToAddress : <nl> + case TransactionRecord : : SendToOther : <nl> return tr ( " Sent to " ) ; <nl> - case TransactionRecord : : SendToIP : <nl> - return tr ( " Sent to IP " ) ; <nl> case TransactionRecord : : SendToSelf : <nl> return tr ( " Payment to yourself " ) ; <nl> case TransactionRecord : : Generated : <nl> QVariant TransactionTableModel : : txAddressDecoration ( const TransactionRecord * wtx <nl> case TransactionRecord : : Generated : <nl> return QIcon ( " : / icons / tx_mined " ) ; <nl> case TransactionRecord : : RecvWithAddress : <nl> - case TransactionRecord : : RecvFromIP : <nl> + case TransactionRecord : : RecvFromOther : <nl> return QIcon ( " : / icons / tx_input " ) ; <nl> case TransactionRecord : : SendToAddress : <nl> - case TransactionRecord : : SendToIP : <nl> + case TransactionRecord : : SendToOther : <nl> return QIcon ( " : / icons / tx_output " ) ; <nl> default : <nl> return QIcon ( " : / icons / tx_inout " ) ; <nl> QString TransactionTableModel : : formatTxToAddress ( const TransactionRecord * wtx , b <nl> { <nl> switch ( wtx - > type ) <nl> { <nl> - case TransactionRecord : : RecvFromIP : <nl> + case TransactionRecord : : RecvFromOther : <nl> return QString : : fromStdString ( wtx - > address ) ; <nl> case TransactionRecord : : RecvWithAddress : <nl> case TransactionRecord : : SendToAddress : <nl> return lookupAddress ( wtx - > address , tooltip ) ; <nl> - case TransactionRecord : : SendToIP : <nl> + case TransactionRecord : : SendToOther : <nl> return QString : : fromStdString ( wtx - > address ) ; <nl> case TransactionRecord : : SendToSelf : <nl> case TransactionRecord : : Generated : <nl> QVariant TransactionTableModel : : txStatusDecoration ( const TransactionRecord * wtx ) <nl> QString TransactionTableModel : : formatTooltip ( const TransactionRecord * rec ) const <nl> { <nl> QString tooltip = formatTxStatus ( rec ) + QString ( " \ n " ) + formatTxType ( rec ) ; <nl> - if ( rec - > type = = TransactionRecord : : RecvFromIP | | rec - > type = = TransactionRecord : : SendToIP | | <nl> + if ( rec - > type = = TransactionRecord : : RecvFromOther | | rec - > type = = TransactionRecord : : SendToOther | | <nl> rec - > type = = TransactionRecord : : SendToAddress | | rec - > type = = TransactionRecord : : RecvWithAddress ) <nl> { <nl> tooltip + = QString ( " " ) + formatTxToAddress ( rec , true ) ; <nl> mmm a / src / qt / transactionview . cpp <nl> ppp b / src / qt / transactionview . cpp <nl> TransactionView : : TransactionView ( QWidget * parent ) : <nl> <nl> typeWidget - > addItem ( tr ( " All " ) , TransactionFilterProxy : : ALL_TYPES ) ; <nl> typeWidget - > addItem ( tr ( " Received with " ) , TransactionFilterProxy : : TYPE ( TransactionRecord : : RecvWithAddress ) | <nl> - TransactionFilterProxy : : TYPE ( TransactionRecord : : RecvFromIP ) ) ; <nl> + TransactionFilterProxy : : TYPE ( TransactionRecord : : RecvFromOther ) ) ; <nl> typeWidget - > addItem ( tr ( " Sent to " ) , TransactionFilterProxy : : TYPE ( TransactionRecord : : SendToAddress ) | <nl> - TransactionFilterProxy : : TYPE ( TransactionRecord : : SendToIP ) ) ; <nl> + TransactionFilterProxy : : TYPE ( TransactionRecord : : SendToOther ) ) ; <nl> typeWidget - > addItem ( tr ( " To yourself " ) , TransactionFilterProxy : : TYPE ( TransactionRecord : : SendToSelf ) ) ; <nl> typeWidget - > addItem ( tr ( " Mined " ) , TransactionFilterProxy : : TYPE ( TransactionRecord : : Generated ) ) ; <nl> typeWidget - > addItem ( tr ( " Other " ) , TransactionFilterProxy : : TYPE ( TransactionRecord : : Other ) ) ; <nl> | Merge pull request from laanwj / txshowfix | bitcoin/bitcoin | 96d3bcb99690726d4c0e28355cc87c25e14f4c8d | 2012-01-03T17:24:54Z |
mmm a / modules / core / include / opencv2 / core / mat . hpp <nl> ppp b / modules / core / include / opencv2 / core / mat . hpp <nl> class CV_EXPORTS _InputArray <nl> STD_VECTOR = 3 < < KIND_SHIFT , <nl> STD_VECTOR_VECTOR = 4 < < KIND_SHIFT , <nl> STD_VECTOR_MAT = 5 < < KIND_SHIFT , <nl> - EXPR = 6 < < KIND_SHIFT , <nl> + EXPR = 6 < < KIND_SHIFT , / / ! < removed <nl> OPENGL_BUFFER = 7 < < KIND_SHIFT , <nl> CUDA_HOST_MEM = 8 < < KIND_SHIFT , <nl> CUDA_GPU_MAT = 9 < < KIND_SHIFT , <nl> mmm a / modules / core / src / matrix_expressions . cpp <nl> ppp b / modules / core / src / matrix_expressions . cpp <nl> MatExpr Mat : : mul ( InputArray m , double scale ) const <nl> CV_INSTRUMENT_REGION ( ) ; <nl> <nl> MatExpr e ; <nl> - if ( m . kind ( ) = = _InputArray : : EXPR ) <nl> - { <nl> - const MatExpr & me = * ( const MatExpr * ) m . getObj ( ) ; <nl> - me . op - > multiply ( MatExpr ( * this ) , me , e , scale ) ; <nl> - } <nl> - else <nl> - MatOp_Bin : : makeExpr ( e , ' * ' , * this , m . getMat ( ) , scale ) ; <nl> + MatOp_Bin : : makeExpr ( e , ' * ' , * this , m . getMat ( ) , scale ) ; <nl> return e ; <nl> } <nl> <nl> void MatExpr : : swap ( MatExpr & other ) <nl> <nl> _InputArray : : _InputArray ( const MatExpr & expr ) <nl> { <nl> - # if 1 <nl> if ( ! isIdentity ( expr ) ) <nl> { <nl> Mat result = expr ; / / TODO improve through refcount = = 1 of expr . a ( inplace operation is possible - except gemm ? ) <nl> _InputArray : : _InputArray ( const MatExpr & expr ) <nl> } <nl> CV_Assert ( isIdentity ( expr ) ) ; <nl> init ( FIXED_TYPE + FIXED_SIZE + MAT + ACCESS_READ , & expr . a ) ; <nl> - # else <nl> - init ( FIXED_TYPE + FIXED_SIZE + EXPR + ACCESS_READ , & expr ) ; <nl> - # endif <nl> } <nl> <nl> } / / cv : : <nl> mmm a / modules / core / src / matrix_wrap . cpp <nl> ppp b / modules / core / src / matrix_wrap . cpp <nl> Mat _InputArray : : getMat_ ( int i ) const <nl> return m - > getMat ( accessFlags ) . row ( i ) ; <nl> } <nl> <nl> - if ( k = = EXPR ) <nl> - { <nl> - CV_Assert ( i < 0 ) ; <nl> - return ( Mat ) * ( ( const MatExpr * ) obj ) ; <nl> - } <nl> - <nl> if ( k = = MATX | | k = = STD_ARRAY ) <nl> { <nl> CV_Assert ( i < 0 ) ; <nl> void _InputArray : : getMatVector ( std : : vector < Mat > & mv ) const <nl> return ; <nl> } <nl> <nl> - if ( k = = EXPR ) <nl> - { <nl> - Mat m = * ( const MatExpr * ) obj ; <nl> - int n = m . size [ 0 ] ; <nl> - mv . resize ( n ) ; <nl> - <nl> - for ( int i = 0 ; i < n ; i + + ) <nl> - mv [ i ] = m . row ( i ) ; <nl> - return ; <nl> - } <nl> - <nl> if ( k = = MATX | | k = = STD_ARRAY ) <nl> { <nl> size_t n = sz . height , esz = CV_ELEM_SIZE ( flags ) ; <nl> ogl : : Buffer _InputArray : : getOGlBuffer ( ) const <nl> <nl> int _InputArray : : kind ( ) const <nl> { <nl> - return flags & KIND_MASK ; <nl> + int k = flags & KIND_MASK ; <nl> + CV_DbgAssert ( k ! = EXPR ) ; <nl> + return k ; <nl> } <nl> <nl> int _InputArray : : rows ( int i ) const <nl> Size _InputArray : : size ( int i ) const <nl> return ( ( const Mat * ) obj ) - > size ( ) ; <nl> } <nl> <nl> - if ( k = = EXPR ) <nl> - { <nl> - CV_Assert ( i < 0 ) ; <nl> - return ( ( const MatExpr * ) obj ) - > size ( ) ; <nl> - } <nl> - <nl> if ( k = = UMAT ) <nl> { <nl> CV_Assert ( i < 0 ) ; <nl> int _InputArray : : sizend ( int * arrsz , int i ) const <nl> } <nl> else <nl> { <nl> - CV_CheckLE ( dims ( i ) , 2 , " Not supported " ) ; / / TODO Support EXPR with 3 + dims <nl> + CV_CheckLE ( dims ( i ) , 2 , " Not supported " ) ; <nl> Size sz2d = size ( i ) ; <nl> d = 2 ; <nl> if ( arrsz ) <nl> int _InputArray : : dims ( int i ) const <nl> return ( ( const Mat * ) obj ) - > dims ; <nl> } <nl> <nl> - if ( k = = EXPR ) <nl> - { <nl> - CV_Assert ( i < 0 ) ; <nl> - return ( ( const MatExpr * ) obj ) - > a . dims ; <nl> - } <nl> - <nl> if ( k = = UMAT ) <nl> { <nl> CV_Assert ( i < 0 ) ; <nl> int _InputArray : : type ( int i ) const <nl> if ( k = = UMAT ) <nl> return ( ( const UMat * ) obj ) - > type ( ) ; <nl> <nl> - if ( k = = EXPR ) <nl> - return ( ( const MatExpr * ) obj ) - > type ( ) ; <nl> - <nl> if ( k = = MATX | | k = = STD_VECTOR | | k = = STD_ARRAY | | k = = STD_VECTOR_VECTOR | | k = = STD_BOOL_VECTOR ) <nl> return CV_MAT_TYPE ( flags ) ; <nl> <nl> bool _InputArray : : empty ( ) const <nl> if ( k = = UMAT ) <nl> return ( ( const UMat * ) obj ) - > empty ( ) ; <nl> <nl> - if ( k = = EXPR ) <nl> - return false ; <nl> - <nl> if ( k = = MATX | | k = = STD_ARRAY ) <nl> return false ; <nl> <nl> bool _InputArray : : isContinuous ( int i ) const <nl> if ( k = = UMAT ) <nl> return i < 0 ? ( ( const UMat * ) obj ) - > isContinuous ( ) : true ; <nl> <nl> - if ( k = = EXPR | | k = = MATX | | k = = STD_VECTOR | | k = = STD_ARRAY | | <nl> + if ( k = = MATX | | k = = STD_VECTOR | | k = = STD_ARRAY | | <nl> k = = NONE | | k = = STD_VECTOR_VECTOR | | k = = STD_BOOL_VECTOR ) <nl> return true ; <nl> <nl> bool _InputArray : : isSubmatrix ( int i ) const <nl> if ( k = = UMAT ) <nl> return i < 0 ? ( ( const UMat * ) obj ) - > isSubmatrix ( ) : false ; <nl> <nl> - if ( k = = EXPR | | k = = MATX | | k = = STD_VECTOR | | k = = STD_ARRAY | | <nl> + if ( k = = MATX | | k = = STD_VECTOR | | k = = STD_ARRAY | | <nl> k = = NONE | | k = = STD_VECTOR_VECTOR | | k = = STD_BOOL_VECTOR ) <nl> return false ; <nl> <nl> size_t _InputArray : : offset ( int i ) const <nl> return ( ( const UMat * ) obj ) - > offset ; <nl> } <nl> <nl> - if ( k = = EXPR | | k = = MATX | | k = = STD_VECTOR | | k = = STD_ARRAY | | <nl> + if ( k = = MATX | | k = = STD_VECTOR | | k = = STD_ARRAY | | <nl> k = = NONE | | k = = STD_VECTOR_VECTOR | | k = = STD_BOOL_VECTOR ) <nl> return 0 ; <nl> <nl> size_t _InputArray : : step ( int i ) const <nl> return ( ( const UMat * ) obj ) - > step ; <nl> } <nl> <nl> - if ( k = = EXPR | | k = = MATX | | k = = STD_VECTOR | | k = = STD_ARRAY | | <nl> + if ( k = = MATX | | k = = STD_VECTOR | | k = = STD_ARRAY | | <nl> k = = NONE | | k = = STD_VECTOR_VECTOR | | k = = STD_BOOL_VECTOR ) <nl> return 0 ; <nl> <nl> void _InputArray : : copyTo ( const _OutputArray & arr ) const <nl> Mat m = getMat ( ) ; <nl> m . copyTo ( arr ) ; <nl> } <nl> - else if ( k = = EXPR ) <nl> - { <nl> - const MatExpr & e = * ( ( MatExpr * ) obj ) ; <nl> - if ( arr . kind ( ) = = MAT ) <nl> - arr . getMatRef ( ) = e ; <nl> - else <nl> - Mat ( e ) . copyTo ( arr ) ; <nl> - } <nl> else if ( k = = UMAT ) <nl> ( ( UMat * ) obj ) - > copyTo ( arr ) ; <nl> # ifdef HAVE_CUDA <nl> | core : drop EXPR handing code in InputArray | opencv/opencv | c8f1948d588bb21d1c6d58723ece3ced8c3fe53e | 2020-04-14T18:02:19Z |
mmm a / source / common / network / BUILD <nl> ppp b / source / common / network / BUILD <nl> envoy_cc_library ( <nl> " / / include / envoy / network : dns_interface " , <nl> " / / source / common / common : assert_lib " , <nl> " / / source / common / common : linked_object " , <nl> + " / / source / common / singleton : threadsafe_singleton " , <nl> ] , <nl> ) <nl> <nl> mmm a / source / common / network / apple_dns_impl . cc <nl> ppp b / source / common / network / apple_dns_impl . cc <nl> <nl> # include < string > <nl> <nl> # include " envoy / common / platform . h " <nl> + # include " envoy / event / file_event . h " <nl> <nl> # include " common / common / assert . h " <nl> # include " common / common / fmt . h " <nl> <nl> namespace Envoy { <nl> namespace Network { <nl> <nl> + void DnsService : : dnsServiceRefDeallocate ( DNSServiceRef sdRef ) { DNSServiceRefDeallocate ( sdRef ) ; } <nl> + <nl> + DNSServiceErrorType DnsService : : dnsServiceCreateConnection ( DNSServiceRef * sdRef ) { <nl> + return DNSServiceCreateConnection ( sdRef ) ; <nl> + } <nl> + <nl> + dnssd_sock_t DnsService : : dnsServiceRefSockFD ( DNSServiceRef sdRef ) { <nl> + return DNSServiceRefSockFD ( sdRef ) ; <nl> + } <nl> + <nl> + DNSServiceErrorType DnsService : : dnsServiceProcessResult ( DNSServiceRef sdRef ) { <nl> + return DNSServiceProcessResult ( sdRef ) ; <nl> + } <nl> + <nl> + DNSServiceErrorType DnsService : : dnsServiceGetAddrInfo ( DNSServiceRef * sdRef , DNSServiceFlags flags , <nl> + uint32_t interfaceIndex , <nl> + DNSServiceProtocol protocol , <nl> + const char * hostname , <nl> + DNSServiceGetAddrInfoReply callBack , <nl> + void * context ) { <nl> + return DNSServiceGetAddrInfo ( sdRef , flags , interfaceIndex , protocol , hostname , callBack , context ) ; <nl> + } <nl> + <nl> AppleDnsResolverImpl : : AppleDnsResolverImpl ( Event : : Dispatcher & dispatcher ) <nl> : dispatcher_ ( dispatcher ) { <nl> ENVOY_LOG ( debug , " Constructing DNS resolver " ) ; <nl> void AppleDnsResolverImpl : : deallocateMainSdRef ( ) { <nl> / / be removed BEFORE DNSServiceRefDeallocate ( ) is called , as this function closes the <nl> / / reference ' s socket . <nl> sd_ref_event_ . reset ( ) ; <nl> - DNSServiceRefDeallocate ( main_sd_ref_ ) ; <nl> + DnsServiceSingleton : : get ( ) . dnsServiceRefDeallocate ( main_sd_ref_ ) ; <nl> } <nl> <nl> void AppleDnsResolverImpl : : initializeMainSdRef ( ) { <nl> void AppleDnsResolverImpl : : initializeMainSdRef ( ) { <nl> / / However , using a shared connection brings some complexities detailed in the inline comments <nl> / / for kDNSServiceFlagsShareConnection in dns_sd . h , and copied ( and edited ) in this implementation <nl> / / where relevant . <nl> - auto error = DNSServiceCreateConnection ( & main_sd_ref_ ) ; <nl> - RELEASE_ASSERT ( ! error , fmt : : format ( " error ( { } ) in DNSServiceCreateConnection " , error ) ) ; <nl> + auto error = DnsServiceSingleton : : get ( ) . dnsServiceCreateConnection ( & main_sd_ref_ ) ; <nl> + RELEASE_ASSERT ( error = = kDNSServiceErr_NoError , <nl> + fmt : : format ( " error = { } in DNSServiceCreateConnection " , error ) ) ; <nl> <nl> - auto fd = DNSServiceRefSockFD ( main_sd_ref_ ) ; <nl> + auto fd = DnsServiceSingleton : : get ( ) . dnsServiceRefSockFD ( main_sd_ref_ ) ; <nl> RELEASE_ASSERT ( fd ! = - 1 , " error in DNSServiceRefSockFD " ) ; <nl> ENVOY_LOG ( debug , " DNS resolver has fd = { } " , fd ) ; <nl> <nl> void AppleDnsResolverImpl : : initializeMainSdRef ( ) { <nl> <nl> void AppleDnsResolverImpl : : onEventCallback ( uint32_t events ) { <nl> ENVOY_LOG ( debug , " DNS resolver file event ( { } ) " , events ) ; <nl> - ASSERT ( events & Event : : FileReadyType : : Read ) ; <nl> - DNSServiceErrorType error = DNSServiceProcessResult ( main_sd_ref_ ) ; <nl> + RELEASE_ASSERT ( events & Event : : FileReadyType : : Read , <nl> + fmt : : format ( " invalid FileReadyType event = { } " , events ) ) ; <nl> + DNSServiceErrorType error = DnsServiceSingleton : : get ( ) . dnsServiceProcessResult ( main_sd_ref_ ) ; <nl> if ( error ! = kDNSServiceErr_NoError ) { <nl> ENVOY_LOG ( warn , " DNS resolver error ( { } ) in DNSServiceProcessResult " , error ) ; <nl> / / Similar to receiving an error in onDNSServiceGetAddrInfoReply , an error while processing fd <nl> AppleDnsResolverImpl : : PendingResolution : : ~ PendingResolution ( ) { <nl> / / thus the DNSServiceRef is null . <nl> / / Therefore , only deallocate if the ref is not null . <nl> if ( individual_sd_ref_ ) { <nl> - DNSServiceRefDeallocate ( individual_sd_ref_ ) ; <nl> + DnsServiceSingleton : : get ( ) . dnsServiceRefDeallocate ( individual_sd_ref_ ) ; <nl> } <nl> } <nl> <nl> void AppleDnsResolverImpl : : PendingResolution : : onDNSServiceGetAddrInfoReply ( <nl> " error_code = { } , hostname = { } " , <nl> dns_name_ , flags , flags & kDNSServiceFlagsMoreComing ? " yes " : " no " , <nl> flags & kDNSServiceFlagsAdd ? " yes " : " no " , interface_index , error_code , hostname ) ; <nl> - ASSERT ( interface_index = = 0 ) ; <nl> + RELEASE_ASSERT ( interface_index = = 0 , <nl> + fmt : : format ( " unexpected interface_index = { } " , interface_index ) ) ; <nl> + <nl> + if ( ! pending_cb_ ) { <nl> + pending_cb_ = { ResolutionStatus : : Success , { } } ; <nl> + parent_ . addPendingQuery ( this ) ; <nl> + } <nl> <nl> / / Generic error handling . <nl> if ( error_code ! = kDNSServiceErr_NoError ) { <nl> / / TODO ( junr03 ) : consider creating stats for known error types ( timeout , refused connection , <nl> / / etc . ) . Currently a bit challenging because there is no scope access wired through . Current <nl> / / query gets a failure status <nl> - if ( ! pending_cb_ ) { <nl> - ENVOY_LOG ( warn , " [ Error path ] Adding to queries pending callback " ) ; <nl> - pending_cb_ = { ResolutionStatus : : Failure , { } } ; <nl> - parent_ . addPendingQuery ( this ) ; <nl> - } else { <nl> - ENVOY_LOG ( warn , " [ Error path ] Changing status for query already pending flush " ) ; <nl> - pending_cb_ - > status_ = ResolutionStatus : : Failure ; <nl> - } <nl> + <nl> + pending_cb_ - > status_ = ResolutionStatus : : Failure ; <nl> + pending_cb_ - > responses_ . clear ( ) ; <nl> <nl> ENVOY_LOG ( warn , " [ Error path ] DNS Resolver flushing queries pending callback " ) ; <nl> parent_ . flushPendingQueries ( true / * with_error * / ) ; <nl> void AppleDnsResolverImpl : : PendingResolution : : onDNSServiceGetAddrInfoReply ( <nl> return ; <nl> } <nl> <nl> - / / Only add this address to the list if kDNSServiceFlagsAdd is set . Callback targets are purely <nl> + / / Only add this address to the list if kDNSServiceFlagsAdd is set . Callback targets are only <nl> / / additive . <nl> if ( flags & kDNSServiceFlagsAdd ) { <nl> + ASSERT ( address , " invalid to add null address " ) ; <nl> auto dns_response = buildDnsResponse ( address , ttl ) ; <nl> ENVOY_LOG ( debug , " Address to add address = { } , ttl = { } " , <nl> dns_response . address_ - > ip ( ) - > addressAsString ( ) , ttl ) ; <nl> - <nl> - if ( ! pending_cb_ ) { <nl> - ENVOY_LOG ( debug , " Adding to queries pending callback " ) ; <nl> - pending_cb_ = { ResolutionStatus : : Success , { dns_response } } ; <nl> - parent_ . addPendingQuery ( this ) ; <nl> - } else { <nl> - ENVOY_LOG ( debug , " New address for query already pending flush " ) ; <nl> - pending_cb_ - > responses_ . push_back ( dns_response ) ; <nl> - } <nl> + pending_cb_ - > responses_ . push_back ( dns_response ) ; <nl> } <nl> <nl> if ( ! ( flags & kDNSServiceFlagsMoreComing ) ) { <nl> AppleDnsResolverImpl : : PendingResolution : : dnsServiceGetAddrInfo ( DnsLookupFamily d <nl> / / TODO : explore caching : there are caching flags in the dns_sd . h flags , allow expired answers <nl> / / from the cache ? <nl> / / TODO : explore validation via DNSSEC ? <nl> - return DNSServiceGetAddrInfo ( <nl> + return DnsServiceSingleton : : get ( ) . dnsServiceGetAddrInfo ( <nl> & individual_sd_ref_ , kDNSServiceFlagsShareConnection | kDNSServiceFlagsTimeout , 0 , protocol , <nl> dns_name_ . c_str ( ) , <nl> / * <nl> mmm a / source / common / network / apple_dns_impl . h <nl> ppp b / source / common / network / apple_dns_impl . h <nl> <nl> # include " common / common / linked_object . h " <nl> # include " common / common / logger . h " <nl> # include " common / common / utility . h " <nl> + # include " common / singleton / threadsafe_singleton . h " <nl> <nl> # include " absl / container / node_hash_map . h " <nl> <nl> namespace Envoy { <nl> namespace Network { <nl> <nl> + / / This abstraction allows for finer control in tests by using a mocked API . Production code simply <nl> + / / forwards the function calls to Apple ' s API . <nl> + class DnsService { <nl> + public : <nl> + virtual ~ DnsService ( ) = default ; <nl> + virtual void dnsServiceRefDeallocate ( DNSServiceRef sdRef ) ; <nl> + virtual DNSServiceErrorType dnsServiceCreateConnection ( DNSServiceRef * sdRef ) ; <nl> + virtual dnssd_sock_t dnsServiceRefSockFD ( DNSServiceRef sdRef ) ; <nl> + virtual DNSServiceErrorType dnsServiceProcessResult ( DNSServiceRef sdRef ) ; <nl> + virtual DNSServiceErrorType <nl> + dnsServiceGetAddrInfo ( DNSServiceRef * sdRef , DNSServiceFlags flags , uint32_t interfaceIndex , <nl> + DNSServiceProtocol protocol , const char * hostname , <nl> + DNSServiceGetAddrInfoReply callBack , void * context ) ; <nl> + } ; <nl> + <nl> + using DnsServiceSingleton = ThreadSafeSingleton < DnsService > ; <nl> + <nl> / * * <nl> * Implementation of DnsResolver that uses Apple dns_sd . h APIs . All calls and callbacks are assumed <nl> * to happen on the thread that owns the creating dispatcher . <nl> mmm a / test / common / network / BUILD <nl> ppp b / test / common / network / BUILD <nl> envoy_cc_test ( <nl> " / / bazel : apple " : [ " apple_dns_impl_test . cc " ] , <nl> " / / conditions : default " : [ ] , <nl> } ) , <nl> + external_deps = [ " abseil_synchronization " ] , <nl> deps = [ <nl> " / / include / envoy / event : dispatcher_interface " , <nl> - " / / include / envoy / network : address_interface " , <nl> " / / include / envoy / network : dns_interface " , <nl> - " / / source / common / buffer : buffer_lib " , <nl> " / / source / common / event : dispatcher_includes " , <nl> + " / / include / envoy / event : file_event_interface " , <nl> " / / source / common / event : dispatcher_lib " , <nl> " / / source / common / network : address_lib " , <nl> - " / / source / common / network : filter_lib " , <nl> - " / / source / common / network : listen_socket_lib " , <nl> - " / / source / common / stats : stats_lib " , <nl> - " / / source / common / stream_info : stream_info_lib " , <nl> - " / / test / mocks / network : network_mocks " , <nl> " / / test / test_common : environment_lib " , <nl> " / / test / test_common : network_utility_lib " , <nl> " / / test / test_common : utility_lib " , <nl> " @ envoy_api / / envoy / config / core / v3 : pkg_cc_proto " , <nl> - " / / test / mocks / local_info : local_info_mocks " , <nl> - " / / test / mocks / protobuf : protobuf_mocks " , <nl> - " / / test / mocks / runtime : runtime_mocks " , <nl> - " / / test / mocks / thread_local : thread_local_mocks " , <nl> + " / / test / test_common : threadsafe_singleton_injector_lib " , <nl> + " / / test / mocks / event : event_mocks " , <nl> ] + select ( { <nl> - " / / bazel : apple " : [ " / / source / common / network : dns_lib " ] , <nl> + " / / bazel : apple " : [ <nl> + " / / source / common / network : dns_lib " , <nl> + ] , <nl> " / / conditions : default " : [ ] , <nl> } ) , <nl> ) <nl> mmm a / test / common / network / apple_dns_impl_test . cc <nl> ppp b / test / common / network / apple_dns_impl_test . cc <nl> <nl> + # include < dns_sd . h > <nl> + <nl> # include < list > <nl> - # include < memory > <nl> # include < string > <nl> - # include < vector > <nl> <nl> # include " envoy / common / platform . h " <nl> # include " envoy / config / core / v3 / address . pb . h " <nl> # include " envoy / event / dispatcher . h " <nl> + # include " envoy / event / file_event . h " <nl> # include " envoy / network / address . h " <nl> # include " envoy / network / dns . h " <nl> <nl> - # include " common / buffer / buffer_impl . h " <nl> - # include " common / common / utility . h " <nl> # include " common / event / dispatcher_impl . h " <nl> # include " common / network / address_impl . h " <nl> # include " common / network / apple_dns_impl . h " <nl> - # include " common / network / filter_impl . h " <nl> - # include " common / network / listen_socket_impl . h " <nl> # include " common / network / utility . h " <nl> - # include " common / runtime / runtime_impl . h " <nl> - # include " common / stream_info / stream_info_impl . h " <nl> - <nl> - # include " test / mocks / common . h " <nl> - # include " test / mocks / local_info / mocks . h " <nl> - # include " test / mocks / network / mocks . h " <nl> - # include " test / mocks / protobuf / mocks . h " <nl> - # include " test / mocks / runtime / mocks . h " <nl> - # include " test / mocks / thread_local / mocks . h " <nl> + <nl> + # include " test / mocks / event / mocks . h " <nl> # include " test / test_common / environment . h " <nl> - # include " test / test_common / network_utility . h " <nl> - # include " test / test_common / printers . h " <nl> + # include " test / test_common / threadsafe_singleton_injector . h " <nl> # include " test / test_common / utility . h " <nl> <nl> - # include " absl / container / fixed_array . h " <nl> - # include " absl / container / node_hash_map . h " <nl> + # include " absl / synchronization / notification . h " <nl> + # include " gmock / gmock . h " <nl> # include " gtest / gtest . h " <nl> <nl> using testing : : _ ; <nl> - using testing : : Contains ; <nl> - using testing : : InSequence ; <nl> - using testing : : IsSupersetOf ; <nl> + using testing : : DoAll ; <nl> using testing : : NiceMock ; <nl> - using testing : : Not ; <nl> using testing : : Return ; <nl> + using testing : : SaveArg ; <nl> + using testing : : StrEq ; <nl> + using testing : : WithArgs ; <nl> <nl> namespace Envoy { <nl> namespace Network { <nl> namespace { <nl> <nl> - / / Note : this test suite is , unfortunately , not hermetic . Apple ' s APIs do not allow overriding the <nl> - / / IP address used for resolution via API calls ( only in system settings ) , and worse <nl> - / / yet does not allow overriding the port number used _at all_ . Therefore , the tests do not use a <nl> - / / test DNS server like in dns_impl_test , and thus affords less flexibility in testing scenarios : no <nl> - / / concurrent requests , no expressive error responses , etc . Further experiments could be done in <nl> - / / order to create a test connection that is reachable locally ( potentially by binding port 53 - - <nl> - / / default for DNS ) . However , @ junr03 ' s initial attempts were not successful . <nl> + class MockDnsService : public Network : : DnsService { <nl> + public : <nl> + MockDnsService ( ) = default ; <nl> + ~ MockDnsService ( ) = default ; <nl> + <nl> + MOCK_METHOD ( void , dnsServiceRefDeallocate , ( DNSServiceRef sdRef ) ) ; <nl> + MOCK_METHOD ( DNSServiceErrorType , dnsServiceCreateConnection , ( DNSServiceRef * sdRef ) ) ; <nl> + MOCK_METHOD ( dnssd_sock_t , dnsServiceRefSockFD , ( DNSServiceRef sdRef ) ) ; <nl> + MOCK_METHOD ( DNSServiceErrorType , dnsServiceProcessResult , ( DNSServiceRef sdRef ) ) ; <nl> + MOCK_METHOD ( DNSServiceErrorType , dnsServiceGetAddrInfo , <nl> + ( DNSServiceRef * sdRef , DNSServiceFlags flags , uint32_t interfaceIndex , <nl> + DNSServiceProtocol protocol , const char * hostname , <nl> + DNSServiceGetAddrInfoReply callBack , void * context ) ) ; <nl> + } ; <nl> + <nl> + / / This class tests the AppleDnsResolverImpl using actual calls to Apple ' s API . These tests have <nl> + / / limitations on the error conditions we are able to test as the Apple API is opaque , and prevents <nl> + / / usage of a test DNS server . <nl> class AppleDnsImplTest : public testing : : Test { <nl> public : <nl> AppleDnsImplTest ( ) <nl> TEST_F ( AppleDnsImplTest , Timeout ) { <nl> dispatcher_ - > run ( Event : : Dispatcher : : RunType : : Block ) ; <nl> } <nl> <nl> + / / This class compliments the tests above by using a mocked Apple API that allows finer control over <nl> + / / error conditions , and callback firing . <nl> + class AppleDnsImplFakeApiTest : public testing : : Test { <nl> + public : <nl> + ~ AppleDnsImplFakeApiTest ( ) override { <nl> + if ( resolver_ ) { <nl> + EXPECT_CALL ( dns_service_ , dnsServiceRefDeallocate ( _ ) ) ; <nl> + } <nl> + } <nl> + <nl> + void createResolver ( ) { <nl> + file_event_ = new NiceMock < Event : : MockFileEvent > ; <nl> + <nl> + EXPECT_CALL ( dns_service_ , dnsServiceCreateConnection ( _ ) ) <nl> + . WillOnce ( Return ( kDNSServiceErr_NoError ) ) ; <nl> + EXPECT_CALL ( dns_service_ , dnsServiceRefSockFD ( _ ) ) . WillOnce ( Return ( 0 ) ) ; <nl> + EXPECT_CALL ( dispatcher_ , createFileEvent_ ( 0 , _ , _ , _ ) ) <nl> + . WillOnce ( DoAll ( SaveArg < 1 > ( & file_ready_cb_ ) , Return ( file_event_ ) ) ) ; <nl> + <nl> + resolver_ = std : : make_unique < Network : : AppleDnsResolverImpl > ( dispatcher_ ) ; <nl> + } <nl> + <nl> + protected : <nl> + MockDnsService dns_service_ ; <nl> + TestThreadsafeSingletonInjector < Network : : DnsService > dns_service_injector_ { & dns_service_ } ; <nl> + std : : unique_ptr < Network : : AppleDnsResolverImpl > resolver_ { } ; <nl> + NiceMock < Event : : MockDispatcher > dispatcher_ ; <nl> + NiceMock < Event : : MockFileEvent > * file_event_ ; <nl> + Event : : FileReadyCb file_ready_cb_ ; <nl> + } ; <nl> + <nl> + TEST_F ( AppleDnsImplFakeApiTest , ErrorInConnectionCreation ) { <nl> + ON_CALL ( dns_service_ , dnsServiceCreateConnection ( _ ) ) <nl> + . WillByDefault ( Return ( kDNSServiceErr_Unknown ) ) ; <nl> + EXPECT_DEATH ( std : : make_unique < Network : : AppleDnsResolverImpl > ( dispatcher_ ) , <nl> + " error = - 65537 in DNSServiceCreateConnection " ) ; <nl> + } <nl> + <nl> + TEST_F ( AppleDnsImplFakeApiTest , ErrorInSocketAccess ) { <nl> + ON_CALL ( dns_service_ , dnsServiceCreateConnection ( _ ) ) <nl> + . WillByDefault ( Return ( kDNSServiceErr_NoError ) ) ; <nl> + ON_CALL ( dns_service_ , dnsServiceRefSockFD ( _ ) ) . WillByDefault ( Return ( - 1 ) ) ; <nl> + EXPECT_DEATH ( std : : make_unique < Network : : AppleDnsResolverImpl > ( dispatcher_ ) , <nl> + " error in DNSServiceRefSockFD " ) ; <nl> + } <nl> + <nl> + TEST_F ( AppleDnsImplFakeApiTest , InvalidFileEvent ) { <nl> + createResolver ( ) ; <nl> + <nl> + EXPECT_DEATH ( file_ready_cb_ ( 2 ) , " invalid FileReadyType event = 2 " ) ; <nl> + } <nl> + <nl> + TEST_F ( AppleDnsImplFakeApiTest , ErrorInProcessResult ) { <nl> + createResolver ( ) ; <nl> + <nl> + / / Error in processing will cause the connection to the DNS server to be reset . <nl> + EXPECT_CALL ( dns_service_ , dnsServiceProcessResult ( _ ) ) . WillOnce ( Return ( kDNSServiceErr_Unknown ) ) ; <nl> + / / Kill the old connection . <nl> + EXPECT_CALL ( dns_service_ , dnsServiceRefDeallocate ( _ ) ) ; <nl> + / / Create a new one . <nl> + EXPECT_CALL ( dns_service_ , dnsServiceCreateConnection ( _ ) ) . WillOnce ( Return ( kDNSServiceErr_NoError ) ) ; <nl> + EXPECT_CALL ( dns_service_ , dnsServiceRefSockFD ( _ ) ) . WillOnce ( Return ( 0 ) ) ; <nl> + EXPECT_CALL ( dispatcher_ , createFileEvent_ ( 0 , _ , _ , _ ) ) <nl> + . WillOnce ( Return ( new NiceMock < Event : : MockFileEvent > ) ) ; <nl> + <nl> + file_ready_cb_ ( Event : : FileReadyType : : Read ) ; <nl> + } <nl> + <nl> + TEST_F ( AppleDnsImplFakeApiTest , ErrorInProcessResultWithPendingQueries ) { <nl> + createResolver ( ) ; <nl> + <nl> + const std : : string hostname = " foo . com " ; <nl> + sockaddr_in addr4 ; <nl> + addr4 . sin_family = AF_INET ; <nl> + EXPECT_EQ ( 1 , inet_pton ( AF_INET , " 1 . 2 . 3 . 4 " , & addr4 . sin_addr ) ) ; <nl> + addr4 . sin_port = htons ( 6502 ) ; <nl> + <nl> + Network : : Address : : Ipv4Instance address ( & addr4 ) ; <nl> + DNSServiceGetAddrInfoReply reply_callback ; <nl> + absl : : Notification dns_callback_executed ; <nl> + <nl> + EXPECT_CALL ( dns_service_ , <nl> + dnsServiceGetAddrInfo ( _ , kDNSServiceFlagsShareConnection | kDNSServiceFlagsTimeout , 0 , <nl> + kDNSServiceProtocol_IPv4 | kDNSServiceProtocol_IPv6 , <nl> + StrEq ( hostname . c_str ( ) ) , _ , _ ) ) <nl> + . WillOnce ( DoAll ( SaveArg < 5 > ( & reply_callback ) , Return ( kDNSServiceErr_NoError ) ) ) ; <nl> + <nl> + auto query = <nl> + resolver_ - > resolve ( hostname , Network : : DnsLookupFamily : : Auto , <nl> + [ & dns_callback_executed ] ( DnsResolver : : ResolutionStatus status , <nl> + std : : list < DnsResponse > & & response ) - > void { <nl> + / / Status is success because it isn ' t possible to attach a file event <nl> + / / error to a specific query . <nl> + EXPECT_EQ ( DnsResolver : : ResolutionStatus : : Success , status ) ; <nl> + EXPECT_EQ ( 1 , response . size ( ) ) ; <nl> + EXPECT_EQ ( " 1 . 2 . 3 . 4 : 0 " , response . front ( ) . address_ - > asString ( ) ) ; <nl> + EXPECT_EQ ( std : : chrono : : seconds ( 30 ) , response . front ( ) . ttl_ ) ; <nl> + dns_callback_executed . Notify ( ) ; <nl> + } ) ; <nl> + <nl> + ASSERT_NE ( nullptr , query ) ; <nl> + <nl> + / / Fill the query with one address , and promise more addresses are coming . Meaning the query will <nl> + / / be pending . <nl> + reply_callback ( nullptr , kDNSServiceFlagsAdd | kDNSServiceFlagsMoreComing , 0 , <nl> + kDNSServiceErr_NoError , hostname . c_str ( ) , address . sockAddr ( ) , 30 , query ) ; <nl> + <nl> + EXPECT_CALL ( dns_service_ , dnsServiceProcessResult ( _ ) ) . WillOnce ( Return ( kDNSServiceErr_Unknown ) ) ; <nl> + / / The query ' s ref is going to be deallocated when the query is destroyed . The main ref is going <nl> + / / to be deallocated due to the error . <nl> + EXPECT_CALL ( dns_service_ , dnsServiceRefDeallocate ( _ ) ) . Times ( 2 ) ; <nl> + / / A new main ref is created on error . <nl> + EXPECT_CALL ( dns_service_ , dnsServiceCreateConnection ( _ ) ) . WillOnce ( Return ( kDNSServiceErr_NoError ) ) ; <nl> + EXPECT_CALL ( dns_service_ , dnsServiceRefSockFD ( _ ) ) . WillOnce ( Return ( 0 ) ) ; <nl> + EXPECT_CALL ( dispatcher_ , createFileEvent_ ( 0 , _ , _ , _ ) ) <nl> + . WillOnce ( Return ( new NiceMock < Event : : MockFileEvent > ) ) ; <nl> + <nl> + file_ready_cb_ ( Event : : FileReadyType : : Read ) ; <nl> + <nl> + dns_callback_executed . WaitForNotification ( ) ; <nl> + } <nl> + <nl> + TEST_F ( AppleDnsImplFakeApiTest , SynchronousErrorInGetAddrInfo ) { <nl> + createResolver ( ) ; <nl> + <nl> + EXPECT_CALL ( dns_service_ , dnsServiceGetAddrInfo ( _ , _ , _ , _ , _ , _ , _ ) ) <nl> + . WillOnce ( Return ( kDNSServiceErr_Unknown ) ) ; <nl> + / / The Query ' s sd ref will be deallocated . <nl> + EXPECT_CALL ( dns_service_ , dnsServiceRefDeallocate ( _ ) ) ; <nl> + <nl> + EXPECT_EQ ( nullptr , resolver_ - > resolve ( <nl> + " foo . com " , Network : : DnsLookupFamily : : Auto , <nl> + [ ] ( DnsResolver : : ResolutionStatus , std : : list < DnsResponse > & & ) - > void { <nl> + / / This callback should never be executed . <nl> + FAIL ( ) ; <nl> + } ) ) ; <nl> + } <nl> + <nl> + TEST_F ( AppleDnsImplFakeApiTest , QuerySynchronousCompletion ) { <nl> + createResolver ( ) ; <nl> + <nl> + const std : : string hostname = " foo . com " ; <nl> + sockaddr_in addr4 ; <nl> + addr4 . sin_family = AF_INET ; <nl> + EXPECT_EQ ( 1 , inet_pton ( AF_INET , " 1 . 2 . 3 . 4 " , & addr4 . sin_addr ) ) ; <nl> + addr4 . sin_port = htons ( 6502 ) ; <nl> + <nl> + Network : : Address : : Ipv4Instance address ( & addr4 ) ; <nl> + absl : : Notification dns_callback_executed ; <nl> + <nl> + / / The query ' s ref is going to be deallocated when the query is destroyed . <nl> + EXPECT_CALL ( dns_service_ , dnsServiceRefDeallocate ( _ ) ) ; <nl> + EXPECT_CALL ( dns_service_ , <nl> + dnsServiceGetAddrInfo ( _ , kDNSServiceFlagsShareConnection | kDNSServiceFlagsTimeout , 0 , <nl> + kDNSServiceProtocol_IPv4 | kDNSServiceProtocol_IPv6 , <nl> + StrEq ( hostname . c_str ( ) ) , _ , _ ) ) <nl> + . WillOnce ( DoAll ( <nl> + / / Have the API call synchronously call the provided callback . <nl> + WithArgs < 5 , 6 > ( Invoke ( [ & ] ( DNSServiceGetAddrInfoReply callback , void * context ) - > void { <nl> + callback ( nullptr , kDNSServiceFlagsAdd , 0 , kDNSServiceErr_NoError , hostname . c_str ( ) , <nl> + address . sockAddr ( ) , 30 , context ) ; <nl> + } ) ) , <nl> + Return ( kDNSServiceErr_NoError ) ) ) ; <nl> + <nl> + / / The returned value is nullptr because the query has already been fulfilled . Verify that the <nl> + / / callback ran via notification . <nl> + EXPECT_EQ ( nullptr , <nl> + resolver_ - > resolve ( hostname , Network : : DnsLookupFamily : : Auto , <nl> + [ & dns_callback_executed ] ( DnsResolver : : ResolutionStatus status , <nl> + std : : list < DnsResponse > & & response ) - > void { <nl> + EXPECT_EQ ( DnsResolver : : ResolutionStatus : : Success , status ) ; <nl> + EXPECT_EQ ( 1 , response . size ( ) ) ; <nl> + EXPECT_EQ ( " 1 . 2 . 3 . 4 : 0 " , response . front ( ) . address_ - > asString ( ) ) ; <nl> + EXPECT_EQ ( std : : chrono : : seconds ( 30 ) , response . front ( ) . ttl_ ) ; <nl> + dns_callback_executed . Notify ( ) ; <nl> + } ) ) ; <nl> + dns_callback_executed . WaitForNotification ( ) ; <nl> + } <nl> + <nl> + TEST_F ( AppleDnsImplFakeApiTest , IncorrectInterfaceIndexReturned ) { <nl> + createResolver ( ) ; <nl> + <nl> + const std : : string hostname = " foo . com " ; <nl> + sockaddr_in addr4 ; <nl> + addr4 . sin_family = AF_INET ; <nl> + EXPECT_EQ ( 1 , inet_pton ( AF_INET , " 1 . 2 . 3 . 4 " , & addr4 . sin_addr ) ) ; <nl> + addr4 . sin_port = htons ( 6502 ) ; <nl> + <nl> + Network : : Address : : Ipv4Instance address ( & addr4 ) ; <nl> + <nl> + EXPECT_CALL ( dns_service_ , <nl> + dnsServiceGetAddrInfo ( _ , kDNSServiceFlagsShareConnection | kDNSServiceFlagsTimeout , 0 , <nl> + kDNSServiceProtocol_IPv4 | kDNSServiceProtocol_IPv6 , <nl> + StrEq ( hostname . c_str ( ) ) , _ , _ ) ) <nl> + . WillOnce ( DoAll ( <nl> + / / Have the API call synchronously call the provided callback . Notice the incorrect <nl> + / / interface_index " 2 " . This will cause an assertion failure . <nl> + WithArgs < 5 , 6 > ( Invoke ( [ & ] ( DNSServiceGetAddrInfoReply callback , void * context ) - > void { <nl> + EXPECT_DEATH ( callback ( nullptr , kDNSServiceFlagsAdd , 2 , kDNSServiceErr_NoError , <nl> + hostname . c_str ( ) , address . sockAddr ( ) , 30 , context ) , <nl> + " unexpected interface_index = 2 " ) ; <nl> + } ) ) , <nl> + Return ( kDNSServiceErr_NoError ) ) ) ; <nl> + <nl> + resolver_ - > resolve ( <nl> + hostname , Network : : DnsLookupFamily : : Auto , <nl> + [ ] ( DnsResolver : : ResolutionStatus , std : : list < DnsResponse > & & ) - > void { FAIL ( ) ; } ) ; <nl> + } <nl> + <nl> + TEST_F ( AppleDnsImplFakeApiTest , QueryCompletedWithError ) { <nl> + createResolver ( ) ; <nl> + <nl> + const std : : string hostname = " foo . com " ; <nl> + sockaddr_in addr4 ; <nl> + addr4 . sin_family = AF_INET ; <nl> + EXPECT_EQ ( 1 , inet_pton ( AF_INET , " 1 . 2 . 3 . 4 " , & addr4 . sin_addr ) ) ; <nl> + addr4 . sin_port = htons ( 6502 ) ; <nl> + <nl> + Network : : Address : : Ipv4Instance address ( & addr4 ) ; <nl> + absl : : Notification dns_callback_executed ; <nl> + <nl> + / / The query ' s ref is going to be deallocated when the query is destroyed . The main ref is going <nl> + / / to be deallocated due to the error . <nl> + EXPECT_CALL ( dns_service_ , dnsServiceRefDeallocate ( _ ) ) . Times ( 2 ) ; <nl> + / / A new main ref is created on error . <nl> + EXPECT_CALL ( dns_service_ , dnsServiceCreateConnection ( _ ) ) . WillOnce ( Return ( kDNSServiceErr_NoError ) ) ; <nl> + EXPECT_CALL ( dns_service_ , dnsServiceRefSockFD ( _ ) ) . WillOnce ( Return ( 0 ) ) ; <nl> + EXPECT_CALL ( dispatcher_ , createFileEvent_ ( 0 , _ , _ , _ ) ) <nl> + . WillOnce ( Return ( new NiceMock < Event : : MockFileEvent > ) ) ; <nl> + EXPECT_CALL ( dns_service_ , <nl> + dnsServiceGetAddrInfo ( _ , kDNSServiceFlagsShareConnection | kDNSServiceFlagsTimeout , 0 , <nl> + kDNSServiceProtocol_IPv4 | kDNSServiceProtocol_IPv6 , <nl> + StrEq ( hostname . c_str ( ) ) , _ , _ ) ) <nl> + . WillOnce ( DoAll ( <nl> + / / Have the API call synchronously call the provided callback . <nl> + WithArgs < 5 , 6 > ( Invoke ( [ & ] ( DNSServiceGetAddrInfoReply callback , void * context ) - > void { <nl> + callback ( nullptr , 0 , 0 , kDNSServiceErr_Unknown , hostname . c_str ( ) , nullptr , 30 , context ) ; <nl> + } ) ) , <nl> + Return ( kDNSServiceErr_NoError ) ) ) ; <nl> + <nl> + / / The returned value is nullptr because the query has already been fulfilled . Verify that the <nl> + / / callback ran via notification . <nl> + EXPECT_EQ ( nullptr , resolver_ - > resolve ( <nl> + hostname , Network : : DnsLookupFamily : : Auto , <nl> + [ & dns_callback_executed ] ( DnsResolver : : ResolutionStatus status , <nl> + std : : list < DnsResponse > & & responses ) - > void { <nl> + EXPECT_EQ ( DnsResolver : : ResolutionStatus : : Failure , status ) ; <nl> + EXPECT_TRUE ( responses . empty ( ) ) ; <nl> + dns_callback_executed . Notify ( ) ; <nl> + } ) ) ; <nl> + dns_callback_executed . WaitForNotification ( ) ; <nl> + } <nl> + <nl> + TEST_F ( AppleDnsImplFakeApiTest , MultipleAddresses ) { <nl> + createResolver ( ) ; <nl> + <nl> + const std : : string hostname = " foo . com " ; <nl> + sockaddr_in addr4 ; <nl> + addr4 . sin_family = AF_INET ; <nl> + EXPECT_EQ ( 1 , inet_pton ( AF_INET , " 1 . 2 . 3 . 4 " , & addr4 . sin_addr ) ) ; <nl> + addr4 . sin_port = htons ( 6502 ) ; <nl> + Network : : Address : : Ipv4Instance address ( & addr4 ) ; <nl> + <nl> + sockaddr_in addr4_2 ; <nl> + addr4_2 . sin_family = AF_INET ; <nl> + EXPECT_EQ ( 1 , inet_pton ( AF_INET , " 5 . 6 . 7 . 8 " , & addr4_2 . sin_addr ) ) ; <nl> + addr4_2 . sin_port = htons ( 6502 ) ; <nl> + Network : : Address : : Ipv4Instance address2 ( & addr4 ) ; <nl> + <nl> + DNSServiceGetAddrInfoReply reply_callback ; <nl> + absl : : Notification dns_callback_executed ; <nl> + <nl> + EXPECT_CALL ( dns_service_ , <nl> + dnsServiceGetAddrInfo ( _ , kDNSServiceFlagsShareConnection | kDNSServiceFlagsTimeout , 0 , <nl> + kDNSServiceProtocol_IPv4 | kDNSServiceProtocol_IPv6 , <nl> + StrEq ( hostname . c_str ( ) ) , _ , _ ) ) <nl> + . WillOnce ( DoAll ( SaveArg < 5 > ( & reply_callback ) , Return ( kDNSServiceErr_NoError ) ) ) ; <nl> + <nl> + auto query = <nl> + resolver_ - > resolve ( hostname , Network : : DnsLookupFamily : : Auto , <nl> + [ & dns_callback_executed ] ( DnsResolver : : ResolutionStatus status , <nl> + std : : list < DnsResponse > & & response ) - > void { <nl> + EXPECT_EQ ( DnsResolver : : ResolutionStatus : : Success , status ) ; <nl> + EXPECT_EQ ( 2 , response . size ( ) ) ; <nl> + dns_callback_executed . Notify ( ) ; <nl> + } ) ; <nl> + ASSERT_NE ( nullptr , query ) ; <nl> + <nl> + / / Fill the query with one address , and promise more addresses are coming . Meaning the query will <nl> + / / be pending . <nl> + reply_callback ( nullptr , kDNSServiceFlagsAdd | kDNSServiceFlagsMoreComing , 0 , <nl> + kDNSServiceErr_NoError , hostname . c_str ( ) , address . sockAddr ( ) , 30 , query ) ; <nl> + <nl> + / / The query ' s ref is going to be deallocated when the query is destroyed . <nl> + EXPECT_CALL ( dns_service_ , dnsServiceRefDeallocate ( _ ) ) ; <nl> + reply_callback ( nullptr , kDNSServiceFlagsAdd , 0 , kDNSServiceErr_NoError , hostname . c_str ( ) , <nl> + address2 . sockAddr ( ) , 30 , query ) ; <nl> + <nl> + dns_callback_executed . WaitForNotification ( ) ; <nl> + } <nl> + <nl> + TEST_F ( AppleDnsImplFakeApiTest , MultipleAddressesSecondOneFails ) { <nl> + createResolver ( ) ; <nl> + <nl> + const std : : string hostname = " foo . com " ; <nl> + sockaddr_in addr4 ; <nl> + addr4 . sin_family = AF_INET ; <nl> + EXPECT_EQ ( 1 , inet_pton ( AF_INET , " 1 . 2 . 3 . 4 " , & addr4 . sin_addr ) ) ; <nl> + addr4 . sin_port = htons ( 6502 ) ; <nl> + Network : : Address : : Ipv4Instance address ( & addr4 ) ; <nl> + <nl> + DNSServiceGetAddrInfoReply reply_callback ; <nl> + absl : : Notification dns_callback_executed ; <nl> + <nl> + EXPECT_CALL ( dns_service_ , <nl> + dnsServiceGetAddrInfo ( _ , kDNSServiceFlagsShareConnection | kDNSServiceFlagsTimeout , 0 , <nl> + kDNSServiceProtocol_IPv4 | kDNSServiceProtocol_IPv6 , <nl> + StrEq ( hostname . c_str ( ) ) , _ , _ ) ) <nl> + . WillOnce ( DoAll ( SaveArg < 5 > ( & reply_callback ) , Return ( kDNSServiceErr_NoError ) ) ) ; <nl> + <nl> + auto query = <nl> + resolver_ - > resolve ( hostname , Network : : DnsLookupFamily : : Auto , <nl> + [ & dns_callback_executed ] ( DnsResolver : : ResolutionStatus status , <nl> + std : : list < DnsResponse > & & response ) - > void { <nl> + EXPECT_EQ ( DnsResolver : : ResolutionStatus : : Failure , status ) ; <nl> + EXPECT_TRUE ( response . empty ( ) ) ; <nl> + dns_callback_executed . Notify ( ) ; <nl> + } ) ; <nl> + ASSERT_NE ( nullptr , query ) ; <nl> + <nl> + / / Fill the query with one address , and promise more addresses are coming . Meaning the query will <nl> + / / be pending . <nl> + reply_callback ( nullptr , kDNSServiceFlagsAdd | kDNSServiceFlagsMoreComing , 0 , <nl> + kDNSServiceErr_NoError , hostname . c_str ( ) , address . sockAddr ( ) , 30 , query ) ; <nl> + <nl> + / / The query ' s ref is going to be deallocated when the query is destroyed . <nl> + EXPECT_CALL ( dns_service_ , dnsServiceRefDeallocate ( _ ) ) . Times ( 2 ) ; <nl> + / / A new main ref is created on error . <nl> + EXPECT_CALL ( dns_service_ , dnsServiceCreateConnection ( _ ) ) . WillOnce ( Return ( kDNSServiceErr_NoError ) ) ; <nl> + EXPECT_CALL ( dns_service_ , dnsServiceRefSockFD ( _ ) ) . WillOnce ( Return ( 0 ) ) ; <nl> + EXPECT_CALL ( dispatcher_ , createFileEvent_ ( 0 , _ , _ , _ ) ) <nl> + . WillOnce ( Return ( new NiceMock < Event : : MockFileEvent > ) ) ; <nl> + reply_callback ( nullptr , 0 , 0 , kDNSServiceErr_Unknown , hostname . c_str ( ) , nullptr , 30 , query ) ; <nl> + <nl> + dns_callback_executed . WaitForNotification ( ) ; <nl> + } <nl> + <nl> + TEST_F ( AppleDnsImplFakeApiTest , MultipleQueries ) { <nl> + createResolver ( ) ; <nl> + <nl> + const std : : string hostname = " foo . com " ; <nl> + sockaddr_in addr4 ; <nl> + addr4 . sin_family = AF_INET ; <nl> + EXPECT_EQ ( 1 , inet_pton ( AF_INET , " 1 . 2 . 3 . 4 " , & addr4 . sin_addr ) ) ; <nl> + addr4 . sin_port = htons ( 6502 ) ; <nl> + Network : : Address : : Ipv4Instance address ( & addr4 ) ; <nl> + DNSServiceGetAddrInfoReply reply_callback ; <nl> + absl : : Notification dns_callback_executed ; <nl> + <nl> + const std : : string hostname2 = " foo2 . com " ; <nl> + sockaddr_in addr4_2 ; <nl> + addr4_2 . sin_family = AF_INET ; <nl> + EXPECT_EQ ( 1 , inet_pton ( AF_INET , " 5 . 6 . 7 . 8 " , & addr4_2 . sin_addr ) ) ; <nl> + addr4_2 . sin_port = htons ( 6502 ) ; <nl> + Network : : Address : : Ipv4Instance address2 ( & addr4_2 ) ; <nl> + DNSServiceGetAddrInfoReply reply_callback2 ; <nl> + absl : : Notification dns_callback_executed2 ; <nl> + <nl> + / / Start first query . <nl> + EXPECT_CALL ( dns_service_ , <nl> + dnsServiceGetAddrInfo ( _ , kDNSServiceFlagsShareConnection | kDNSServiceFlagsTimeout , 0 , <nl> + kDNSServiceProtocol_IPv4 | kDNSServiceProtocol_IPv6 , <nl> + StrEq ( hostname . c_str ( ) ) , _ , _ ) ) <nl> + . WillOnce ( DoAll ( SaveArg < 5 > ( & reply_callback ) , Return ( kDNSServiceErr_NoError ) ) ) ; <nl> + <nl> + auto query = <nl> + resolver_ - > resolve ( hostname , Network : : DnsLookupFamily : : Auto , <nl> + [ & dns_callback_executed ] ( DnsResolver : : ResolutionStatus status , <nl> + std : : list < DnsResponse > & & response ) - > void { <nl> + EXPECT_EQ ( DnsResolver : : ResolutionStatus : : Success , status ) ; <nl> + EXPECT_EQ ( 1 , response . size ( ) ) ; <nl> + EXPECT_EQ ( " 1 . 2 . 3 . 4 : 0 " , response . front ( ) . address_ - > asString ( ) ) ; <nl> + EXPECT_EQ ( std : : chrono : : seconds ( 30 ) , response . front ( ) . ttl_ ) ; <nl> + dns_callback_executed . Notify ( ) ; <nl> + } ) ; <nl> + ASSERT_NE ( nullptr , query ) ; <nl> + <nl> + / / Start second query . <nl> + EXPECT_CALL ( dns_service_ , <nl> + dnsServiceGetAddrInfo ( _ , kDNSServiceFlagsShareConnection | kDNSServiceFlagsTimeout , 0 , <nl> + kDNSServiceProtocol_IPv4 , StrEq ( hostname2 . c_str ( ) ) , _ , _ ) ) <nl> + . WillOnce ( DoAll ( SaveArg < 5 > ( & reply_callback2 ) , Return ( kDNSServiceErr_NoError ) ) ) ; <nl> + <nl> + auto query2 = <nl> + resolver_ - > resolve ( hostname2 , Network : : DnsLookupFamily : : V4Only , <nl> + [ & dns_callback_executed2 ] ( DnsResolver : : ResolutionStatus status , <nl> + std : : list < DnsResponse > & & response ) - > void { <nl> + EXPECT_EQ ( DnsResolver : : ResolutionStatus : : Success , status ) ; <nl> + EXPECT_EQ ( 1 , response . size ( ) ) ; <nl> + EXPECT_EQ ( " 5 . 6 . 7 . 8 : 0 " , response . front ( ) . address_ - > asString ( ) ) ; <nl> + EXPECT_EQ ( std : : chrono : : seconds ( 30 ) , response . front ( ) . ttl_ ) ; <nl> + dns_callback_executed2 . Notify ( ) ; <nl> + } ) ; <nl> + ASSERT_NE ( nullptr , query2 ) ; <nl> + <nl> + / / Fill the query with one address , and promise more addresses are coming . Meaning the query will <nl> + / / be pending . <nl> + reply_callback ( nullptr , kDNSServiceFlagsAdd | kDNSServiceFlagsMoreComing , 0 , <nl> + kDNSServiceErr_NoError , hostname . c_str ( ) , address . sockAddr ( ) , 30 , query ) ; <nl> + <nl> + / / The two query ' s ref is going to be deallocated when the query is destroyed . <nl> + EXPECT_CALL ( dns_service_ , dnsServiceRefDeallocate ( _ ) ) . Times ( 2 ) ; <nl> + reply_callback2 ( nullptr , kDNSServiceFlagsAdd , 0 , kDNSServiceErr_NoError , hostname2 . c_str ( ) , <nl> + address2 . sockAddr ( ) , 30 , query2 ) ; <nl> + <nl> + dns_callback_executed . WaitForNotification ( ) ; <nl> + dns_callback_executed2 . WaitForNotification ( ) ; <nl> + } <nl> + <nl> + TEST_F ( AppleDnsImplFakeApiTest , MultipleQueriesOneFails ) { <nl> + createResolver ( ) ; <nl> + <nl> + const std : : string hostname = " foo . com " ; <nl> + sockaddr_in addr4 ; <nl> + addr4 . sin_family = AF_INET ; <nl> + EXPECT_EQ ( 1 , inet_pton ( AF_INET , " 1 . 2 . 3 . 4 " , & addr4 . sin_addr ) ) ; <nl> + addr4 . sin_port = htons ( 6502 ) ; <nl> + Network : : Address : : Ipv4Instance address ( & addr4 ) ; <nl> + DNSServiceGetAddrInfoReply reply_callback ; <nl> + absl : : Notification dns_callback_executed ; <nl> + <nl> + const std : : string hostname2 = " foo2 . com " ; <nl> + DNSServiceGetAddrInfoReply reply_callback2 ; <nl> + absl : : Notification dns_callback_executed2 ; <nl> + <nl> + / / Start first query . <nl> + EXPECT_CALL ( dns_service_ , <nl> + dnsServiceGetAddrInfo ( _ , kDNSServiceFlagsShareConnection | kDNSServiceFlagsTimeout , 0 , <nl> + kDNSServiceProtocol_IPv4 | kDNSServiceProtocol_IPv6 , <nl> + StrEq ( hostname . c_str ( ) ) , _ , _ ) ) <nl> + . WillOnce ( DoAll ( SaveArg < 5 > ( & reply_callback ) , Return ( kDNSServiceErr_NoError ) ) ) ; <nl> + <nl> + auto query = <nl> + resolver_ - > resolve ( hostname , Network : : DnsLookupFamily : : Auto , <nl> + [ & dns_callback_executed ] ( DnsResolver : : ResolutionStatus status , <nl> + std : : list < DnsResponse > & & response ) - > void { <nl> + / / Even though the second query will fail , this one will flush with the <nl> + / / state it had . <nl> + EXPECT_EQ ( DnsResolver : : ResolutionStatus : : Success , status ) ; <nl> + EXPECT_EQ ( 1 , response . size ( ) ) ; <nl> + EXPECT_EQ ( " 1 . 2 . 3 . 4 : 0 " , response . front ( ) . address_ - > asString ( ) ) ; <nl> + EXPECT_EQ ( std : : chrono : : seconds ( 30 ) , response . front ( ) . ttl_ ) ; <nl> + dns_callback_executed . Notify ( ) ; <nl> + } ) ; <nl> + ASSERT_NE ( nullptr , query ) ; <nl> + <nl> + / / Start second query . <nl> + EXPECT_CALL ( dns_service_ , <nl> + dnsServiceGetAddrInfo ( _ , kDNSServiceFlagsShareConnection | kDNSServiceFlagsTimeout , 0 , <nl> + kDNSServiceProtocol_IPv4 , StrEq ( hostname2 . c_str ( ) ) , _ , _ ) ) <nl> + . WillOnce ( DoAll ( SaveArg < 5 > ( & reply_callback2 ) , Return ( kDNSServiceErr_NoError ) ) ) ; <nl> + <nl> + auto query2 = <nl> + resolver_ - > resolve ( hostname2 , Network : : DnsLookupFamily : : V4Only , <nl> + [ & dns_callback_executed2 ] ( DnsResolver : : ResolutionStatus status , <nl> + std : : list < DnsResponse > & & response ) - > void { <nl> + EXPECT_EQ ( DnsResolver : : ResolutionStatus : : Failure , status ) ; <nl> + EXPECT_TRUE ( response . empty ( ) ) ; <nl> + dns_callback_executed2 . Notify ( ) ; <nl> + } ) ; <nl> + ASSERT_NE ( nullptr , query2 ) ; <nl> + <nl> + / / Fill the query with one address , and promise more addresses are coming . Meaning the query will <nl> + / / be pending . <nl> + reply_callback ( nullptr , kDNSServiceFlagsAdd | kDNSServiceFlagsMoreComing , 0 , <nl> + kDNSServiceErr_NoError , hostname . c_str ( ) , address . sockAddr ( ) , 30 , query ) ; <nl> + <nl> + / / The two query ' s ref is going to be deallocated when the query is destroyed . <nl> + EXPECT_CALL ( dns_service_ , dnsServiceRefDeallocate ( _ ) ) . Times ( 3 ) ; <nl> + / / A new main ref is created on error . <nl> + EXPECT_CALL ( dns_service_ , dnsServiceCreateConnection ( _ ) ) . WillOnce ( Return ( kDNSServiceErr_NoError ) ) ; <nl> + EXPECT_CALL ( dns_service_ , dnsServiceRefSockFD ( _ ) ) . WillOnce ( Return ( 0 ) ) ; <nl> + EXPECT_CALL ( dispatcher_ , createFileEvent_ ( 0 , _ , _ , _ ) ) <nl> + . WillOnce ( Return ( new NiceMock < Event : : MockFileEvent > ) ) ; <nl> + <nl> + / / The second query fails . <nl> + reply_callback2 ( nullptr , 0 , 0 , kDNSServiceErr_Unknown , hostname2 . c_str ( ) , nullptr , 30 , query2 ) ; <nl> + <nl> + dns_callback_executed . WaitForNotification ( ) ; <nl> + dns_callback_executed2 . WaitForNotification ( ) ; <nl> + } <nl> + <nl> + TEST_F ( AppleDnsImplFakeApiTest , ResultWithOnlyNonAdditiveReplies ) { <nl> + createResolver ( ) ; <nl> + <nl> + const std : : string hostname = " foo . com " ; <nl> + sockaddr_in addr4 ; <nl> + addr4 . sin_family = AF_INET ; <nl> + EXPECT_EQ ( 1 , inet_pton ( AF_INET , " 1 . 2 . 3 . 4 " , & addr4 . sin_addr ) ) ; <nl> + addr4 . sin_port = htons ( 6502 ) ; <nl> + Network : : Address : : Ipv4Instance address ( & addr4 ) ; <nl> + DNSServiceGetAddrInfoReply reply_callback ; <nl> + absl : : Notification dns_callback_executed ; <nl> + <nl> + EXPECT_CALL ( dns_service_ , <nl> + dnsServiceGetAddrInfo ( _ , kDNSServiceFlagsShareConnection | kDNSServiceFlagsTimeout , 0 , <nl> + kDNSServiceProtocol_IPv4 | kDNSServiceProtocol_IPv6 , <nl> + StrEq ( hostname . c_str ( ) ) , _ , _ ) ) <nl> + . WillOnce ( DoAll ( SaveArg < 5 > ( & reply_callback ) , Return ( kDNSServiceErr_NoError ) ) ) ; <nl> + <nl> + auto query = <nl> + resolver_ - > resolve ( hostname , Network : : DnsLookupFamily : : Auto , <nl> + [ & dns_callback_executed ] ( DnsResolver : : ResolutionStatus status , <nl> + std : : list < DnsResponse > & & response ) - > void { <nl> + EXPECT_EQ ( DnsResolver : : ResolutionStatus : : Success , status ) ; <nl> + EXPECT_TRUE ( response . empty ( ) ) ; <nl> + dns_callback_executed . Notify ( ) ; <nl> + } ) ; <nl> + ASSERT_NE ( nullptr , query ) ; <nl> + <nl> + / / The query ' s sd ref will be deallocated on completion . <nl> + EXPECT_CALL ( dns_service_ , dnsServiceRefDeallocate ( _ ) ) ; <nl> + / / Reply _without_ add and _without_ more coming flags . This should cause a flush with an empty <nl> + / / response . <nl> + reply_callback ( nullptr , 0 , 0 , kDNSServiceErr_NoError , hostname . c_str ( ) , nullptr , 30 , query ) ; <nl> + dns_callback_executed . WaitForNotification ( ) ; <nl> + } <nl> + <nl> + TEST_F ( AppleDnsImplFakeApiTest , ResultWithNullAddress ) { <nl> + createResolver ( ) ; <nl> + <nl> + const std : : string hostname = " foo . com " ; <nl> + sockaddr_in addr4 ; <nl> + addr4 . sin_family = AF_INET ; <nl> + EXPECT_EQ ( 1 , inet_pton ( AF_INET , " 1 . 2 . 3 . 4 " , & addr4 . sin_addr ) ) ; <nl> + addr4 . sin_port = htons ( 6502 ) ; <nl> + Network : : Address : : Ipv4Instance address ( & addr4 ) ; <nl> + DNSServiceGetAddrInfoReply reply_callback ; <nl> + <nl> + EXPECT_CALL ( dns_service_ , <nl> + dnsServiceGetAddrInfo ( _ , kDNSServiceFlagsShareConnection | kDNSServiceFlagsTimeout , 0 , <nl> + kDNSServiceProtocol_IPv4 | kDNSServiceProtocol_IPv6 , <nl> + StrEq ( hostname . c_str ( ) ) , _ , _ ) ) <nl> + . WillOnce ( DoAll ( SaveArg < 5 > ( & reply_callback ) , Return ( kDNSServiceErr_NoError ) ) ) ; <nl> + <nl> + auto query = resolver_ - > resolve ( <nl> + hostname , Network : : DnsLookupFamily : : Auto , <nl> + [ ] ( DnsResolver : : ResolutionStatus , std : : list < DnsResponse > & & ) - > void { FAIL ( ) ; } ) ; <nl> + ASSERT_NE ( nullptr , query ) ; <nl> + <nl> + EXPECT_DEATH ( reply_callback ( nullptr , kDNSServiceFlagsAdd , 0 , kDNSServiceErr_NoError , <nl> + hostname . c_str ( ) , nullptr , 30 , query ) , <nl> + " invalid to add null address " ) ; <nl> + } <nl> + <nl> } / / namespace <nl> } / / namespace Network <nl> } / / namespace Envoy <nl> | apple dns : add fake api test suite ( ) | envoyproxy/envoy | 5b97d804cf65dde11794cfb64479d8f4b81b65a6 | 2020-10-28T16:34:22Z |
mmm a / examples / mnist / readme . md <nl> ppp b / examples / mnist / readme . md <nl> and you will be using CPU for training . Isn ' t that easy ? <nl> <nl> MNIST is a small dataset , so training with GPU does not really introduce too much benefit due to communication overheads . On larger datasets with more complex models , such as ImageNet , the computation speed difference will be more significant . <nl> <nl> - # # # How to reduce the learning rate a fixed steps ? <nl> + # # # How to reduce the learning rate at fixed steps ? <nl> Look at lenet_multistep_solver . prototxt <nl> | typo : " a fixed steps " to " at fixed steps " | BVLC/caffe | d512d0c5c5efc276db7c864b6b5b6da41824cd88 | 2015-06-15T23:53:05Z |
mmm a / src / core / core . cpp <nl> ppp b / src / core / core . cpp <nl> PerfStats : : Results System : : GetAndResetPerfStats ( ) { <nl> return perf_stats . GetAndResetStats ( CoreTiming : : GetGlobalTimeUs ( ) ) ; <nl> } <nl> <nl> + const std : : shared_ptr < Kernel : : Scheduler > & System : : Scheduler ( size_t core_index ) { <nl> + if ( ! Settings : : values . use_multi_core ) { <nl> + / / Always use Core 0 scheduler when multicore is disabled <nl> + return cpu_cores [ 0 ] - > Scheduler ( ) ; <nl> + } <nl> + <nl> + ASSERT ( core_index < NUM_CPU_CORES ) ; <nl> + return cpu_cores [ core_index ] - > Scheduler ( ) ; <nl> + } <nl> + <nl> + ARM_Interface & System : : ArmInterface ( size_t core_index ) { <nl> + ASSERT ( core_index < NUM_CPU_CORES ) ; <nl> + return cpu_cores [ core_index ] - > ArmInterface ( ) ; <nl> + } <nl> + <nl> System : : ResultStatus System : : Init ( EmuWindow * emu_window , u32 system_mode ) { <nl> NGLOG_DEBUG ( HW_Memory , " initialized OK " ) ; <nl> <nl> System : : ResultStatus System : : Init ( EmuWindow * emu_window , u32 system_mode ) { <nl> / / Create threads for CPU cores 1 - 3 , and build thread_to_cpu map <nl> / / CPU core 0 is run on the main thread <nl> thread_to_cpu [ std : : this_thread : : get_id ( ) ] = cpu_cores [ 0 ] ; <nl> - for ( size_t index = 0 ; index < cpu_core_threads . size ( ) ; + + index ) { <nl> - cpu_core_threads [ index ] = std : : make_unique < std : : thread > ( RunCpuCore , cpu_cores [ index + 1 ] ) ; <nl> - thread_to_cpu [ cpu_core_threads [ index ] - > get_id ( ) ] = cpu_cores [ index + 1 ] ; <nl> + if ( Settings : : values . use_multi_core ) { <nl> + for ( size_t index = 0 ; index < cpu_core_threads . size ( ) ; + + index ) { <nl> + cpu_core_threads [ index ] = <nl> + std : : make_unique < std : : thread > ( RunCpuCore , cpu_cores [ index + 1 ] ) ; <nl> + thread_to_cpu [ cpu_core_threads [ index ] - > get_id ( ) ] = cpu_cores [ index + 1 ] ; <nl> + } <nl> } <nl> <nl> NGLOG_DEBUG ( Core , " Initialized OK " ) ; <nl> void System : : Shutdown ( ) { <nl> <nl> / / Close all CPU / threading state <nl> cpu_barrier - > NotifyEnd ( ) ; <nl> - for ( auto & thread : cpu_core_threads ) { <nl> - thread - > join ( ) ; <nl> - thread . reset ( ) ; <nl> + if ( Settings : : values . use_multi_core ) { <nl> + for ( auto & thread : cpu_core_threads ) { <nl> + thread - > join ( ) ; <nl> + thread . reset ( ) ; <nl> + } <nl> } <nl> thread_to_cpu . clear ( ) ; <nl> for ( auto & cpu_core : cpu_cores ) { <nl> mmm a / src / core / core . h <nl> ppp b / src / core / core . h <nl> class System { <nl> return CurrentCpuCore ( ) . ArmInterface ( ) ; <nl> } <nl> <nl> - ARM_Interface & ArmInterface ( size_t core_index ) { <nl> - ASSERT ( core_index < NUM_CPU_CORES ) ; <nl> - return cpu_cores [ core_index ] - > ArmInterface ( ) ; <nl> - } <nl> + ARM_Interface & ArmInterface ( size_t core_index ) ; <nl> <nl> Tegra : : GPU & GPU ( ) { <nl> return * gpu_core ; <nl> class System { <nl> return * CurrentCpuCore ( ) . Scheduler ( ) ; <nl> } <nl> <nl> - const std : : shared_ptr < Kernel : : Scheduler > & Scheduler ( size_t core_index ) { <nl> - ASSERT ( core_index < NUM_CPU_CORES ) ; <nl> - return cpu_cores [ core_index ] - > Scheduler ( ) ; <nl> - } <nl> + const std : : shared_ptr < Kernel : : Scheduler > & Scheduler ( size_t core_index ) ; <nl> <nl> Kernel : : SharedPtr < Kernel : : Process > & CurrentProcess ( ) { <nl> return current_process ; <nl> mmm a / src / core / core_cpu . cpp <nl> ppp b / src / core / core_cpu . cpp <nl> void CpuBarrier : : NotifyEnd ( ) { <nl> } <nl> <nl> bool CpuBarrier : : Rendezvous ( ) { <nl> - if ( end ) { <nl> - return false ; <nl> - } else { <nl> + if ( ! Settings : : values . use_multi_core ) { <nl> + / / Meaningless when running in single - core mode <nl> + return true ; <nl> + } <nl> + <nl> + if ( ! end ) { <nl> std : : unique_lock < std : : mutex > lock ( mutex ) ; <nl> <nl> - - cores_waiting ; <nl> bool CpuBarrier : : Rendezvous ( ) { <nl> condition . wait ( lock ) ; <nl> return true ; <nl> } <nl> + <nl> + return false ; <nl> } <nl> <nl> Cpu : : Cpu ( std : : shared_ptr < CpuBarrier > cpu_barrier , size_t core_index ) <nl> mmm a / src / core / settings . h <nl> ppp b / src / core / settings . h <nl> struct Values { <nl> <nl> / / Core <nl> bool use_cpu_jit ; <nl> + bool use_multi_core ; <nl> <nl> / / Data Storage <nl> bool use_virtual_sd ; <nl> mmm a / src / core / telemetry_session . cpp <nl> ppp b / src / core / telemetry_session . cpp <nl> TelemetrySession : : TelemetrySession ( ) { <nl> <nl> / / Log user configuration information <nl> AddField ( Telemetry : : FieldType : : UserConfig , " Core_UseCpuJit " , Settings : : values . use_cpu_jit ) ; <nl> + AddField ( Telemetry : : FieldType : : UserConfig , " Core_UseMultiCore " , <nl> + Settings : : values . use_multi_core ) ; <nl> AddField ( Telemetry : : FieldType : : UserConfig , " Renderer_ResolutionFactor " , <nl> Settings : : values . resolution_factor ) ; <nl> AddField ( Telemetry : : FieldType : : UserConfig , " Renderer_ToggleFramelimit " , <nl> mmm a / src / yuzu / configuration / config . cpp <nl> ppp b / src / yuzu / configuration / config . cpp <nl> void Config : : ReadValues ( ) { <nl> <nl> qt_config - > beginGroup ( " Core " ) ; <nl> Settings : : values . use_cpu_jit = qt_config - > value ( " use_cpu_jit " , true ) . toBool ( ) ; <nl> + Settings : : values . use_multi_core = qt_config - > value ( " use_multi_core " , false ) . toBool ( ) ; <nl> qt_config - > endGroup ( ) ; <nl> <nl> qt_config - > beginGroup ( " Renderer " ) ; <nl> void Config : : SaveValues ( ) { <nl> <nl> qt_config - > beginGroup ( " Core " ) ; <nl> qt_config - > setValue ( " use_cpu_jit " , Settings : : values . use_cpu_jit ) ; <nl> + qt_config - > setValue ( " use_multi_core " , Settings : : values . use_multi_core ) ; <nl> qt_config - > endGroup ( ) ; <nl> <nl> qt_config - > beginGroup ( " Renderer " ) ; <nl> mmm a / src / yuzu / configuration / configure_general . cpp <nl> ppp b / src / yuzu / configuration / configure_general . cpp <nl> ConfigureGeneral : : ConfigureGeneral ( QWidget * parent ) <nl> this - > setConfiguration ( ) ; <nl> <nl> ui - > use_cpu_jit - > setEnabled ( ! Core : : System : : GetInstance ( ) . IsPoweredOn ( ) ) ; <nl> + ui - > use_multi_core - > setEnabled ( ! Core : : System : : GetInstance ( ) . IsPoweredOn ( ) ) ; <nl> ui - > use_docked_mode - > setEnabled ( ! Core : : System : : GetInstance ( ) . IsPoweredOn ( ) ) ; <nl> } <nl> <nl> void ConfigureGeneral : : setConfiguration ( ) { <nl> ui - > toggle_check_exit - > setChecked ( UISettings : : values . confirm_before_closing ) ; <nl> ui - > theme_combobox - > setCurrentIndex ( ui - > theme_combobox - > findData ( UISettings : : values . theme ) ) ; <nl> ui - > use_cpu_jit - > setChecked ( Settings : : values . use_cpu_jit ) ; <nl> + ui - > use_multi_core - > setChecked ( Settings : : values . use_multi_core ) ; <nl> ui - > use_docked_mode - > setChecked ( Settings : : values . use_docked_mode ) ; <nl> } <nl> <nl> void ConfigureGeneral : : applyConfiguration ( ) { <nl> ui - > theme_combobox - > itemData ( ui - > theme_combobox - > currentIndex ( ) ) . toString ( ) ; <nl> <nl> Settings : : values . use_cpu_jit = ui - > use_cpu_jit - > isChecked ( ) ; <nl> + Settings : : values . use_multi_core = ui - > use_multi_core - > isChecked ( ) ; <nl> Settings : : values . use_docked_mode = ui - > use_docked_mode - > isChecked ( ) ; <nl> Settings : : Apply ( ) ; <nl> } <nl> mmm a / src / yuzu / configuration / configure_general . ui <nl> ppp b / src / yuzu / configuration / configure_general . ui <nl> <nl> < / property > <nl> < / widget > <nl> < / item > <nl> + < item > <nl> + < widget class = " QCheckBox " name = " use_multi_core " > <nl> + < property name = " text " > <nl> + < string > Enable multi - core < / string > <nl> + < / property > <nl> + < / widget > <nl> + < / item > <nl> < / layout > <nl> < / item > <nl> < / layout > <nl> mmm a / src / yuzu_cmd / config . cpp <nl> ppp b / src / yuzu_cmd / config . cpp <nl> void Config : : ReadValues ( ) { <nl> <nl> / / Core <nl> Settings : : values . use_cpu_jit = sdl2_config - > GetBoolean ( " Core " , " use_cpu_jit " , true ) ; <nl> + Settings : : values . use_multi_core = sdl2_config - > GetBoolean ( " Core " , " use_multi_core " , false ) ; <nl> <nl> / / Renderer <nl> Settings : : values . resolution_factor = <nl> mmm a / src / yuzu_cmd / default_ini . h <nl> ppp b / src / yuzu_cmd / default_ini . h <nl> touch_device = <nl> # 0 : Interpreter ( slow ) , 1 ( default ) : JIT ( fast ) <nl> use_cpu_jit = <nl> <nl> + # Whether to use multi - core for CPU emulation <nl> + # 0 ( default ) : Disabled , 1 : Enabled <nl> + use_multi_core = <nl> + <nl> [ Renderer ] <nl> # Whether to use software or hardware rendering . <nl> # 0 : Software , 1 ( default ) : Hardware <nl> | core : Add a configuration setting for use_multi_core . | yuzu-emu/yuzu | 9bf2a428f9e9359763be1bfd90c32371044c711e | 2018-05-10T23:34:47Z |
mmm a / examples / dnn_metric_learning_on_images_ex . cpp <nl> ppp b / examples / dnn_metric_learning_on_images_ex . cpp <nl> <nl> space it ' s very easy to do face recognition with some kind of k - nearest <nl> neighbor classifier . <nl> <nl> - In this example we will use the ResNet - 34 network from the dnn_imagenet_ex . cpp <nl> - example to learn to map images into some vector space where pictures of <nl> - the same person are close and pictures of different people are far apart . <nl> + In this example we will use a version of the ResNet network from the <nl> + dnn_imagenet_ex . cpp example to learn to map images into some vector space where <nl> + pictures of the same person are close and pictures of different people are far <nl> + apart . <nl> <nl> You might want to read the simpler introduction to the deep metric learning <nl> API , dnn_metric_learning_ex . cpp , before reading this example . You should <nl> void load_mini_batch ( <nl> } <nl> } <nl> <nl> - / / You might want to do some data augmentation at this point . Here we so some simple <nl> + / / You might want to do some data augmentation at this point . Here we do some simple <nl> / / color augmentation . <nl> for ( auto & & crop : images ) <nl> disturb_colors ( crop , rnd ) ; <nl> using net_type = loss_metric < fc_no_bias < 128 , avg_pool_everything < <nl> level3 < <nl> level4 < <nl> max_pool < 3 , 3 , 2 , 2 , relu < bn_con < con < 32 , 7 , 7 , 2 , 2 , <nl> - input_rgb_image_sized < 150 > <nl> + input_rgb_image <nl> > > > > > > > > > > > > ; <nl> <nl> / / testing network type ( replaced batch normalization with fixed affine transforms ) <nl> using anet_type = loss_metric < fc_no_bias < 128 , avg_pool_everything < <nl> alevel3 < <nl> alevel4 < <nl> max_pool < 3 , 3 , 2 , 2 , relu < affine < con < 32 , 7 , 7 , 2 , 2 , <nl> - input_rgb_image_sized < 150 > <nl> + input_rgb_image <nl> > > > > > > > > > > > > ; <nl> <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - <nl> | Minor cleanup | davisking/dlib | 45d047de802115b33f1439f1b25578c0f4f3521d | 2017-02-09T17:38:39Z |
mmm a / atom / browser / lib / init . coffee <nl> ppp b / atom / browser / lib / init . coffee <nl> process . argv . splice startMark , endMark - startMark + 1 <nl> globalPaths = module . globalPaths <nl> globalPaths . push path . join process . resourcesPath , ' atom ' , ' browser ' , ' api ' , ' lib ' <nl> <nl> - # Do loading in next tick since we still need some initialize work before <nl> - # native bindings can work . <nl> - setImmediate - > <nl> + # Following operations need extra bindings by AtomBindings . <nl> + process . once ' BIND_DONE ' , - > <nl> # Import common settings . <nl> require path . resolve ( __dirname , ' . . ' , ' . . ' , ' common ' , ' lib ' , ' init . js ' ) <nl> <nl> mmm a / atom / common / api / atom_bindings . cc <nl> ppp b / atom / common / api / atom_bindings . cc <nl> void AtomBindings : : BindTo ( v8 : : Isolate * isolate , <nl> versions - > Set ( mate : : StringToV8 ( isolate , " chrome " ) , <nl> mate : : StringToV8 ( isolate , CHROME_VERSION_STRING ) ) ; <nl> } <nl> + <nl> + v8 : : Handle < v8 : : Value > event = mate : : StringToV8 ( isolate , " BIND_DONE " ) ; <nl> + node : : MakeCallback ( isolate , process , " emit " , 1 , & event ) ; <nl> } <nl> <nl> void AtomBindings : : ActivateUVLoop ( v8 : : Isolate * isolate ) { <nl> mmm a / atom / renderer / lib / init . coffee <nl> ppp b / atom / renderer / lib / init . coffee <nl> if nodeIntegration in [ ' true ' , ' all ' , ' except - iframe ' , ' manual - enable - iframe ' ] <nl> else <nl> # There still some native initialization codes needs " process " , delete the <nl> # global reference after they are done . <nl> - setImmediate - > <nl> + process . once ' BIND_DONE ' , - > <nl> delete global . process <nl> | Add BIND_DONE event for process object | electron/electron | 24b4fcea15a06b1b4ab00626e5ac5e1d8e1dc1c3 | 2014-10-25T15:21:17Z |
mmm a / Math / Math / CPUMatrix . cpp <nl> ppp b / Math / Math / CPUMatrix . cpp <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> return * this ; <nl> } <nl> <nl> - template < class ElemType > <nl> - CPUMatrix < ElemType > & CPUMatrix < ElemType > : : AssignColumnSlice ( const ElemType val , size_t startColumn , size_t numCols ) <nl> - { <nl> - if ( numCols = = 0 ) <nl> - throw std : : logic_error ( " The slice cannot have 0 columns . " ) ; <nl> - <nl> - if ( startColumn + numCols > m_numCols ) <nl> - throw std : : logic_error ( " The slice is out of range of the source matrix . " ) ; <nl> - <nl> - for ( size_t j = startColumn ; j < startColumn + numCols ; j + + ) <nl> - SetColumn ( val , j ) ; <nl> - <nl> - return * this ; <nl> - } <nl> <nl> / / for each column of a , we assign numRows starting from startIndex to this <nl> template < class ElemType > <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> return * this ; <nl> } <nl> <nl> + template < class ElemType > <nl> + CPUMatrix < ElemType > & CPUMatrix < ElemType > : : AssignRepeatOf ( const CPUMatrix < ElemType > & a , const size_t numRowRepeats , const size_t numColRepeats ) <nl> + { <nl> + if ( this = = & a ) <nl> + throw std : : logic_error ( " AssignRepeatOf : a is the same as [ this ] . Does not support inplace repeat . " ) ; <nl> + <nl> + if ( a . IsEmpty ( ) ) <nl> + throw std : : logic_error ( " AssignRepeatOf : Matrix a is empty . " ) ; <nl> + <nl> + Resize ( a . GetNumRows ( ) * numRowRepeats , a . GetNumCols ( ) * numColRepeats ) ; <nl> + long n = ( long ) a . GetNumCols ( ) , m = ( long ) a . GetNumRows ( ) ; <nl> + auto & us = * this ; <nl> + <nl> + # pragma omp parallel for <nl> + for ( long q = 0 ; q < numColRepeats ; q + + ) <nl> + { <nl> + for ( long p = 0 ; p < numRowRepeats ; p + + ) <nl> + { <nl> + long colOffset = q * n ; <nl> + <nl> + for ( long j = 0 ; j < n ; j + + , colOffset + + ) <nl> + { <nl> + long rowOffset = p * m ; <nl> + <nl> + / / four - way unrolling <nl> + for ( long i = 0 ; i < ( m & ~ 3 ) ; i + = 4 , rowOffset + = 4 ) <nl> + { <nl> + us ( rowOffset , colOffset ) = a ( i , j ) ; <nl> + us ( rowOffset + 1 , colOffset ) = a ( i + 1 , j ) ; <nl> + us ( rowOffset + 2 , colOffset ) = a ( i + 2 , j ) ; <nl> + us ( rowOffset + 3 , colOffset ) = a ( i + 3 , j ) ; <nl> + } <nl> + / / handle remaining stuffs <nl> + for ( long i = m & ~ 3 ; i < m ; i + + , rowOffset + + ) <nl> + { <nl> + us ( rowOffset , colOffset ) = a ( i , j ) ; <nl> + } <nl> + } <nl> + } <nl> + } <nl> + <nl> + return * this ; <nl> + } <nl> + <nl> template < class ElemType > <nl> CPUMatrix < ElemType > CPUMatrix < ElemType > : : Transpose ( ) <nl> { <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> } <nl> <nl> <nl> - template < class ElemType > <nl> - CPUMatrix < ElemType > & CPUMatrix < ElemType > : : AssignElementSumOf ( size_t cColIdx , const CPUMatrix < ElemType > & a , size_t aColIdx , const CPUMatrix < ElemType > & b , size_t bColIdx ) <nl> - { <nl> - if ( a . IsEmpty ( ) ) <nl> - throw std : : logic_error ( " AssignElementSumOf : Matrix a is empty . " ) ; <nl> - <nl> - auto & us = * this ; <nl> - <nl> - long m = ( long ) GetNumRows ( ) ; <nl> - # pragma omp parallel for <nl> - / / four - way unrolling <nl> - for ( long i = 0 ; i < ( m & ~ 3 ) ; i + = 4 ) <nl> - { <nl> - us ( i , cColIdx ) = a ( i , aColIdx ) + b ( i , bColIdx ) ; <nl> - us ( i + 1 , cColIdx ) = a ( i + 1 , aColIdx ) + b ( i + 1 , bColIdx ) ; <nl> - us ( i + 2 , cColIdx ) = a ( i + 2 , aColIdx ) + b ( i + 2 , bColIdx ) ; <nl> - us ( i + 3 , cColIdx ) = a ( i + 3 , aColIdx ) + b ( i + 3 , bColIdx ) ; <nl> - } <nl> - / / handle remaining stuffs <nl> - for ( long i = m & ~ 3 ; i < m ; i + + ) <nl> - { <nl> - us ( i , cColIdx ) = a ( i , aColIdx ) + b ( i , bColIdx ) ; <nl> - } <nl> - <nl> - return * this ; <nl> - } <nl> - <nl> - <nl> / / if [ this ] and a have same dimension then [ this ] = [ this ] + a <nl> / / if a is a column vector , add to all columns of [ this ] <nl> / / if a is a row vector , add to all rows of [ this ] <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> return AssignElementProductOf ( * this , a ) ; <nl> } <nl> <nl> + / / [ this ] = [ this ] . * a ( we cannot override operator . * in c + + ) <nl> + template < class ElemType > <nl> + CPUMatrix < ElemType > & CPUMatrix < ElemType > : : ElementDivideBy ( const CPUMatrix < ElemType > & a ) <nl> + { <nl> + return AssignElementDivisionOf ( * this , a ) ; <nl> + } <nl> + <nl> / / [ this ] = a . * b <nl> template < class ElemType > <nl> CPUMatrix < ElemType > & CPUMatrix < ElemType > : : AssignElementProductOf ( const CPUMatrix < ElemType > & a , const CPUMatrix < ElemType > & b ) <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> } <nl> <nl> template < class ElemType > <nl> - CPUMatrix < ElemType > & CPUMatrix < ElemType > : : ColumnElementDivideWith ( const CPUMatrix < ElemType > & a ) <nl> + CPUMatrix < ElemType > & CPUMatrix < ElemType > : : RowElementDivideBy ( const CPUMatrix < ElemType > & a ) <nl> + { <nl> + if ( a . IsEmpty ( ) | | IsEmpty ( ) ) <nl> + throw std : : logic_error ( " RowElementDivideBy : Matrix is empty . " ) ; <nl> + <nl> + assert ( a . GetNumRows ( ) = = 1 & & a . GetNumCols ( ) = = GetNumCols ( ) ) ; <nl> + if ( ! ( a . GetNumRows ( ) = = 1 & & a . GetNumCols ( ) = = GetNumCols ( ) ) ) <nl> + throw std : : invalid_argument ( " RowElementDivideBy : The input matrix should be a row vector and match [ this ] ' s columns . " ) ; <nl> + <nl> + auto & us = * this ; <nl> + <nl> + long m = ( long ) GetNumRows ( ) , n = ( long ) GetNumCols ( ) ; <nl> + # pragma omp parallel for <nl> + for ( long j = 0 ; j < n ; j + + ) <nl> + { <nl> + ElemType v = a ( 0 , j ) ; <nl> + if ( v > = 0 & & v < EPS_IN_INVERSE ) <nl> + v = EPS_IN_INVERSE ; <nl> + else if ( v < 0 & & v > - EPS_IN_INVERSE ) <nl> + v = ( - EPS_IN_INVERSE ) ; <nl> + <nl> + / / four - way unrolling <nl> + for ( long i = 0 ; i < ( m & ~ 3 ) ; i + = 4 ) <nl> + { <nl> + us ( i , j ) / = v ; <nl> + us ( i + 1 , j ) / = v ; <nl> + us ( i + 2 , j ) / = v ; <nl> + us ( i + 3 , j ) * = v ; <nl> + } <nl> + / / handle remaining stuffs <nl> + for ( long i = m & ~ 3 ; i < m ; i + + ) <nl> + { <nl> + us ( i , j ) / = v ; <nl> + } <nl> + } <nl> + <nl> + return * this ; <nl> + } <nl> + template < class ElemType > <nl> + CPUMatrix < ElemType > & CPUMatrix < ElemType > : : ColumnElementDivideBy ( const CPUMatrix < ElemType > & a ) <nl> { <nl> if ( a . IsEmpty ( ) | | IsEmpty ( ) ) <nl> - throw std : : logic_error ( " ColumnElementDivideWith : Matrix is empty . " ) ; <nl> + throw std : : logic_error ( " ColumnElementDivideBy : Matrix is empty . " ) ; <nl> <nl> assert ( a . GetNumRows ( ) = = GetNumRows ( ) & & a . GetNumCols ( ) = = 1 ) ; <nl> if ( ! ( a . GetNumRows ( ) = = GetNumRows ( ) & & a . GetNumCols ( ) = = 1 ) ) <nl> - throw std : : invalid_argument ( " ColumnElementDivideWith : The input matrix should be a col vector and match [ this ] ' s rows . " ) ; <nl> + throw std : : invalid_argument ( " ColumnElementDivideBy : The input matrix should be a col vector and match [ this ] ' s rows . " ) ; <nl> <nl> auto & us = * this ; <nl> <nl> mmm a / Math / Math / CPUMatrix . h <nl> ppp b / Math / Math / CPUMatrix . h <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> <nl> CPUMatrix < ElemType > ColumnSlice ( size_t startColumn , size_t numCols ) const ; <nl> CPUMatrix < ElemType > & AssignColumnSlice ( const CPUMatrix < ElemType > & fromMatrix , size_t startColumn , size_t numCols ) ; <nl> - CPUMatrix < ElemType > & AssignColumnSlice ( const ElemType val , size_t startColumn , size_t numCols ) ; <nl> <nl> void Adagrad ( CPUMatrix < ElemType > & gradients ) ; <nl> void RmsProp ( CPUMatrix < ElemType > & gradients ) ; <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> CPUMatrix < ElemType > & AssignElementProductOf ( const CPUMatrix < ElemType > & a , const CPUMatrix < ElemType > & b ) ; <nl> CPUMatrix < ElemType > & AddElementProductOf ( const CPUMatrix < ElemType > & a , const CPUMatrix < ElemType > & b ) ; <nl> <nl> - CPUMatrix < ElemType > & AssignElementSumOf ( size_t cCol , const CPUMatrix < ElemType > & a , size_t aColIdx , const CPUMatrix < ElemType > & b , size_t bColIdx ) ; <nl> - <nl> CPUMatrix < ElemType > & AssignElementDivisionOf ( const CPUMatrix < ElemType > & a , const CPUMatrix < ElemType > & b ) ; <nl> + CPUMatrix < ElemType > & ElementDivideBy ( const CPUMatrix < ElemType > & a ) ; <nl> <nl> CPUMatrix < ElemType > & ColumnElementMultiplyWith ( const CPUMatrix < ElemType > & a ) ; <nl> CPUMatrix < ElemType > & RowElementMultiplyWith ( const CPUMatrix < ElemType > & a ) ; <nl> <nl> - CPUMatrix < ElemType > & ColumnElementDivideWith ( const CPUMatrix < ElemType > & a ) ; <nl> + CPUMatrix < ElemType > & ColumnElementDivideBy ( const CPUMatrix < ElemType > & a ) ; <nl> + CPUMatrix < ElemType > & RowElementDivideBy ( const CPUMatrix < ElemType > & a ) ; <nl> <nl> CPUMatrix < ElemType > & ElementInverse ( ) ; <nl> CPUMatrix < ElemType > & AssignElementInverseOf ( const CPUMatrix < ElemType > & a ) ; <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> CPUMatrix < ElemType > & AssignRowSliceValuesOf ( const CPUMatrix < ElemType > & a , const size_t startIndex , const size_t numRows ) ; <nl> CPUMatrix < ElemType > & AddToRowSliceValuesOf ( const CPUMatrix < ElemType > & a , const size_t startIndex , const size_t numRows ) ; <nl> <nl> + CPUMatrix < ElemType > & AssignRepeatOf ( const CPUMatrix < ElemType > & a , const size_t numRowRepeats , const size_t numColRepeats ) ; <nl> + <nl> void VectorMax ( CPUMatrix < ElemType > & maxIndexes , CPUMatrix < ElemType > & maxValues , const bool isColWise ) const ; <nl> void VectorMin ( CPUMatrix < ElemType > & mainndexes , CPUMatrix < ElemType > & minValues , const bool isColWise ) const ; <nl> <nl> mmm a / Math / Math / CPUSparseMatrix . cpp <nl> ppp b / Math / Math / CPUSparseMatrix . cpp <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> } <nl> <nl> template < class ElemType > <nl> - void CPUSparseMatrix < ElemType > : : Resize ( const size_t numRows , const size_t numCols , int size ) <nl> + void CPUSparseMatrix < ElemType > : : Resize ( const size_t numRows , const size_t numCols , size_t size ) <nl> { <nl> m_nz = 0 ; <nl> m_colIdx = - 1 ; <nl> mmm a / Math / Math / CPUSparseMatrix . h <nl> ppp b / Math / Math / CPUSparseMatrix . h <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> <nl> int GetComputeDeviceId ( ) const { return - 1 ; } <nl> <nl> - void Resize ( const size_t numRows , const size_t numCols , int size = 0 ) ; <nl> + void Resize ( const size_t numRows , const size_t numCols , size_t size = 0 ) ; <nl> void Reset ( ) ; <nl> <nl> public : <nl> mmm a / Math / Math / GPUMatrix . cu <nl> ppp b / Math / Math / GPUMatrix . cu <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> return * this ; <nl> } <nl> <nl> + template < class ElemType > <nl> + GPUMatrix < ElemType > & GPUMatrix < ElemType > : : AssignRepeatOf ( const GPUMatrix < ElemType > & a , const size_t numRowRepeats , const size_t numColRepeats ) <nl> + { <nl> + if ( this = = & a ) <nl> + throw std : : logic_error ( " AssignRepeatOf : a is the same as [ this ] . Does not support inplace repeat . " ) ; <nl> + <nl> + if ( a . IsEmpty ( ) ) <nl> + throw std : : logic_error ( " AssignRepeatOf : Matrix a is empty . " ) ; <nl> + <nl> + Resize ( a . GetNumRows ( ) * numRowRepeats , a . GetNumCols ( ) * numColRepeats ) ; <nl> + <nl> + LONG64 N = ( LONG64 ) GetNumElements ( ) ; <nl> + long n = ( long ) a . GetNumCols ( ) , m = ( long ) a . GetNumRows ( ) ; <nl> + int blocksPerGrid = ( int ) ceil ( 1 . 0 * N / threadsPerBlock ) ; <nl> + PrepareDevice ( ) ; <nl> + cudaEvent_t done ; <nl> + if ( do_sync ) CUDA_CALL ( cudaEventCreate ( & done ) ) ; <nl> + _assignRepeatOf < ElemType > < < < blocksPerGrid , threadsPerBlock , 0 , t_stream > > > ( m_pArray , a . m_pArray , N , m , n , ( long ) GetNumRows ( ) ) ; <nl> + if ( do_sync ) CUDA_CALL ( cudaEventRecord ( done ) ) ; <nl> + if ( do_sync ) CUDA_CALL ( cudaEventSynchronize ( done ) ) ; <nl> + if ( do_sync ) CUDA_CALL ( cudaEventDestroy ( done ) ) ; <nl> + <nl> + return * this ; <nl> + } <nl> + <nl> template < class ElemType > <nl> GPUMatrix < ElemType > GPUMatrix < ElemType > : : Transpose ( ) const <nl> { <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> } <nl> <nl> template < class ElemType > <nl> - GPUMatrix < ElemType > & GPUMatrix < ElemType > : : ColumnElementDivideWith ( const GPUMatrix < ElemType > & a ) <nl> + GPUMatrix < ElemType > & GPUMatrix < ElemType > : : RowElementDivideBy ( const GPUMatrix < ElemType > & a ) <nl> { <nl> if ( a . IsEmpty ( ) | | IsEmpty ( ) ) <nl> - throw std : : logic_error ( " ColumnElementDivideWith : Matrix is empty . " ) ; <nl> + throw std : : logic_error ( " RowElementDivideBy : Matrix is empty . " ) ; <nl> + <nl> + if ( ! ( a . GetNumRows ( ) = = 1 & & a . GetNumCols ( ) = = GetNumCols ( ) ) ) <nl> + throw std : : invalid_argument ( " RowElementDivideBy : The input matrix should be a row vector and match [ this ] ' s columns . " ) ; <nl> + <nl> + long N = ( long ) a . GetNumRows ( ) ; <nl> + long M = ( long ) this - > GetNumCols ( ) ; <nl> + int blocksPerGrid = ( int ) ceil ( 1 . 0 * N / threadsPerBlock ) ; <nl> + a . PrepareDevice ( ) ; <nl> + cudaEvent_t done ; <nl> + if ( do_sync ) CUDA_CALL ( cudaEventCreate ( & done ) ) ; <nl> + _rowElementDivideBy < ElemType > < < < blocksPerGrid , threadsPerBlock > > > ( m_pArray , a . m_pArray , N , M ) ; <nl> + if ( do_sync ) CUDA_CALL ( cudaEventRecord ( done ) ) ; <nl> + if ( do_sync ) CUDA_CALL ( cudaEventSynchronize ( done ) ) ; <nl> + if ( do_sync ) CUDA_CALL ( cudaEventDestroy ( done ) ) ; <nl> + <nl> + return * this ; <nl> + } <nl> + <nl> + template < class ElemType > <nl> + GPUMatrix < ElemType > & GPUMatrix < ElemType > : : ColumnElementDivideBy ( const GPUMatrix < ElemType > & a ) <nl> + { <nl> + if ( a . IsEmpty ( ) | | IsEmpty ( ) ) <nl> + throw std : : logic_error ( " ColumnElementDivideBy : Matrix is empty . " ) ; <nl> <nl> if ( ! ( a . GetNumRows ( ) = = GetNumRows ( ) & & a . GetNumCols ( ) = = 1 ) ) <nl> - throw std : : invalid_argument ( " ColumnElementDivideWith : The input matrix should be a col vector and match [ this ] ' s rows . " ) ; <nl> + throw std : : invalid_argument ( " ColumnElementDivideBy : The input matrix should be a col vector and match [ this ] ' s rows . " ) ; <nl> <nl> long N = ( long ) a . GetNumRows ( ) ; <nl> long M = ( long ) this - > GetNumCols ( ) ; <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> a . PrepareDevice ( ) ; <nl> cudaEvent_t done ; <nl> if ( do_sync ) CUDA_CALL ( cudaEventCreate ( & done ) ) ; <nl> - _columnElementDivideWith < ElemType > < < < blocksPerGrid , threadsPerBlock , 0 , t_stream > > > ( m_pArray , a . m_pArray , N , M ) ; <nl> + _ColumnElementDivideBy < ElemType > < < < blocksPerGrid , threadsPerBlock , 0 , t_stream > > > ( m_pArray , a . m_pArray , N , M ) ; <nl> if ( do_sync ) CUDA_CALL ( cudaEventRecord ( done ) ) ; <nl> if ( do_sync ) CUDA_CALL ( cudaEventSynchronize ( done ) ) ; <nl> if ( do_sync ) CUDA_CALL ( cudaEventDestroy ( done ) ) ; <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> return * this ; <nl> } <nl> <nl> + template < class ElemType > <nl> + GPUMatrix < ElemType > & GPUMatrix < ElemType > : : ElementDivideBy ( const GPUMatrix < ElemType > & a ) <nl> + { <nl> + return AssignElementDivisionOf ( * this , a ) ; <nl> + } <nl> + <nl> template < class ElemType > <nl> GPUMatrix < ElemType > & GPUMatrix < ElemType > : : AssignElementDivisionOf ( const GPUMatrix < ElemType > & a , const GPUMatrix < ElemType > & b ) <nl> { <nl> mmm a / Math / Math / GPUMatrix . cuh <nl> ppp b / Math / Math / GPUMatrix . cuh <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> GPUMatrix < ElemType > & AddElementProductOf ( const GPUMatrix < ElemType > & a , const GPUMatrix < ElemType > & b ) ; <nl> <nl> GPUMatrix < ElemType > & AssignElementDivisionOf ( const GPUMatrix < ElemType > & a , const GPUMatrix < ElemType > & b ) ; <nl> + GPUMatrix < ElemType > & ElementDivideBy ( const GPUMatrix < ElemType > & a ) ; <nl> <nl> GPUMatrix < ElemType > & ColumnElementMultiplyWith ( const GPUMatrix < ElemType > & a ) ; <nl> GPUMatrix < ElemType > & RowElementMultiplyWith ( const GPUMatrix < ElemType > & a ) ; <nl> <nl> - GPUMatrix < ElemType > & ColumnElementDivideWith ( const GPUMatrix < ElemType > & a ) ; <nl> + GPUMatrix < ElemType > & ColumnElementDivideBy ( const GPUMatrix < ElemType > & a ) ; <nl> + GPUMatrix < ElemType > & RowElementDivideBy ( const GPUMatrix < ElemType > & a ) ; <nl> <nl> GPUMatrix < ElemType > & ElementInverse ( ) ; <nl> GPUMatrix < ElemType > & AssignElementInverseOf ( const GPUMatrix < ElemType > & a ) ; <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> GPUMatrix < ElemType > & AssignRowSliceValuesOf ( const GPUMatrix < ElemType > & a , const size_t startIndex , const size_t numRows ) ; <nl> GPUMatrix < ElemType > & AddToRowSliceValuesOf ( const GPUMatrix < ElemType > & a , const size_t startIndex , const size_t numRows ) ; <nl> <nl> + GPUMatrix < ElemType > & AssignRepeatOf ( const GPUMatrix < ElemType > & a , const size_t numRowRepeats , const size_t numColRepeats ) ; <nl> + <nl> void VectorMax ( GPUMatrix < ElemType > & maxIndexes , GPUMatrix < ElemType > & maxValues , const bool isColWise ) const ; <nl> void VectorMin ( GPUMatrix < ElemType > & mainndexes , GPUMatrix < ElemType > & minValues , const bool isColWise ) const ; <nl> <nl> mmm a / Math / Math / GPUMatrixCUDAKernels . cu <nl> ppp b / Math / Math / GPUMatrixCUDAKernels . cu <nl> __global__ void _assignRowSliceValuesOf ( ElemType * dest , ElemType * src , const L <nl> long col = id / destRows ; <nl> long row = id - ( col * destRows ) ; <nl> <nl> - dest [ id ] = src [ col * srcRows + row + startIndex ] ; <nl> + / / dest [ id ] = src [ col * srcRows + row + startIndex ] ; <nl> + dest [ id ] = src [ IDX2C ( row + startIndex , col , srcRows ) ] ; <nl> } <nl> <nl> template < class ElemType > <nl> __global__ void _addToRowSliceValuesOf ( ElemType * dest , ElemType * src , const LO <nl> long col = id / srcRows ; <nl> long row = id - ( col * srcRows ) ; <nl> <nl> - dest [ col * destRows + row + startIndex ] + = src [ id ] ; <nl> + / / dest [ col * destRows + row + startIndex ] + = src [ id ] ; <nl> + dest [ IDX2C ( row + startIndex , col , destRows ) ] + = src [ id ] ; <nl> + } <nl> + <nl> + template < class ElemType > <nl> + __global__ void _assignRepeatOf ( ElemType * dest , ElemType * src , const LONG64 N , const long srcRows , const long srcCols , const long destRows ) <nl> + { <nl> + LONG64 id = blockDim . x * blockIdx . x + threadIdx . x ; <nl> + if ( id > = N ) <nl> + return ; <nl> + <nl> + long destCol = id / destRows ; <nl> + long destRow = id - ( destCol * destRows ) ; <nl> + long srcRow = destRow % srcRows ; <nl> + long srcCol = destCol % srcCols ; <nl> + <nl> + dest [ id ] = src [ IDX2C ( srcRow , srcCol , srcRows ) ] ; <nl> } <nl> <nl> template < class ElemType > <nl> __global__ void _rowElementMultiplyWith ( <nl> } <nl> <nl> template < class ElemType > <nl> - __global__ void _columnElementDivideWith ( <nl> + __global__ void _rowElementDivideBy ( <nl> + ElemType * us , <nl> + const ElemType * a , <nl> + const long N , / / us . GetNumRows ( ) ; <nl> + const long M ) / / a . GetNumCols ( ) ; <nl> + { <nl> + long id = blockDim . x * blockIdx . x + threadIdx . x ; <nl> + if ( id > = M ) <nl> + return ; <nl> + <nl> + / / __shared__ ElemType _a [ threadsPerBlock ] ; <nl> + / / _a [ threadIdx . x ] = a [ id ] ; <nl> + ElemType v = a [ id ] ; <nl> + if ( v > = 0 & & v < EPS_IN_INVERSE ) <nl> + v = EPS_IN_INVERSE ; <nl> + else if ( v < 0 & & v > - EPS_IN_INVERSE ) <nl> + v = ( - EPS_IN_INVERSE ) ; <nl> + <nl> + for ( long i = 0 ; i < N ; + + i ) <nl> + { <nl> + us [ IDX2C ( i , id , N ) ] = us [ IDX2C ( i , id , N ) ] / v ; <nl> + } <nl> + } <nl> + <nl> + template < class ElemType > <nl> + __global__ void _ColumnElementDivideBy ( <nl> ElemType * us , <nl> const ElemType * a , <nl> const long N , / / a . GetNumRows ( ) ; <nl> mmm a / Math / Math / GPUSparseMatrix . cu <nl> ppp b / Math / Math / GPUSparseMatrix . cu <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> } <nl> <nl> template < class ElemType > <nl> - void GPUSparseMatrix < ElemType > : : Resize ( const size_t numRows , const size_t numCols , int size ) <nl> + void GPUSparseMatrix < ElemType > : : Resize ( const size_t numRows , const size_t numCols , size_t size ) <nl> { <nl> m_nz = 0 ; <nl> m_colIdx = - 1 ; <nl> mmm a / Math / Math / GPUSparseMatrix . cuh <nl> ppp b / Math / Math / GPUSparseMatrix . cuh <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> GPUSparseMatrix ( GPUSparseMatrix < ElemType > & & ) ; <nl> ~ GPUSparseMatrix ( ) ; <nl> public : <nl> - void Resize ( const size_t numRows , const size_t numCols , int size = 0 ) ; <nl> + void Resize ( const size_t numRows , const size_t numCols , size_t size = 0 ) ; <nl> void Reset ( ) ; <nl> <nl> public : <nl> mmm a / Math / Math / Matrix . cpp <nl> ppp b / Math / Math / Matrix . cpp <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> <nl> if ( GetMatrixType ( ) = = MatrixType : : DENSE ) <nl> { <nl> - for ( int i = this - > GetNumCols ( ) - 1 ; i > = - numShift ; i - - ) <nl> + for ( size_t i = this - > GetNumCols ( ) - 1 ; i > = - numShift ; i - - ) <nl> { <nl> Matrix < ElemType > inp = this - > ColumnSlice ( i + numShift , 1 ) ; <nl> Matrix < ElemType > out = this - > ColumnSlice ( i , 1 ) ; <nl> out = inp ; <nl> } <nl> - for ( int i = 0 ; i < min ( this - > GetNumCols ( ) , - numShift ) ; i + + ) <nl> + for ( size_t i = 0 ; i < min ( this - > GetNumCols ( ) , - numShift ) ; i + + ) <nl> this - > ColumnSlice ( i , 1 ) . SetValue ( 0 ) ; <nl> } <nl> else if ( GetMatrixType ( ) = = MatrixType : : SPARSE ) <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> return * this ; <nl> } <nl> <nl> - template < class ElemType > <nl> - Matrix < ElemType > & Matrix < ElemType > : : AssignColumnSlice ( const ElemType val , size_t startColumn , size_t numCols ) <nl> - { <nl> - DISPATCH_MATRIX_ON_FLAG ( this , <nl> - this , <nl> - m_CPUMatrix - > AssignColumnSlice ( val , startColumn , numCols ) , <nl> - m_GPUMatrix - > AssignColumnSlice ( val , startColumn , numCols ) , <nl> - NOT_IMPLEMENTED , <nl> - NOT_IMPLEMENTED <nl> - ) ; <nl> - <nl> - return * this ; <nl> - } <nl> <nl> / / this function will change the matrix type between DENSE and SPARSE . <nl> / / WARNING : The correct implementation is to copy the matrix between DENSE and SPARSE <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> NOT_IMPLEMENTED , <nl> NOT_IMPLEMENTED <nl> ) ; <nl> + <nl> + return * this ; <nl> } <nl> <nl> <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> return * this ; <nl> } <nl> <nl> + template < class ElemType > <nl> + Matrix < ElemType > & Matrix < ElemType > : : AssignRepeatOf ( const Matrix < ElemType > & a , const size_t numRowRepeats , const size_t numColRepeats ) <nl> + { <nl> + DecideAndMoveToRightDevice ( * this , a ) ; <nl> + <nl> + / / WARNING : a and this must have same type <nl> + if ( ! ( GetMatrixType ( ) = = a . GetMatrixType ( ) ) ) <nl> + NOT_IMPLEMENTED ; <nl> + <nl> + DISPATCH_MATRIX_ON_FLAG ( this , <nl> + this , <nl> + this - > m_CPUMatrix - > AssignRepeatOf ( * a . m_CPUMatrix , numRowRepeats , numColRepeats ) , <nl> + this - > m_GPUMatrix - > AssignRepeatOf ( * a . m_GPUMatrix , numRowRepeats , numColRepeats ) , <nl> + NOT_IMPLEMENTED , <nl> + NOT_IMPLEMENTED <nl> + ) ; <nl> + <nl> + return * this ; <nl> + } <nl> <nl> template < class ElemType > <nl> Matrix < ElemType > & Matrix < ElemType > : : AssignDifferenceOf ( const ElemType alpha , const Matrix < ElemType > & a ) <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> return AssignElementProductOf ( * this , a ) ; <nl> } <nl> <nl> + template < class ElemType > <nl> + Matrix < ElemType > & Matrix < ElemType > : : ElementDivideBy ( const Matrix < ElemType > & a ) <nl> + { <nl> + return AssignElementDivisionOf ( * this , a ) ; <nl> + } <nl> + <nl> / / [ this ] = a . * b <nl> template < class ElemType > <nl> Matrix < ElemType > & Matrix < ElemType > : : AssignElementProductOf ( const Matrix < ElemType > & a , const Matrix < ElemType > & b ) <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> return * this ; <nl> } <nl> <nl> + template < class ElemType > <nl> + Matrix < ElemType > & Matrix < ElemType > : : RowElementDivideBy ( const Matrix < ElemType > & a ) <nl> + { <nl> + if ( a . IsEmpty ( ) | | IsEmpty ( ) ) <nl> + throw std : : logic_error ( " RowElementDivideBy : Matrix is empty . " ) ; <nl> + <nl> + if ( ! ( a . GetNumRows ( ) = = GetNumRows ( ) & & a . GetNumCols ( ) = = 1 ) ) <nl> + throw std : : invalid_argument ( " RowElementDivideBy : The input matrix should be a row vector and match [ this ] ' s columns . " ) ; <nl> + <nl> + / / WARNING : a and this must have same type <nl> + if ( ! ( GetMatrixType ( ) = = a . GetMatrixType ( ) ) ) <nl> + NOT_IMPLEMENTED ; <nl> + <nl> + SwitchToMatrixType ( a . GetMatrixType ( ) ) ; <nl> + <nl> + DISPATCH_MATRIX_ON_FLAG ( this , <nl> + this , <nl> + this - > m_CPUMatrix - > RowElementDivideBy ( * a . m_CPUMatrix ) , <nl> + this - > m_GPUMatrix - > RowElementDivideBy ( * a . m_GPUMatrix ) , <nl> + NOT_IMPLEMENTED , <nl> + NOT_IMPLEMENTED <nl> + ) ; <nl> + <nl> + return * this ; <nl> + } <nl> + <nl> <nl> template < class ElemType > <nl> - Matrix < ElemType > & Matrix < ElemType > : : ColumnElementDivideWith ( const Matrix < ElemType > & a ) <nl> + Matrix < ElemType > & Matrix < ElemType > : : ColumnElementDivideBy ( const Matrix < ElemType > & a ) <nl> { <nl> if ( a . IsEmpty ( ) | | IsEmpty ( ) ) <nl> - throw std : : logic_error ( " ColumnElementDivideWith : Matrix is empty . " ) ; <nl> + throw std : : logic_error ( " ColumnElementDivideBy : Matrix is empty . " ) ; <nl> <nl> if ( ! ( a . GetNumRows ( ) = = GetNumRows ( ) & & a . GetNumCols ( ) = = 1 ) ) <nl> - throw std : : invalid_argument ( " ColumnElementDivideWith : The input matrix should be a col vector and match [ this ] ' s rows . " ) ; <nl> + throw std : : invalid_argument ( " ColumnElementDivideBy : The input matrix should be a col vector and match [ this ] ' s rows . " ) ; <nl> <nl> DecideAndMoveToRightDevice ( * this , a ) ; <nl> / / WARNING : a and this must have same type <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> <nl> DISPATCH_MATRIX_ON_FLAG ( & a , <nl> this , <nl> - this - > m_CPUMatrix - > ColumnElementDivideWith ( * a . m_CPUMatrix ) , <nl> - this - > m_GPUMatrix - > ColumnElementDivideWith ( * a . m_GPUMatrix ) , <nl> + this - > m_CPUMatrix - > ColumnElementDivideBy ( * a . m_CPUMatrix ) , <nl> + this - > m_GPUMatrix - > ColumnElementDivideBy ( * a . m_GPUMatrix ) , <nl> NOT_IMPLEMENTED , <nl> NOT_IMPLEMENTED <nl> ) ; <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> { <nl> DISPATCH_MATRIX_ON_FLAG ( & a , <nl> nullptr , <nl> - return CPUMatrix < ElemType > : : AreEqual ( * a . m_CPUMatrix , * b . m_CPUMatrix , threshold ) , <nl> - return GPUMatrix < ElemType > : : AreEqual ( * a . m_GPUMatrix , * b . m_GPUMatrix , threshold ) , <nl> - NOT_IMPLEMENTED , <nl> - GPUSparseMatrix < ElemType > : : AreEqual ( * a . m_GPUSparseMatrix , * b . m_GPUSparseMatrix , threshold ) <nl> + return CPUMatrix < ElemType > : : AreEqual ( * a . m_CPUMatrix , * b . m_CPUMatrix , threshold ) , <nl> + return GPUMatrix < ElemType > : : AreEqual ( * a . m_GPUMatrix , * b . m_GPUMatrix , threshold ) , <nl> + NOT_IMPLEMENTED ; return false , <nl> + return GPUSparseMatrix < ElemType > : : AreEqual ( * a . m_GPUSparseMatrix , * b . m_GPUSparseMatrix , threshold ) <nl> ) ; <nl> } <nl> else <nl> { <nl> DISPATCH_MATRIX_ON_FLAG ( & a , <nl> nullptr , <nl> - NOT_IMPLEMENTED , <nl> - GPUSparseMatrix < ElemType > : : AreEqual ( * a . m_GPUMatrix , * b . m_GPUSparseMatrix , threshold ) , <nl> - NOT_IMPLEMENTED , <nl> - GPUSparseMatrix < ElemType > : : AreEqual ( * a . m_GPUSparseMatrix , * b . m_GPUMatrix , threshold ) <nl> + NOT_IMPLEMENTED ; return false , <nl> + return GPUSparseMatrix < ElemType > : : AreEqual ( * a . m_GPUMatrix , * b . m_GPUSparseMatrix , threshold ) , <nl> + NOT_IMPLEMENTED ; return false , <nl> + return GPUSparseMatrix < ElemType > : : AreEqual ( * a . m_GPUSparseMatrix , * b . m_GPUMatrix , threshold ) <nl> ) ; <nl> } <nl> <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> <nl> template < class ElemType > <nl> ElemType Matrix < ElemType > : : Exp10 ( ElemType num ) <nl> - { <nl> - return exp ( num * 2 . 302585093 ) ; <nl> + { <nl> + if ( sizeof ( ElemType ) = = sizeof ( double ) ) <nl> + return ( ElemType ) exp ( num * 2 . 302585093 ) ; <nl> + else <nl> + return ( ElemType ) expf ( ( ElemType ) num * 2 . 302585093f ) ; <nl> } <nl> <nl> template < class ElemType > <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> template < class ElemType > <nl> ElemType Matrix < ElemType > : : LogAdd ( ElemType x , ElemType y ) <nl> { <nl> - ElemType temp , diff , z ; <nl> + ElemType temp , diff ; <nl> <nl> if ( x < y ) { <nl> temp = x ; x = y ; y = temp ; <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> diff = y - x ; <nl> if ( diff < MINLOGEXP ) <nl> { <nl> - return ( x < LSMALL ) ? LZERO : x ; <nl> + return ( ElemType ) ( ( x < LSMALL ) ? LZERO : x ) ; <nl> } <nl> else <nl> - { <nl> - z = exp ( diff ) ; <nl> - return x + log ( 1 . 0 + z ) ; <nl> - } <nl> + { <nl> + if ( sizeof ( ElemType ) = = sizeof ( double ) ) <nl> + return ( ElemType ) ( x + log ( 1 . 0 + exp ( diff ) ) ) ; <nl> + else <nl> + return x + logf ( 1 . 0f + expf ( ( ElemType ) diff ) ) ; <nl> + } <nl> } <nl> <nl> template < class ElemType > <nl> mmm a / Math / Math / Matrix . h <nl> ppp b / Math / Math / Matrix . h <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> <nl> Matrix < ElemType > ColumnSlice ( size_t startColumn , size_t numCols ) const ; <nl> Matrix < ElemType > & AssignColumnSlice ( const Matrix < ElemType > & fromMatrix , size_t startColumn , size_t numCols ) ; <nl> - Matrix < ElemType > & AssignColumnSlice ( const ElemType val , size_t startColumn , size_t numCols ) ; <nl> <nl> void ShiftBy ( int numShift ) ; <nl> <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> Matrix < ElemType > & AssignElementProductOf ( const Matrix < ElemType > & a , const Matrix < ElemType > & b ) ; <nl> Matrix < ElemType > & AddElementProductOf ( const Matrix < ElemType > & a , const Matrix < ElemType > & b ) ; <nl> <nl> - Matrix < ElemType > & AssignElementSumOf ( size_t cCol , const Matrix < ElemType > & a , size_t aCol , const Matrix < ElemType > & b , size_t bCol ) ; <nl> - <nl> Matrix < ElemType > & AssignElementDivisionOf ( const Matrix < ElemType > & a , const Matrix < ElemType > & b ) ; <nl> + Matrix < ElemType > & ElementDivideBy ( const Matrix < ElemType > & a ) ; <nl> <nl> Matrix < ElemType > & ColumnElementMultiplyWith ( const Matrix < ElemType > & a ) ; <nl> Matrix < ElemType > & RowElementMultiplyWith ( const Matrix < ElemType > & a ) ; <nl> <nl> - Matrix < ElemType > & ColumnElementDivideWith ( const Matrix < ElemType > & a ) ; <nl> - <nl> + Matrix < ElemType > & ColumnElementDivideBy ( const Matrix < ElemType > & a ) ; <nl> + Matrix < ElemType > & RowElementDivideBy ( const Matrix < ElemType > & a ) ; <nl> + <nl> Matrix < ElemType > & ElementInverse ( ) ; <nl> Matrix < ElemType > & AssignElementInverseOf ( const Matrix < ElemType > & a ) ; <nl> <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> Matrix < ElemType > & AssignRowSliceValuesOf ( const Matrix < ElemType > & a , const size_t startIndex , const size_t numRows ) ; <nl> Matrix < ElemType > & AddToRowSliceValuesOf ( const Matrix < ElemType > & a , const size_t startIndex , const size_t numRows ) ; <nl> <nl> + Matrix < ElemType > & AssignRepeatOf ( const Matrix < ElemType > & a , const size_t numRowRepeats , const size_t numColRepeats ) ; <nl> + <nl> + <nl> bool IsEqualTo ( const Matrix < ElemType > & a , const ElemType threshold = 1e - 8 ) const ; <nl> <nl> void VectorNorm1 ( Matrix < ElemType > & c , const bool isColWise ) const ; <nl> namespace Microsoft { namespace MSR { namespace CNTK { <nl> static void Multiply ( const Matrix < ElemType > & a , const bool transposeA , const Matrix < ElemType > & b , const bool transposeB , Matrix < ElemType > & c ) ; <nl> static void Multiply ( const Matrix < ElemType > & a , const Matrix < ElemType > & b , Matrix < ElemType > & c ) ; <nl> <nl> - Matrix < ElemType > & CrossProduct ( const Matrix < ElemType > & a , size_t aCol , const Matrix < ElemType > & b , size_t bCol ) ; <nl> - <nl> static void ScaleAndAdd ( ElemType alpha , const Matrix < ElemType > & a , Matrix < ElemType > & c ) ; <nl> static void ScaleAndAdd ( ElemType alpha , const Matrix < ElemType > & a , ElemType beta , Matrix < ElemType > & c ) ; <nl> static void AddScaledDifference ( const ElemType alpha , const Matrix < ElemType > & a , const Matrix < ElemType > & b , Matrix < ElemType > & c ) ; <nl> | Clean code and warning . add matrix support for mixture density models . | microsoft/CNTK | 0d79aa8be9d51ad5747984229ff1819fb42e5f65 | 2014-10-11T00:35:54Z |
mmm a / lib / Sema / ConstraintSystem . cpp <nl> ppp b / lib / Sema / ConstraintSystem . cpp <nl> ConstraintSystem : : getTypeOfMemberReference ( <nl> return { openedType , type } ; <nl> } <nl> <nl> + / / Performance hack : if there are two generic overloads , and one is <nl> + / / more specialized than the other , prefer the more - specialized one . <nl> + static void tryOptimizeGenericDisjunction ( ConstraintSystem & cs , <nl> + ArrayRef < OverloadChoice > choices , <nl> + OverloadChoice * & favoredChoice ) { <nl> + if ( favoredChoice | | choices . size ( ) ! = 2 ) <nl> + return ; <nl> + <nl> + const auto & choiceA = choices [ 0 ] ; <nl> + const auto & choiceB = choices [ 1 ] ; <nl> + <nl> + if ( ! choiceA . isDecl ( ) | | ! choiceB . isDecl ( ) ) <nl> + return ; <nl> + <nl> + auto isViable = [ ] ( ValueDecl * decl ) - > bool { <nl> + assert ( decl ) ; <nl> + <nl> + auto * AFD = dyn_cast < AbstractFunctionDecl > ( decl ) ; <nl> + if ( ! AFD | | ! AFD - > isGeneric ( ) ) <nl> + return false ; <nl> + <nl> + auto funcType = AFD - > getInterfaceType ( ) ; <nl> + auto hasAnyOrOptional = funcType . findIf ( [ ] ( Type type ) - > bool { <nl> + if ( auto objType = type - > getOptionalObjectType ( ) ) <nl> + return true ; <nl> + <nl> + return type - > isAny ( ) ; <nl> + } ) ; <nl> + <nl> + / / If function declaration references ` Any ` or ` Any ? ` type <nl> + / / let ' s not attempt it , because it ' s unclear <nl> + / / without solving which overload is going to be better . <nl> + return ! hasAnyOrOptional ; <nl> + } ; <nl> + <nl> + auto * declA = choiceA . getDecl ( ) ; <nl> + auto * declB = choiceB . getDecl ( ) ; <nl> + <nl> + if ( ! isViable ( declA ) | | ! isViable ( declB ) ) <nl> + return ; <nl> + <nl> + auto & TC = cs . TC ; <nl> + auto * DC = cs . DC ; <nl> + <nl> + switch ( TC . compareDeclarations ( DC , declA , declB ) ) { <nl> + case Comparison : : Better : <nl> + favoredChoice = const_cast < OverloadChoice * > ( & choiceA ) ; <nl> + break ; <nl> + <nl> + case Comparison : : Worse : <nl> + favoredChoice = const_cast < OverloadChoice * > ( & choiceB ) ; <nl> + break ; <nl> + <nl> + case Comparison : : Unordered : <nl> + break ; <nl> + } <nl> + } <nl> + <nl> void ConstraintSystem : : addOverloadSet ( Type boundType , <nl> ArrayRef < OverloadChoice > choices , <nl> DeclContext * useDC , <nl> void ConstraintSystem : : addOverloadSet ( Type boundType , <nl> return ; <nl> } <nl> <nl> + tryOptimizeGenericDisjunction ( * this , choices , favoredChoice ) ; <nl> + <nl> SmallVector < Constraint * , 4 > overloads ; <nl> <nl> / / As we do for other favored constraints , if a favored overload has been <nl> mmm a / stdlib / public / Platform / tgmath . swift . gyb <nl> ppp b / stdlib / public / Platform / tgmath . swift . gyb <nl> import SwiftShims <nl> <nl> / / Generic functions implementable directly on FloatingPoint . <nl> @ _transparent <nl> - public func fabs < T : FloatingPoint > ( _ x : T ) - > T <nl> - where T . Magnitude = = T { <nl> + @ available ( swift , deprecated : 4 . 2 , renamed : " abs " ) <nl> + public func fabs < T : FloatingPoint > ( _ x : T ) - > T { <nl> return x . magnitude <nl> } <nl> <nl> mmm a / stdlib / public / core / FloatingPoint . swift . gyb <nl> ppp b / stdlib / public / core / FloatingPoint . swift . gyb <nl> word_bits = int ( CMAKE_SIZEOF_VOID_P ) * 8 <nl> / / / print ( " Average : \ ( average ) ° F in \ ( validTemps . count ) " + <nl> / / / " out of \ ( tempsFahrenheit . count ) observations . " ) <nl> / / / / / Prints " Average : 74 . 84 ° F in 5 out of 7 observations . " <nl> - public protocol FloatingPoint : SignedNumeric , Strideable , Hashable { <nl> - <nl> - / / For the minimumMagnitude and maximumMagnitude methods <nl> - / / / A type that can represent the absolute value of any possible value of the <nl> - / / / conforming type . <nl> - associatedtype Magnitude = Self <nl> + public protocol FloatingPoint : SignedNumeric , Strideable , Hashable <nl> + where Magnitude = = Self { <nl> <nl> / / / A type that can represent any written exponent . <nl> associatedtype Exponent : SignedInteger <nl> where Self . RawSignificand : FixedWidthInteger , <nl> <nl> % end <nl> <nl> - / / / Returns the absolute value of ` x ` . <nl> - @ inlinable / / FIXME ( sil - serialize - all ) <nl> - @ _transparent <nl> - public func abs < T : FloatingPoint > ( _ x : T ) - > T where T . Magnitude = = T { <nl> - return x . magnitude <nl> - } <nl> - <nl> extension FloatingPoint { <nl> @ inlinable / / FIXME ( sil - serialize - all ) <nl> @ available ( swift , obsoleted : 4 , message : " Please use operators instead . " ) <nl> mmm a / test / SourceKit / CodeComplete / complete_moduleimportdepth . swift <nl> ppp b / test / SourceKit / CodeComplete / complete_moduleimportdepth . swift <nl> func test ( ) { <nl> / / CHECK : key . modulename : " Swift " <nl> / / CHECK - NEXT : } , <nl> <nl> - / / CHECK - LABEL : key . name : " abs ( : ) " , <nl> - / / CHECK - NEXT : key . sourcetext : " abs ( < # T # # x : FloatingPoint # # FloatingPoint # > ) " , <nl> - / / CHECK - NEXT : key . description : " abs ( x : FloatingPoint ) " , <nl> - / / CHECK - NEXT : key . typename : " FloatingPoint " , <nl> - / / CHECK - NEXT : key . doc . brief : " Returns the absolute value of x . " , <nl> - / / CHECK - NEXT : key . context : source . codecompletion . context . othermodule , <nl> - / / CHECK - NEXT : key . moduleimportdepth : 1 , <nl> - / / CHECK - NEXT : key . num_bytes_to_erase : 0 , <nl> - / / CHECK - NOT : key . modulename <nl> - / / CHECK : key . modulename : " Swift " <nl> - / / CHECK - NEXT : } , <nl> - <nl> / / FooHelper . FooHelperExplicit = = 1 <nl> / / CHECK - LABEL : key . name : " fooHelperExplicitFrameworkFunc1 ( : ) " , <nl> / / CHECK - NEXT : key . sourcetext : " fooHelperExplicitFrameworkFunc1 ( < # T # # a : Int32 # # Int32 # > ) " , <nl> similarity index 76 % <nl> rename from validation - test / Sema / type_checker_perf / slow / more_specialized_generic_func . swift . gyb <nl> rename to validation - test / Sema / type_checker_perf / fast / more_specialized_generic_func . swift . gyb <nl> mmm a / validation - test / Sema / type_checker_perf / slow / more_specialized_generic_func . swift . gyb <nl> ppp b / validation - test / Sema / type_checker_perf / fast / more_specialized_generic_func . swift . gyb <nl> <nl> - / / RUN : % scale - test - - invert - result - - begin 1 - - end 10 - - step 1 - - select incrementScopeCounter % s - - expected - exit - code 0 <nl> + / / RUN : % scale - test - - begin 1 - - end 10 - - step 1 - - select incrementScopeCounter % s - - expected - exit - code 0 <nl> / / REQUIRES : OS = macosx <nl> / / REQUIRES : asserts <nl> <nl> similarity index 100 % <nl> rename from validation - test / Sema / type_checker_perf / slow / rdar23620262 . swift <nl> rename to validation - test / Sema / type_checker_perf / fast / rdar23620262 . swift <nl> | Merge remote - tracking branch ' origin / master ' into master - next | apple/swift | f636e469b1efa11d5533bb7f879d8ed1fda6f515 | 2018-06-21T00:08:52Z |
mmm a / docker / build / build_apollo_docker . sh <nl> ppp b / docker / build / build_apollo_docker . sh <nl> function determine_images_for_x86_64 ( ) { <nl> IMAGE_IN = " $ { APOLLO_REPO } : cyber - x86_64 - $ { UBUNTU_LTS } - 20201029_0047 " <nl> IMAGE_OUT = " $ { APOLLO_REPO } : dev - x86_64 - $ { UBUNTU_LTS } - $ { TIMESTAMP } " <nl> else <nl> - IMAGE_IN = " $ { APOLLO_REPO } : cyber - x86_64 - $ { UBUNTU_LTS } - testing - YYYYMMDD_HHmm " <nl> + IMAGE_IN = " $ { APOLLO_REPO } : cyber - x86_64 - $ { UBUNTU_LTS } - testing - 20201103_1900 " <nl> IMAGE_OUT = " $ { APOLLO_REPO } : dev - x86_64 - $ { UBUNTU_LTS } - testing - $ { TIMESTAMP } " <nl> fi <nl> else <nl> | Docker : : Build : updated testing cyber . x86_64 image for docker . build | ApolloAuto/apollo | 24103da4ffecb11ab16f10fc69d85c29d287a889 | 2020-11-05T03:18:58Z |
mmm a / folly / Makefile . am <nl> ppp b / folly / Makefile . am <nl> nobase_follyinclude_HEADERS = \ <nl> portability / Memory . h \ <nl> portability / PThread . h \ <nl> portability / Sockets . h \ <nl> + portability / Stdio . h \ <nl> portability / Stdlib . h \ <nl> portability / String . h \ <nl> portability / Syslog . h \ <nl> libfolly_la_SOURCES = \ <nl> portability / Malloc . cpp \ <nl> portability / Memory . cpp \ <nl> portability / Sockets . cpp \ <nl> + portability / Stdio . cpp \ <nl> portability / Stdlib . cpp \ <nl> portability / String . cpp \ <nl> portability / SysFile . cpp \ <nl> new file mode 100755 <nl> index 00000000000 . . d6fdd234420 <nl> mmm / dev / null <nl> ppp b / folly / portability / Stdio . cpp <nl> <nl> + / * <nl> + * Copyright 2016 Facebook , Inc . <nl> + * <nl> + * Licensed under the Apache License , Version 2 . 0 ( the " License " ) ; <nl> + * you may not use this file except in compliance with the License . <nl> + * You may obtain a copy of the License at <nl> + * <nl> + * http : / / www . apache . org / licenses / LICENSE - 2 . 0 <nl> + * <nl> + * Unless required by applicable law or agreed to in writing , software <nl> + * distributed under the License is distributed on an " AS IS " BASIS , <nl> + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND , either express or implied . <nl> + * See the License for the specific language governing permissions and <nl> + * limitations under the License . <nl> + * / <nl> + <nl> + # include < folly / portability / Stdio . h > <nl> + <nl> + # ifdef _WIN32 <nl> + # include < cstdlib > <nl> + # include < folly / ScopeGuard . h > <nl> + # include < folly / portability / Unistd . h > <nl> + <nl> + extern " C " { <nl> + int dprintf ( int fd , const char * fmt , . . . ) { <nl> + va_list args ; <nl> + va_start ( args , fmt ) ; <nl> + SCOPE_EXIT { va_end ( args ) ; } ; <nl> + <nl> + int len = vsnprintf ( nullptr , 0 , fmt , args ) ; <nl> + if ( len < = 0 ) { <nl> + return - 1 ; <nl> + } <nl> + char * buf = new char [ len + 1 ] ; <nl> + SCOPE_EXIT { delete [ ] buf ; } ; <nl> + if ( vsnprintf ( buf , len + 1 , fmt , args ) = = len & & write ( fd , buf , len ) = = len ) { <nl> + return len ; <nl> + } <nl> + <nl> + return - 1 ; <nl> + } <nl> + <nl> + int pclose ( FILE * f ) { return _pclose ( f ) ; } <nl> + <nl> + FILE * popen ( const char * name , const char * mode ) { return _popen ( name , mode ) ; } <nl> + <nl> + void setbuffer ( FILE * f , char * buf , size_t size ) { <nl> + setvbuf ( f , buf , _IOFBF , size ) ; <nl> + } <nl> + <nl> + int vasprintf ( char * * dest , const char * format , va_list ap ) { <nl> + int len = vsnprintf ( nullptr , 0 , format , ap ) ; <nl> + if ( len < = 0 ) { <nl> + return - 1 ; <nl> + } <nl> + char * buf = * dest = ( char * ) malloc ( len + 1 ) ; <nl> + if ( vsnprintf ( buf , len + 1 , format , ap ) = = len ) { <nl> + return len ; <nl> + } <nl> + free ( buf ) ; <nl> + return - 1 ; <nl> + } <nl> + } <nl> + # endif <nl> new file mode 100755 <nl> index 00000000000 . . a30fa6d57a7 <nl> mmm / dev / null <nl> ppp b / folly / portability / Stdio . h <nl> <nl> + / * <nl> + * Copyright 2016 Facebook , Inc . <nl> + * <nl> + * Licensed under the Apache License , Version 2 . 0 ( the " License " ) ; <nl> + * you may not use this file except in compliance with the License . <nl> + * You may obtain a copy of the License at <nl> + * <nl> + * http : / / www . apache . org / licenses / LICENSE - 2 . 0 <nl> + * <nl> + * Unless required by applicable law or agreed to in writing , software <nl> + * distributed under the License is distributed on an " AS IS " BASIS , <nl> + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND , either express or implied . <nl> + * See the License for the specific language governing permissions and <nl> + * limitations under the License . <nl> + * / <nl> + <nl> + # pragma once <nl> + <nl> + # include < cstdio > <nl> + <nl> + # ifdef _WIN32 <nl> + # include < cstdarg > <nl> + # include < cstdint > <nl> + <nl> + extern " C " { <nl> + int dprintf ( int fd , const char * fmt , . . . ) ; <nl> + int pclose ( FILE * f ) ; <nl> + FILE * popen ( const char * name , const char * mode ) ; <nl> + void setbuffer ( FILE * f , char * buf , size_t size ) ; <nl> + int vasprintf ( char * * dest , const char * format , va_list ap ) ; <nl> + } <nl> + # endif <nl> | Create the stdio . h portability header | facebook/folly | fb8565ddcd9beb6c62633c0c5c32637d5e96e95b | 2016-05-06T16:37:07Z |
mmm a / docs / install / index . md <nl> ppp b / docs / install / index . md <nl> $ sudo apt - get install - y python - dev python - setuptools python - pip libgfortran3 <nl> <nl> ` ` ` bash <nl> $ cd python <nl> - $ pip install - - upgrade pip <nl> $ pip install - e . <nl> ` ` ` <nl> <nl> $ sudo apt - get install - y python - dev python - setuptools python - pip libgfortran3 <nl> <nl> ` ` ` bash <nl> $ cd python <nl> - $ pip install - - upgrade pip <nl> $ pip install - e . <nl> ` ` ` <nl> <nl> | Remove pip upgrade step from install docs ( ) | apache/incubator-mxnet | 869b156f2f2acfca0012f3e1f720120f9ee9dd8d | 2018-04-18T19:58:23Z |
mmm a / tensorflow / tools / docker / Dockerfile <nl> ppp b / tensorflow / tools / docker / Dockerfile <nl> RUN pip - - no - cache - dir install \ <nl> numpy \ <nl> scipy \ <nl> sklearn \ <nl> + pandas \ <nl> Pillow \ <nl> & & \ <nl> python - m ipykernel . kernelspec <nl> mmm a / tensorflow / tools / docker / Dockerfile . devel <nl> ppp b / tensorflow / tools / docker / Dockerfile . devel <nl> RUN pip - - no - cache - dir install \ <nl> numpy \ <nl> scipy \ <nl> sklearn \ <nl> + pandas \ <nl> & & \ <nl> python - m ipykernel . kernelspec <nl> <nl> mmm a / tensorflow / tools / docker / Dockerfile . devel - gpu <nl> ppp b / tensorflow / tools / docker / Dockerfile . devel - gpu <nl> RUN pip - - no - cache - dir install \ <nl> numpy \ <nl> scipy \ <nl> sklearn \ <nl> + pandas \ <nl> & & \ <nl> python - m ipykernel . kernelspec <nl> <nl> mmm a / tensorflow / tools / docker / Dockerfile . gpu <nl> ppp b / tensorflow / tools / docker / Dockerfile . gpu <nl> RUN pip - - no - cache - dir install \ <nl> numpy \ <nl> scipy \ <nl> sklearn \ <nl> + pandas \ <nl> Pillow \ <nl> & & \ <nl> python - m ipykernel . kernelspec <nl> | Added Python Pandas to Docker Images | tensorflow/tensorflow | 9b532d2b53aca4875471633aad0b85750f068daf | 2017-02-06T21:37:19Z |
mmm a / src / python / grpcio / commands . py <nl> ppp b / src / python / grpcio / commands . py <nl> <nl> ' GRPC_PYTHON_BINARIES_REPOSITORY ' , <nl> ' https : / / storage . googleapis . com / grpc - precompiled - binaries / python ' ) <nl> <nl> + USE_GRPC_CUSTOM_BDIST = bool ( int ( os . environ . get ( <nl> + ' GRPC_PYTHON_USE_CUSTOM_BDIST ' , ' 1 ' ) ) ) <nl> + <nl> CONF_PY_ADDENDUM = " " " <nl> extensions . append ( ' sphinx . ext . napoleon ' ) <nl> napoleon_google_docstring = True <nl> class Install ( install . install , EggNameMixin ) : <nl> <nl> def initialize_options ( self ) : <nl> install . install . initialize_options ( self ) <nl> - self . use_grpc_custom_bdist = bool ( int ( os . environ . get ( ' GRPC_PYTHON_USE_CUSTOM_BDIST ' , ' 1 ' ) ) ) <nl> + self . use_grpc_custom_bdist = USE_GRPC_CUSTOM_BDIST <nl> <nl> def finalize_options ( self ) : <nl> install . install . finalize_options ( self ) <nl> def finalize_options ( self ) : <nl> def run ( self ) : <nl> if self . use_grpc_custom_bdist : <nl> try : <nl> - egg_path = _get_grpc_custom_bdist_egg ( self . egg_name ( True ) , <nl> - self . egg_name ( False ) ) <nl> - except CommandError as error : <nl> - sys . stderr . write ( <nl> - ' \ nWARNING : Failed to acquire grpcio prebuilt binary : \ n ' <nl> - ' { } . \ n \ n ' . format ( error . message ) ) <nl> - raise <nl> - try : <nl> - self . _run_bdist_retrieval_install ( egg_path ) <nl> - except Exception as error : <nl> - # if anything else happens ( and given how there ' s no way to really know <nl> - # what ' s happening in setuptools here , I mean * anything * ) , warn the user <nl> - # and fall back to building from source . <nl> - sys . stderr . write ( <nl> - ' { } \ nWARNING : Failed to install grpcio prebuilt binary . \ n \ n ' <nl> - . format ( traceback . format_exc ( ) ) ) <nl> + try : <nl> + egg_path = _get_grpc_custom_bdist_egg ( self . egg_name ( True ) , <nl> + self . egg_name ( False ) ) <nl> + except CommandError as error : <nl> + sys . stderr . write ( <nl> + ' \ nWARNING : Failed to acquire grpcio prebuilt binary : \ n ' <nl> + ' { } . \ n \ n ' . format ( error . message ) ) <nl> + raise <nl> + try : <nl> + self . _run_bdist_retrieval_install ( egg_path ) <nl> + except Exception as error : <nl> + # if anything else happens ( and given how there ' s no way to really know <nl> + # what ' s happening in setuptools here , I mean * anything * ) , warn the user <nl> + # and fall back to building from source . <nl> + sys . stderr . write ( <nl> + ' { } \ nWARNING : Failed to install grpcio prebuilt binary . \ n \ n ' <nl> + . format ( traceback . format_exc ( ) ) ) <nl> + raise <nl> + except Exception : <nl> install . install . run ( self ) <nl> else : <nl> install . install . run ( self ) <nl> | Merge pull request from soltanmm / cleaners | grpc/grpc | 757c157d861dff34bb85b4f6e10d0708fecb88ce | 2016-02-08T22:57:59Z |
mmm a / CHANGELOG <nl> ppp b / CHANGELOG <nl> <nl> devel <nl> mmm - - <nl> <nl> + * Truncate in RocksDB will now do intermediate commits every 10 . 000 documents <nl> + if truncate fails or the server crashes during this operation all deletes <nl> + that have been commited so far are persisted . <nl> + <nl> * make the default value of ` - - rocksdb . block - cache - shard - bits ` use the RocksDB <nl> default value . This will mostly mean the default number block cache shard <nl> bits is lower than before , allowing each shard to store more data and cause <nl> mmm a / arangod / RocksDBEngine / RocksDBCollection . cpp <nl> ppp b / arangod / RocksDBEngine / RocksDBCollection . cpp <nl> void RocksDBCollection : : invokeOnAllElements ( <nl> void RocksDBCollection : : truncate ( transaction : : Methods * trx , <nl> OperationOptions & options ) { <nl> TRI_ASSERT ( _objectId ! = 0 ) ; <nl> - TRI_voc_cid_t cid = _logicalCollection - > cid ( ) ; <nl> auto state = RocksDBTransactionState : : toState ( trx ) ; <nl> RocksDBMethods * mthd = state - > rocksdbMethods ( ) ; <nl> - <nl> / / delete documents <nl> RocksDBKeyBounds documentBounds = <nl> RocksDBKeyBounds : : CollectionDocuments ( this - > objectId ( ) ) ; <nl> void RocksDBCollection : : truncate ( transaction : : Methods * trx , <nl> iter - > Seek ( documentBounds . start ( ) ) ; <nl> <nl> uint64_t found = 0 ; <nl> + <nl> while ( iter - > Valid ( ) & & cmp - > Compare ( iter - > key ( ) , end ) < 0 ) { <nl> + + found ; <nl> TRI_ASSERT ( _objectId = = RocksDBKey : : objectId ( iter - > key ( ) ) ) ; <nl> + LocalDocumentId docId ( RocksDBKey : : revisionId ( RocksDBEntryType : : Document , iter - > key ( ) ) ) ; <nl> + VPackSlice doc = VPackSlice ( iter - > value ( ) . data ( ) ) ; <nl> + TRI_ASSERT ( doc . isObject ( ) ) ; <nl> <nl> - TRI_voc_rid_t revId = <nl> - RocksDBKey : : revisionId ( RocksDBEntryType : : Document , iter - > key ( ) ) ; <nl> - VPackSlice key = <nl> - VPackSlice ( iter - > value ( ) . data ( ) ) . get ( StaticStrings : : KeyString ) ; <nl> + VPackSlice key = doc . get ( StaticStrings : : KeyString ) ; <nl> TRI_ASSERT ( key . isString ( ) ) ; <nl> <nl> blackListKey ( iter - > key ( ) . data ( ) , static_cast < uint32_t > ( iter - > key ( ) . size ( ) ) ) ; <nl> <nl> - / / add possible log statement <nl> - state - > prepareOperation ( cid , revId , StringRef ( key ) , <nl> - TRI_VOC_DOCUMENT_OPERATION_REMOVE ) ; <nl> - Result r = <nl> - mthd - > Delete ( RocksDBColumnFamily : : documents ( ) , RocksDBKey ( iter - > key ( ) ) ) ; <nl> - if ( ! r . ok ( ) ) { <nl> - THROW_ARANGO_EXCEPTION ( r ) ; <nl> + state - > prepareOperation ( _logicalCollection - > cid ( ) , docId . id ( ) , <nl> + StringRef ( key ) , TRI_VOC_DOCUMENT_OPERATION_REMOVE ) ; <nl> + auto res = removeDocument ( trx , docId , doc , options ) ; <nl> + if ( res . fail ( ) ) { <nl> + / / Failed to remove document in truncate . <nl> + / / Throw <nl> + THROW_ARANGO_EXCEPTION_MESSAGE ( res . errorNumber ( ) , res . errorMessage ( ) ) ; <nl> } <nl> - / / report size of key <nl> - RocksDBOperationResult result = state - > addOperation ( <nl> - cid , revId , TRI_VOC_DOCUMENT_OPERATION_REMOVE , 0 , iter - > key ( ) . size ( ) ) ; <nl> + res = state - > addOperation ( _logicalCollection - > cid ( ) , docId . id ( ) , <nl> + TRI_VOC_DOCUMENT_OPERATION_REMOVE , 0 , <nl> + res . keySize ( ) ) ; <nl> <nl> - / / transaction size limit reached - - fail <nl> - if ( result . fail ( ) ) { <nl> - THROW_ARANGO_EXCEPTION ( result ) ; <nl> + / / transaction size limit reached <nl> + if ( res . fail ( ) ) { <nl> + / / This should never happen . . . <nl> + THROW_ARANGO_EXCEPTION_MESSAGE ( res . errorNumber ( ) , res . errorMessage ( ) ) ; <nl> + } <nl> + <nl> + if ( found % 10000 = = 0 ) { <nl> + state - > triggerIntermediateCommit ( ) ; <nl> } <nl> iter - > Next ( ) ; <nl> } <nl> <nl> - / / delete index items <nl> - READ_LOCKER ( guard , _indexesLock ) ; <nl> - for ( std : : shared_ptr < Index > const & index : _indexes ) { <nl> - RocksDBIndex * rindex = static_cast < RocksDBIndex * > ( index . get ( ) ) ; <nl> - rindex - > truncate ( trx ) ; <nl> + if ( found > 0 ) { <nl> + _needToPersistIndexEstimates = true ; <nl> } <nl> - _needToPersistIndexEstimates = true ; <nl> <nl> # ifdef ARANGODB_ENABLE_MAINTAINER_MODE <nl> - / / check if documents have been deleted <nl> - if ( mthd - > countInBounds ( documentBounds , true ) ) { <nl> - THROW_ARANGO_EXCEPTION_MESSAGE ( TRI_ERROR_INTERNAL , <nl> - " deletion check in collection truncate " <nl> - " failed - not all documents have been " <nl> - " deleted " ) ; <nl> + if ( state - > numCommits ( ) = = 0 ) { <nl> + / / check if documents have been deleted <nl> + if ( mthd - > countInBounds ( documentBounds , true ) ) { <nl> + THROW_ARANGO_EXCEPTION_MESSAGE ( TRI_ERROR_INTERNAL , <nl> + " deletion check in collection truncate " <nl> + " failed - not all documents have been " <nl> + " deleted " ) ; <nl> + } <nl> } <nl> # endif <nl> <nl> + TRI_IF_FAILURE ( " FailAfterAllCommits " ) { <nl> + THROW_ARANGO_EXCEPTION ( TRI_ERROR_DEBUG ) ; <nl> + } <nl> + TRI_IF_FAILURE ( " SegfaultAfterAllCommits " ) { <nl> + TRI_SegfaultDebugging ( " SegfaultAfterAllCommits " ) ; <nl> + } <nl> + <nl> if ( found > 64 * 1024 ) { <nl> / / also compact the ranges in order to speed up all further accesses <nl> / / to the collection <nl> mmm a / arangod / RocksDBEngine / RocksDBEdgeIndex . cpp <nl> ppp b / arangod / RocksDBEngine / RocksDBEdgeIndex . cpp <nl> void RocksDBEdgeIndex : : recalculateEstimates ( ) { <nl> _estimator - > insert ( hash ) ; <nl> } <nl> } <nl> - <nl> - Result RocksDBEdgeIndex : : postprocessRemove ( transaction : : Methods * trx , <nl> - rocksdb : : Slice const & key , <nl> - rocksdb : : Slice const & value ) { <nl> - / / blacklist keys during truncate <nl> - blackListKey ( key . data ( ) , key . size ( ) ) ; <nl> - <nl> - uint64_t hash = RocksDBEdgeIndex : : HashForKey ( key ) ; <nl> - _estimator - > remove ( hash ) ; <nl> - return Result ( ) ; <nl> - } <nl> mmm a / arangod / RocksDBEngine / RocksDBEdgeIndex . h <nl> ppp b / arangod / RocksDBEngine / RocksDBEdgeIndex . h <nl> class RocksDBEdgeIndex final : public RocksDBIndex { <nl> <nl> virtual std : : pair < RocksDBCuckooIndexEstimator < uint64_t > * , uint64_t > estimator ( ) const override ; <nl> <nl> - protected : <nl> - Result postprocessRemove ( transaction : : Methods * trx , rocksdb : : Slice const & key , <nl> - rocksdb : : Slice const & value ) override ; <nl> - <nl> private : <nl> / / / @ brief create the iterator <nl> IndexIterator * createEqIterator ( transaction : : Methods * , ManagedDocumentResult * , <nl> mmm a / arangod / RocksDBEngine / RocksDBGeoIndex . cpp <nl> ppp b / arangod / RocksDBEngine / RocksDBGeoIndex . cpp <nl> Result RocksDBGeoIndex : : removeInternal ( transaction : : Methods * trx , <nl> return IndexResult ( ) ; <nl> } <nl> <nl> - void RocksDBGeoIndex : : truncate ( transaction : : Methods * trx ) { <nl> - TRI_ASSERT ( _geoIndex ! = nullptr ) ; <nl> - RocksDBIndex : : truncate ( trx ) ; <nl> - GeoIndex_reset ( _geoIndex , RocksDBTransactionState : : toMethods ( trx ) ) ; <nl> - } <nl> - <nl> / / / @ brief looks up all points within a given radius <nl> GeoCoordinates * RocksDBGeoIndex : : withinQuery ( transaction : : Methods * trx , <nl> double lat , double lon , <nl> mmm a / arangod / RocksDBEngine / RocksDBGeoIndex . h <nl> ppp b / arangod / RocksDBEngine / RocksDBGeoIndex . h <nl> class RocksDBGeoIndex final : public RocksDBIndex { <nl> <nl> void unload ( ) override { } <nl> <nl> - void truncate ( transaction : : Methods * ) override ; <nl> - <nl> / / / @ brief looks up all points within a given radius <nl> arangodb : : rocksdbengine : : GeoCoordinates * withinQuery ( transaction : : Methods * , <nl> double , double , <nl> mmm a / arangod / RocksDBEngine / RocksDBIndex . cpp <nl> ppp b / arangod / RocksDBEngine / RocksDBIndex . cpp <nl> Result RocksDBIndex : : updateInternal ( transaction : : Methods * trx , RocksDBMethods * m <nl> return insertInternal ( trx , mthd , newDocumentId , newDoc , mode ) ; <nl> } <nl> <nl> - void RocksDBIndex : : truncate ( transaction : : Methods * trx ) { <nl> - auto * mthds = RocksDBTransactionState : : toMethods ( trx ) ; <nl> - auto state = RocksDBTransactionState : : toState ( trx ) ; <nl> - RocksDBKeyBounds indexBounds = getBounds ( type ( ) , _objectId , _unique ) ; <nl> - <nl> - rocksdb : : ReadOptions options = mthds - > readOptions ( ) ; <nl> - rocksdb : : Slice end = indexBounds . end ( ) ; <nl> - rocksdb : : Comparator const * cmp = this - > comparator ( ) ; <nl> - options . iterate_upper_bound = & end ; <nl> - if ( type ( ) = = RocksDBIndex : : TRI_IDX_TYPE_EDGE_INDEX ) { <nl> - options . prefix_same_as_start = false ; <nl> - options . total_order_seek = true ; <nl> - } <nl> - options . verify_checksums = false ; <nl> - options . fill_cache = false ; <nl> - <nl> - std : : unique_ptr < rocksdb : : Iterator > iter = mthds - > NewIterator ( options , _cf ) ; <nl> - iter - > Seek ( indexBounds . start ( ) ) ; <nl> - <nl> - while ( iter - > Valid ( ) & & cmp - > Compare ( iter - > key ( ) , end ) < 0 ) { <nl> - TRI_ASSERT ( _objectId = = RocksDBKey : : objectId ( iter - > key ( ) ) ) ; <nl> - <nl> - / / report size of key <nl> - RocksDBOperationResult result = state - > addInternalOperation ( <nl> - 0 , iter - > key ( ) . size ( ) ) ; <nl> - <nl> - / / transaction size limit reached - - fail <nl> - if ( result . fail ( ) ) { <nl> - THROW_ARANGO_EXCEPTION ( result ) ; <nl> - } <nl> - <nl> - Result r = mthds - > Delete ( _cf , RocksDBKey ( iter - > key ( ) ) ) ; <nl> - if ( ! r . ok ( ) ) { <nl> - THROW_ARANGO_EXCEPTION ( r ) ; <nl> - } <nl> - <nl> - r = postprocessRemove ( trx , iter - > key ( ) , iter - > value ( ) ) ; <nl> - if ( ! r . ok ( ) ) { <nl> - THROW_ARANGO_EXCEPTION ( r ) ; <nl> - } <nl> - <nl> - iter - > Next ( ) ; <nl> - } <nl> - <nl> - # ifdef ARANGODB_ENABLE_MAINTAINER_MODE <nl> - / / check if index entries have been deleted <nl> - if ( type ( ) ! = TRI_IDX_TYPE_GEO1_INDEX & & type ( ) ! = TRI_IDX_TYPE_GEO2_INDEX ) { <nl> - if ( mthds - > countInBounds ( getBounds ( ) , true ) ) { <nl> - THROW_ARANGO_EXCEPTION_MESSAGE ( TRI_ERROR_INTERNAL , <nl> - " deletion check in collection truncate " <nl> - " failed - not all documents in an index " <nl> - " have been deleted " ) ; <nl> - } <nl> - } <nl> - # endif <nl> - } <nl> - <nl> / / / @ brief return the memory usage of the index <nl> size_t RocksDBIndex : : memory ( ) const { <nl> rocksdb : : TransactionDB * db = rocksutils : : globalRocksDB ( ) ; <nl> void RocksDBIndex : : cleanup ( ) { <nl> } <nl> } <nl> <nl> - Result RocksDBIndex : : postprocessRemove ( transaction : : Methods * trx , <nl> - rocksdb : : Slice const & key , <nl> - rocksdb : : Slice const & value ) { <nl> - return Result ( ) ; <nl> - } <nl> - <nl> / / blacklist given key from transactional cache <nl> void RocksDBIndex : : blackListKey ( char const * data , std : : size_t len ) { <nl> if ( useCache ( ) ) { <nl> mmm a / arangod / RocksDBEngine / RocksDBIndex . h <nl> ppp b / arangod / RocksDBEngine / RocksDBIndex . h <nl> class RocksDBIndex : public Index { <nl> void load ( ) override ; <nl> void unload ( ) override ; <nl> <nl> - virtual void truncate ( transaction : : Methods * ) ; <nl> - <nl> size_t memory ( ) const override ; <nl> <nl> void cleanup ( ) ; <nl> class RocksDBIndex : public Index { <nl> virtual std : : pair < RocksDBCuckooIndexEstimator < uint64_t > * , uint64_t > estimator ( ) const ; <nl> <nl> protected : <nl> - / / Will be called during truncate to allow the index to update selectivity <nl> - / / estimates , blacklist keys , etc . <nl> - virtual Result postprocessRemove ( transaction : : Methods * trx , <nl> - rocksdb : : Slice const & key , <nl> - rocksdb : : Slice const & value ) ; <nl> - <nl> inline bool useCache ( ) const { return ( _cacheEnabled & & _cachePresent ) ; } <nl> void blackListKey ( char const * data , std : : size_t len ) ; <nl> void blackListKey ( StringRef & ref ) { blackListKey ( ref . data ( ) , ref . size ( ) ) ; } ; <nl> mmm a / arangod / RocksDBEngine / RocksDBPrimaryIndex . cpp <nl> ppp b / arangod / RocksDBEngine / RocksDBPrimaryIndex . cpp <nl> arangodb : : aql : : AstNode * RocksDBPrimaryIndex : : specializeCondition ( <nl> return matcher . specializeOne ( this , node , reference ) ; <nl> } <nl> <nl> - Result RocksDBPrimaryIndex : : postprocessRemove ( transaction : : Methods * trx , <nl> - rocksdb : : Slice const & key , <nl> - rocksdb : : Slice const & value ) { <nl> - blackListKey ( key . data ( ) , key . size ( ) ) ; <nl> - return Result ( ) ; <nl> - } <nl> - <nl> / / / @ brief create the iterator , for a single attribute , IN operator <nl> IndexIterator * RocksDBPrimaryIndex : : createInIterator ( <nl> transaction : : Methods * trx , ManagedDocumentResult * mmdr , <nl> mmm a / arangod / RocksDBEngine / RocksDBPrimaryIndex . h <nl> ppp b / arangod / RocksDBEngine / RocksDBPrimaryIndex . h <nl> class RocksDBPrimaryIndex final : public RocksDBIndex { <nl> arangodb : : velocypack : : Slice const & , <nl> OperationMode mode ) override ; <nl> <nl> - protected : <nl> - Result postprocessRemove ( transaction : : Methods * trx , rocksdb : : Slice const & key , <nl> - rocksdb : : Slice const & value ) override ; <nl> - <nl> private : <nl> / / / @ brief create the iterator , for a single attribute , IN operator <nl> IndexIterator * createInIterator ( transaction : : Methods * , ManagedDocumentResult * , <nl> mmm a / arangod / RocksDBEngine / RocksDBTransactionState . cpp <nl> ppp b / arangod / RocksDBEngine / RocksDBTransactionState . cpp <nl> uint64_t RocksDBTransactionState : : sequenceNumber ( ) const { <nl> THROW_ARANGO_EXCEPTION_MESSAGE ( TRI_ERROR_INTERNAL , " No snapshot set " ) ; <nl> } <nl> <nl> + void RocksDBTransactionState : : triggerIntermediateCommit ( ) { <nl> + TRI_IF_FAILURE ( " FailBeforeIntermediateCommit " ) { <nl> + THROW_ARANGO_EXCEPTION ( TRI_ERROR_DEBUG ) ; <nl> + } <nl> + TRI_IF_FAILURE ( " SegfaultBeforeIntermediateCommit " ) { <nl> + TRI_SegfaultDebugging ( " SegfaultBeforeIntermediateCommit " ) ; <nl> + } <nl> + <nl> + TRI_ASSERT ( ! hasHint ( transaction : : Hints : : Hint : : SINGLE_OPERATION ) ) ; <nl> + LOG_TOPIC ( DEBUG , Logger : : ROCKSDB ) < < " INTERMEDIATE COMMIT ! " ; <nl> + <nl> + internalCommit ( ) ; <nl> + <nl> + TRI_IF_FAILURE ( " FailAfterIntermediateCommit " ) { <nl> + THROW_ARANGO_EXCEPTION ( TRI_ERROR_DEBUG ) ; <nl> + } <nl> + TRI_IF_FAILURE ( " SegfaultAfterIntermediateCommit " ) { <nl> + TRI_SegfaultDebugging ( " SegfaultAfterIntermediateCommit " ) ; <nl> + } <nl> + <nl> + _lastUsedCollection = 0 ; <nl> + _numInternal = 0 ; <nl> + _numInserts = 0 ; <nl> + _numUpdates = 0 ; <nl> + _numRemoves = 0 ; <nl> + # ifdef ARANGODB_ENABLE_MAINTAINER_MODE <nl> + _numLogdata = 0 ; <nl> + # endif <nl> + createTransaction ( ) ; <nl> + } <nl> + <nl> void RocksDBTransactionState : : checkIntermediateCommit ( uint64_t newSize ) { <nl> auto numOperations = _numInserts + _numUpdates + _numRemoves + _numInternal ; <nl> / / perform an intermediate commit <nl> void RocksDBTransactionState : : checkIntermediateCommit ( uint64_t newSize ) { <nl> / / " transaction size " counters have reached their limit <nl> if ( _options . intermediateCommitCount < = numOperations | | <nl> _options . intermediateCommitSize < = newSize ) { <nl> - TRI_ASSERT ( ! hasHint ( transaction : : Hints : : Hint : : SINGLE_OPERATION ) ) ; <nl> - LOG_TOPIC ( DEBUG , Logger : : ROCKSDB ) < < " INTERMEDIATE COMMIT ! " ; <nl> - internalCommit ( ) ; <nl> - _lastUsedCollection = 0 ; <nl> - _numInternal = 0 ; <nl> - _numInserts = 0 ; <nl> - _numUpdates = 0 ; <nl> - _numRemoves = 0 ; <nl> - # ifdef ARANGODB_ENABLE_MAINTAINER_MODE <nl> - _numLogdata = 0 ; <nl> - # endif <nl> - createTransaction ( ) ; <nl> + triggerIntermediateCommit ( ) ; <nl> } <nl> } <nl> <nl> mmm a / arangod / RocksDBEngine / RocksDBTransactionState . h <nl> ppp b / arangod / RocksDBEngine / RocksDBTransactionState . h <nl> class RocksDBTransactionState final : public TransactionState { <nl> RocksDBKey * leaseRocksDBKey ( ) ; <nl> / / / @ brief return a temporary RocksDBKey object . Not thread safe <nl> void returnRocksDBKey ( RocksDBKey * key ) ; <nl> + / / / @ brief Trigger an intermediate commit . <nl> + / / / Handle with care if failing after this commit it will only <nl> + / / / be rolled back until this point of time . <nl> + / / / Not thread safe <nl> + void triggerIntermediateCommit ( ) ; <nl> <nl> private : <nl> / / / @ brief create a new rocksdb transaction <nl> mmm a / arangod / RocksDBEngine / RocksDBVPackIndex . cpp <nl> ppp b / arangod / RocksDBEngine / RocksDBVPackIndex . cpp <nl> void RocksDBVPackIndex : : recalculateEstimates ( ) { <nl> bounds . columnFamily ( ) ) ; <nl> } <nl> <nl> - Result RocksDBVPackIndex : : postprocessRemove ( transaction : : Methods * trx , <nl> - rocksdb : : Slice const & key , <nl> - rocksdb : : Slice const & value ) { <nl> - if ( ! unique ( ) ) { <nl> - uint64_t hash = RocksDBVPackIndex : : HashForKey ( key ) ; <nl> - _estimator - > remove ( hash ) ; <nl> - } <nl> - return Result ( ) ; <nl> - } <nl> - <nl> std : : pair < RocksDBCuckooIndexEstimator < uint64_t > * , uint64_t > <nl> RocksDBVPackIndex : : estimator ( ) const { <nl> return std : : make_pair ( _estimator . get ( ) , _estimatorSerializedSeq ) ; <nl> mmm a / arangod / RocksDBEngine / RocksDBVPackIndex . h <nl> ppp b / arangod / RocksDBEngine / RocksDBVPackIndex . h <nl> class RocksDBVPackIndex : public RocksDBIndex { <nl> arangodb : : velocypack : : Slice const & , <nl> OperationMode mode ) override ; <nl> <nl> - Result postprocessRemove ( transaction : : Methods * trx , rocksdb : : Slice const & key , <nl> - rocksdb : : Slice const & value ) override ; <nl> - <nl> virtual std : : pair < RocksDBCuckooIndexEstimator < uint64_t > * , uint64_t > estimator ( ) const override ; <nl> <nl> private : <nl> mmm a / js / common / tests / shell / shell - collection - rocksdb - noncluster . js <nl> ppp b / js / common / tests / shell / shell - collection - rocksdb - noncluster . js <nl> var jsunity = require ( " jsunity " ) ; <nl> var arangodb = require ( " @ arangodb " ) ; <nl> var ArangoCollection = arangodb . ArangoCollection ; <nl> var testHelper = require ( " @ arangodb / test - helper " ) . Helper ; <nl> + const internal = require ( " internal " ) ; <nl> var db = arangodb . db ; <nl> var ERRORS = arangodb . errors ; <nl> <nl> function CollectionCacheSuite ( ) { <nl> } ; <nl> } <nl> <nl> + function CollectionTruncateFailuresSuite ( ) { <nl> + const cn = " UnitTestsTruncate " ; <nl> + let c ; <nl> + const cleanUp = ( ) = > { <nl> + internal . debugClearFailAt ( ) ; <nl> + try { <nl> + db . _drop ( cn ) ; <nl> + } catch ( _ ) { } <nl> + } ; <nl> + <nl> + const docs = [ ] ; <nl> + for ( let i = 0 ; i < 10000 ; + + i ) { <nl> + docs . push ( { value : i % 250 , value2 : i % 100 } ) ; <nl> + } <nl> + <nl> + return { <nl> + <nl> + tearDown : cleanUp , <nl> + <nl> + setUp : function ( ) { <nl> + cleanUp ( ) ; <nl> + c = db . _create ( cn ) ; <nl> + c . ensureHashIndex ( " value " ) ; <nl> + c . ensureSkiplist ( " value2 " ) ; <nl> + <nl> + / / Add two packs of 10 . 000 Documents . <nl> + / / Intermediate commits will commit after 10 . 000 removals <nl> + c . save ( docs ) ; <nl> + c . save ( docs ) ; <nl> + } , <nl> + <nl> + testTruncateFailsAfterAllCommits : function ( ) { <nl> + internal . debugSetFailAt ( " FailAfterAllCommits " ) ; <nl> + try { <nl> + c . truncate ( ) ; <nl> + fail ( ) ; <nl> + } catch ( e ) { <nl> + / / Validate that we died with debug <nl> + assertEqual ( e . errorNum , ERRORS . ERROR_DEBUG . code ) ; <nl> + } <nl> + <nl> + / / All docments should be removed through intermediate commits . <nl> + / / We have two packs that fill up those commits . <nl> + / / Now validate that we endup with an empty collection . <nl> + assertEqual ( c . count ( ) , 0 ) ; <nl> + <nl> + / / Test Primary <nl> + { <nl> + let q = ` FOR x IN @ @ c RETURN x . _key ` ; <nl> + let res = db . _query ( q , { " @ c " : cn } ) . toArray ( ) ; <nl> + assertEqual ( res . length , 0 ) ; <nl> + } <nl> + <nl> + / / Test Hash <nl> + { <nl> + let q = ` FOR x IN @ @ c FILTER x . value = = @ i RETURN x ` ; <nl> + for ( let i = 0 ; i < 250 ; + + i ) { <nl> + / / This validates that all documents can be found again <nl> + let res = db . _query ( q , { " @ c " : cn , i : i } ) . toArray ( ) ; <nl> + assertEqual ( res . length , 0 ) ; <nl> + } <nl> + <nl> + / / just validate that no other values are inserted . <nl> + let res2 = db . _query ( q , { " @ c " : cn , i : 251 } ) . toArray ( ) ; <nl> + assertEqual ( res2 . length , 0 ) ; <nl> + } <nl> + <nl> + / / Test Skiplist <nl> + { <nl> + let q = ` FOR x IN @ @ c FILTER x . value2 = = @ i RETURN x ` ; <nl> + for ( let i = 0 ; i < 100 ; + + i ) { <nl> + / / This validates that all documents can be found again <nl> + let res = db . _query ( q , { " @ c " : cn , i : i } ) . toArray ( ) ; <nl> + assertEqual ( res . length , 0 ) ; <nl> + } <nl> + <nl> + / / just validate that no other values are inserted . <nl> + let res2 = db . _query ( q , { " @ c " : cn , i : 101 } ) . toArray ( ) ; <nl> + assertEqual ( res2 . length , 0 ) ; <nl> + } <nl> + <nl> + / / Test Selectivity Estimates <nl> + { <nl> + let indexes = c . getIndexes ( true ) ; <nl> + for ( let i of indexes ) { <nl> + switch ( i . type ) { <nl> + case ' primary ' : <nl> + assertEqual ( i . selectivityEstimate , 1 ) ; <nl> + break ; <nl> + case ' hash ' : <nl> + assertEqual ( i . selectivityEstimate , 1 ) ; <nl> + break ; <nl> + case ' skiplist ' : <nl> + assertEqual ( i . selectivityEstimate , 1 ) ; <nl> + break ; <nl> + default : <nl> + fail ( ) ; <nl> + } <nl> + } <nl> + } <nl> + } , <nl> + <nl> + testTruncateFailsBeforeCommit : function ( ) { <nl> + const docsWithEqHash = 20000 / 250 ; <nl> + const docsWithEqSkip = 20000 / 100 ; <nl> + internal . debugSetFailAt ( " FailBeforeIntermediateCommit " ) ; <nl> + internal . print ( c . getIndexes ( true ) ) ; <nl> + try { <nl> + c . truncate ( ) ; <nl> + fail ( ) ; <nl> + } catch ( e ) { <nl> + / / Validate that we died with debug <nl> + assertEqual ( e . errorNum , ERRORS . ERROR_DEBUG . code ) ; <nl> + } <nl> + internal . print ( c . getIndexes ( true ) ) ; <nl> + <nl> + / / All docments should be removed through intermediate commits . <nl> + / / We have two packs that fill up those commits . <nl> + / / Now validate that we endup with an empty collection . <nl> + assertEqual ( c . count ( ) , 20000 ) ; <nl> + <nl> + / / Test Primary <nl> + { <nl> + let q = ` FOR x IN @ @ c RETURN x . _key ` ; <nl> + let res = db . _query ( q , { " @ c " : cn } ) . toArray ( ) ; <nl> + assertEqual ( res . length , 20000 ) ; <nl> + } <nl> + <nl> + / / Test Hash <nl> + { <nl> + let q = ` FOR x IN @ @ c FILTER x . value = = @ i RETURN x ` ; <nl> + for ( let i = 0 ; i < 250 ; + + i ) { <nl> + / / This validates that all documents can be found again <nl> + let res = db . _query ( q , { " @ c " : cn , i : i } ) . toArray ( ) ; <nl> + assertEqual ( res . length , docsWithEqHash ) ; <nl> + } <nl> + <nl> + / / just validate that no other values are inserted . <nl> + let res2 = db . _query ( q , { " @ c " : cn , i : 251 } ) . toArray ( ) ; <nl> + assertEqual ( res2 . length , 0 ) ; <nl> + } <nl> + <nl> + / / Test Skiplist <nl> + { <nl> + let q = ` FOR x IN @ @ c FILTER x . value2 = = @ i RETURN x ` ; <nl> + for ( let i = 0 ; i < 100 ; + + i ) { <nl> + / / This validates that all documents can be found again <nl> + let res = db . _query ( q , { " @ c " : cn , i : i } ) . toArray ( ) ; <nl> + assertEqual ( res . length , docsWithEqSkip ) ; <nl> + } <nl> + <nl> + / / just validate that no other values are inserted . <nl> + let res2 = db . _query ( q , { " @ c " : cn , i : 101 } ) . toArray ( ) ; <nl> + assertEqual ( res2 . length , 0 ) ; <nl> + } <nl> + <nl> + / / Test Selectivity Estimates <nl> + { <nl> + let indexes = c . getIndexes ( true ) ; <nl> + for ( let i of indexes ) { <nl> + switch ( i . type ) { <nl> + case ' primary ' : <nl> + assertEqual ( i . selectivityEstimate , 1 ) ; <nl> + break ; <nl> + case ' hash ' : <nl> + assertEqual ( i . selectivityEstimate , 0 . 0125 ) ; <nl> + break ; <nl> + case ' skiplist ' : <nl> + assertEqual ( i . selectivityEstimate , 0 . 005 ) ; <nl> + break ; <nl> + default : <nl> + fail ( ) ; <nl> + } <nl> + } <nl> + } <nl> + <nl> + } , <nl> + <nl> + testTruncateFailsBetweenCommits : function ( ) { <nl> + internal . debugSetFailAt ( " FailAfterIntermediateCommit " ) ; <nl> + const docsWithEqHash = 20000 / 250 ; <nl> + const docsWithEqSkip = 20000 / 100 ; <nl> + <nl> + try { <nl> + c . truncate ( ) ; <nl> + fail ( ) ; <nl> + } catch ( e ) { <nl> + / / Validate that we died with debug <nl> + assertEqual ( e . errorNum , ERRORS . ERROR_DEBUG . code ) ; <nl> + } <nl> + <nl> + / / All docments should be removed through intermediate commits . <nl> + / / We have two packs that fill up those commits . <nl> + / / Now validate that we endup with an empty collection . <nl> + assertEqual ( c . count ( ) , 10000 ) ; <nl> + <nl> + / / Test Primary <nl> + { <nl> + let q = ` FOR x IN @ @ c RETURN x . _key ` ; <nl> + let res = db . _query ( q , { " @ c " : cn } ) . toArray ( ) ; <nl> + assertEqual ( res . length , 10000 ) ; <nl> + } <nl> + <nl> + / / Test Hash <nl> + { <nl> + let sum = 0 ; <nl> + let q = ` FOR x IN @ @ c FILTER x . value = = @ i RETURN x ` ; <nl> + for ( let i = 0 ; i < 250 ; + + i ) { <nl> + / / This validates that all documents can be found again <nl> + let res = db . _query ( q , { " @ c " : cn , i : i } ) . toArray ( ) ; <nl> + assertTrue ( res . length < docsWithEqHash ) ; <nl> + sum + = res . length ; <nl> + } <nl> + assertEqual ( sum , 10000 ) ; <nl> + <nl> + / / just validate that no other values are inserted . <nl> + let res2 = db . _query ( q , { " @ c " : cn , i : 251 } ) . toArray ( ) ; <nl> + assertEqual ( res2 . length , 0 ) ; <nl> + } <nl> + <nl> + / / Test Skiplist <nl> + { <nl> + let q = ` FOR x IN @ @ c FILTER x . value2 = = @ i RETURN x ` ; <nl> + let sum = 0 ; <nl> + for ( let i = 0 ; i < 100 ; + + i ) { <nl> + / / This validates that all documents can be found again <nl> + let res = db . _query ( q , { " @ c " : cn , i : i } ) . toArray ( ) ; <nl> + assertTrue ( res . length < docsWithEqSkip ) ; <nl> + sum + = res . length ; <nl> + } <nl> + assertEqual ( sum , 10000 ) ; <nl> + <nl> + / / just validate that no other values are inserted . <nl> + let res2 = db . _query ( q , { " @ c " : cn , i : 101 } ) . toArray ( ) ; <nl> + assertEqual ( res2 . length , 0 ) ; <nl> + } <nl> + <nl> + / / Test Selectivity Estimates <nl> + / / This may be fuzzy . . . <nl> + { <nl> + let indexes = c . getIndexes ( true ) ; <nl> + for ( let i of indexes ) { <nl> + switch ( i . type ) { <nl> + case ' primary ' : <nl> + assertEqual ( i . selectivityEstimate , 1 ) ; <nl> + break ; <nl> + case ' hash ' : <nl> + assertEqual ( i . selectivityEstimate , 0 . 025 ) ; <nl> + break ; <nl> + case ' skiplist ' : <nl> + assertEqual ( i . selectivityEstimate , 0 . 01 ) ; <nl> + break ; <nl> + default : <nl> + fail ( ) ; <nl> + } <nl> + } <nl> + } <nl> + } , <nl> + <nl> + } ; <nl> + } <nl> + <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief executes the test suites <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> - jsunity . run ( CollectionSuite ) ; <nl> - jsunity . run ( CollectionCacheSuite ) ; <nl> + / / jsunity . run ( CollectionSuite ) ; <nl> + / / jsunity . run ( CollectionCacheSuite ) ; <nl> + <nl> + if ( internal . debugCanUseFailAt ( ) ) { <nl> + jsunity . run ( CollectionTruncateFailuresSuite ) ; <nl> + } <nl> <nl> return jsunity . done ( ) ; <nl> new file mode 100644 <nl> index 00000000000 . . 69d099b40c8 <nl> mmm / dev / null <nl> ppp b / js / server / tests / recovery / truncate - collection - failures - after - commits - rocksdb . js <nl> <nl> + / * jshint globalstrict : false , strict : false , unused : false * / <nl> + / * global assertEqual , assertFalse , fail * / <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief tests for truncate on rocksdb with intermediate commits & failures <nl> + / / / <nl> + / / / @ file <nl> + / / / <nl> + / / / DISCLAIMER <nl> + / / / <nl> + / / / Copyright 2010 - 2012 triagens GmbH , Cologne , Germany <nl> + / / / <nl> + / / / Licensed under the Apache License , Version 2 . 0 ( the " License " ) <nl> + / / / you may not use this file except in compliance with the License . <nl> + / / / You may obtain a copy of the License at <nl> + / / / <nl> + / / / http : / / www . apache . org / licenses / LICENSE - 2 . 0 <nl> + / / / <nl> + / / / Unless required by applicable law or agreed to in writing , software <nl> + / / / distributed under the License is distributed on an " AS IS " BASIS , <nl> + / / / WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND , either express or implied . <nl> + / / / See the License for the specific language governing permissions and <nl> + / / / limitations under the License . <nl> + / / / <nl> + / / / Copyright holder is ArangoDB GmbH , Cologne , Germany <nl> + / / / <nl> + / / / @ author Michael Hackstein <nl> + / / / @ author Copyright 2017 , ArangoDB GmbH , Cologne , Germany <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + ' use strict ' ; <nl> + const db = require ( ' @ arangodb ' ) . db ; <nl> + const internal = require ( ' internal ' ) ; <nl> + const jsunity = require ( ' jsunity ' ) ; <nl> + const colName = " UnitTestsRecovery " ; <nl> + <nl> + const runSetup = function ( ) { <nl> + internal . debugClearFailAt ( ) ; <nl> + <nl> + db . _drop ( colName ) ; <nl> + const c = db . _create ( colName ) ; <nl> + c . ensureHashIndex ( " value " ) ; <nl> + c . ensureSkiplist ( " value2 " ) ; <nl> + <nl> + const docs = [ ] ; <nl> + for ( let i = 0 ; i < 10000 ; + + i ) { <nl> + docs . push ( { value : i % 250 , value2 : i % 100 } ) ; <nl> + } <nl> + / / Add two packs of 10 . 000 Documents . <nl> + / / Intermediate commits will commit after 10 . 000 removals <nl> + c . save ( docs ) ; <nl> + c . save ( docs ) ; <nl> + <nl> + internal . debugSetFailAt ( " SegfaultAfterAllCommits " ) ; <nl> + <nl> + / / This will crash the server <nl> + c . truncate ( ) ; <nl> + <nl> + fail ( ) ; <nl> + } ; <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief test suite <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + const recoverySuite = function ( ) { <nl> + jsunity . jsUnity . attachAssertions ( ) ; <nl> + <nl> + const c = db . _collection ( colName ) ; <nl> + <nl> + return { <nl> + setUp : function ( ) { } , <nl> + tearDown : function ( ) { } , <nl> + <nl> + / / Test that count of collection remains unmodified . <nl> + / / We crashed after all commits , before return <nl> + testCollectionCount : ( ) = > { <nl> + assertEqual ( c . count ( ) , 0 ) ; <nl> + } , <nl> + <nl> + / / Test that the HashIndex remains intact but empty . <nl> + testPrimaryIndex : ( ) = > { <nl> + let q = ` FOR x IN @ @ c RETURN x . _key ` ; <nl> + let res = db . _query ( q , { " @ c " : colName } ) . toArray ( ) ; <nl> + assertEqual ( res . length , 0 ) ; <nl> + } , <nl> + <nl> + <nl> + / / Test that the HashIndex remains intact but empty . <nl> + testHashIndex : ( ) = > { <nl> + let q = ` FOR x IN @ @ c FILTER x . value = = @ i RETURN x ` ; <nl> + for ( let i = 0 ; i < 250 ; + + i ) { <nl> + / / This validates that all documents can be found again <nl> + let res = db . _query ( q , { " @ c " : colName , i : i } ) . toArray ( ) ; <nl> + assertEqual ( res . length , 0 ) ; <nl> + } <nl> + <nl> + / / just validate that no other values are inserted . <nl> + let res2 = db . _query ( q , { " @ c " : colName , i : 251 } ) . toArray ( ) ; <nl> + assertEqual ( res2 . length , 0 ) ; <nl> + } , <nl> + <nl> + / / Test that the SkiplistIndex remains intact . <nl> + testSkiplistIndex : ( ) = > { <nl> + let q = ` FOR x IN @ @ c FILTER x . value2 = = @ i RETURN x ` ; <nl> + for ( let i = 0 ; i < 100 ; + + i ) { <nl> + / / This validates that all documents can be found again <nl> + let res = db . _query ( q , { " @ c " : colName , i : i } ) . toArray ( ) ; <nl> + assertEqual ( res . length , 0 ) ; <nl> + } <nl> + <nl> + / / just validate that no other values are inserted . <nl> + let res2 = db . _query ( q , { " @ c " : colName , i : 101 } ) . toArray ( ) ; <nl> + assertEqual ( res2 . length , 0 ) ; <nl> + } , <nl> + <nl> + testIndexEstimates : ( ) = > { <nl> + let indexes = c . getIndexes ( true ) ; <nl> + for ( let i of indexes ) { <nl> + switch ( i . type ) { <nl> + case ' primary ' : <nl> + assertEqual ( i . selectivityEstimate , 1 ) ; <nl> + break ; <nl> + case ' hash ' : <nl> + assertEqual ( i . selectivityEstimate , 1 ) ; <nl> + break ; <nl> + case ' skiplist ' : <nl> + assertEqual ( i . selectivityEstimate , 1 ) ; <nl> + break ; <nl> + default : <nl> + fail ( ) ; <nl> + } <nl> + } <nl> + } , <nl> + } ; <nl> + <nl> + } ; <nl> + <nl> + <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief executes the test suites <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + function main ( argv ) { <nl> + ' use strict ' ; <nl> + <nl> + if ( internal . debugCanUseFailAt ( ) ) { <nl> + if ( argv [ 1 ] = = = ' setup ' ) { <nl> + runSetup ( ) ; <nl> + return 0 ; <nl> + } else { <nl> + jsunity . run ( recoverySuite ) ; <nl> + return jsunity . done ( ) . status ? 0 : 1 ; <nl> + } <nl> + } else { <nl> + return jsunity . done ( ) ; <nl> + } <nl> + } <nl> new file mode 100644 <nl> index 00000000000 . . 3e32714a6ff <nl> mmm / dev / null <nl> ppp b / js / server / tests / recovery / truncate - collection - failures - before - commit - rocksdb . js <nl> <nl> + / * jshint globalstrict : false , strict : false , unused : false * / <nl> + / * global assertEqual , assertFalse , fail * / <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief tests for truncate on rocksdb with intermediate commits & failures <nl> + / / / <nl> + / / / @ file <nl> + / / / <nl> + / / / DISCLAIMER <nl> + / / / <nl> + / / / Copyright 2010 - 2012 triagens GmbH , Cologne , Germany <nl> + / / / <nl> + / / / Licensed under the Apache License , Version 2 . 0 ( the " License " ) <nl> + / / / you may not use this file except in compliance with the License . <nl> + / / / You may obtain a copy of the License at <nl> + / / / <nl> + / / / http : / / www . apache . org / licenses / LICENSE - 2 . 0 <nl> + / / / <nl> + / / / Unless required by applicable law or agreed to in writing , software <nl> + / / / distributed under the License is distributed on an " AS IS " BASIS , <nl> + / / / WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND , either express or implied . <nl> + / / / See the License for the specific language governing permissions and <nl> + / / / limitations under the License . <nl> + / / / <nl> + / / / Copyright holder is ArangoDB GmbH , Cologne , Germany <nl> + / / / <nl> + / / / @ author Michael Hackstein <nl> + / / / @ author Copyright 2017 , ArangoDB GmbH , Cologne , Germany <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + ' use strict ' ; <nl> + const db = require ( ' @ arangodb ' ) . db ; <nl> + const internal = require ( ' internal ' ) ; <nl> + const jsunity = require ( ' jsunity ' ) ; <nl> + const colName = " UnitTestsRecovery " ; <nl> + <nl> + const runSetup = function ( ) { <nl> + internal . debugClearFailAt ( ) ; <nl> + <nl> + db . _drop ( colName ) ; <nl> + const c = db . _create ( colName ) ; <nl> + c . ensureHashIndex ( " value " ) ; <nl> + c . ensureSkiplist ( " value2 " ) ; <nl> + <nl> + const docs = [ ] ; <nl> + for ( let i = 0 ; i < 10000 ; + + i ) { <nl> + docs . push ( { value : i % 250 , value2 : i % 100 } ) ; <nl> + } <nl> + / / Add two packs of 10 . 000 Documents . <nl> + / / Intermediate commits will commit after 10 . 000 removals <nl> + c . save ( docs ) ; <nl> + c . save ( docs ) ; <nl> + <nl> + internal . debugSetFailAt ( " SegfaultBeforeIntermediateCommit " ) ; <nl> + <nl> + / / This will crash the server <nl> + c . truncate ( ) ; <nl> + <nl> + fail ( ) ; <nl> + } ; <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief test suite <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + const recoverySuite = function ( ) { <nl> + jsunity . jsUnity . attachAssertions ( ) ; <nl> + <nl> + const c = db . _collection ( colName ) ; <nl> + const docsWithEqHash = 20000 / 250 ; <nl> + const docsWithEqSkip = 20000 / 100 ; <nl> + <nl> + return { <nl> + setUp : function ( ) { } , <nl> + tearDown : function ( ) { } , <nl> + <nl> + / / Test that count of collection remains unmodified . <nl> + / / We crashed before commit <nl> + testCollectionCount : ( ) = > { <nl> + assertEqual ( c . count ( ) , 20000 ) ; <nl> + } , <nl> + <nl> + / / Test that the HashIndex remains intact . <nl> + testHashIndex : ( ) = > { <nl> + let q = ` FOR x IN @ @ c FILTER x . value = = @ i RETURN x ` ; <nl> + for ( let i = 0 ; i < 250 ; + + i ) { <nl> + / / This validates that all documents can be found again <nl> + let res = db . _query ( q , { " @ c " : colName , i : i } ) . toArray ( ) ; <nl> + assertEqual ( res . length , docsWithEqHash ) ; <nl> + } <nl> + <nl> + / / just validate that no other values are inserted . <nl> + let res2 = db . _query ( q , { " @ c " : colName , i : 251 } ) . toArray ( ) ; <nl> + assertEqual ( res2 . length , 0 ) ; <nl> + } , <nl> + <nl> + / / Test that the SkiplistIndex remains intact . <nl> + testSkiplistIndex : ( ) = > { <nl> + let q = ` FOR x IN @ @ c FILTER x . value2 = = @ i RETURN x ` ; <nl> + for ( let i = 0 ; i < 100 ; + + i ) { <nl> + / / This validates that all documents can be found again <nl> + let res = db . _query ( q , { " @ c " : colName , i : i } ) . toArray ( ) ; <nl> + assertEqual ( res . length , docsWithEqSkip ) ; <nl> + } <nl> + <nl> + / / just validate that no other values are inserted . <nl> + let res2 = db . _query ( q , { " @ c " : colName , i : 101 } ) . toArray ( ) ; <nl> + assertEqual ( res2 . length , 0 ) ; <nl> + } , <nl> + <nl> + testSelectivityEstimates : ( ) = > { <nl> + let indexes = c . getIndexes ( true ) ; <nl> + for ( let i of indexes ) { <nl> + switch ( i . type ) { <nl> + case ' primary ' : <nl> + assertEqual ( i . selectivityEstimate , 1 ) ; <nl> + break ; <nl> + case ' hash ' : <nl> + assertEqual ( i . selectivityEstimate , 0 . 0125 ) ; <nl> + break ; <nl> + case ' skiplist ' : <nl> + assertEqual ( i . selectivityEstimate , 0 . 005 ) ; <nl> + break ; <nl> + default : <nl> + fail ( ) ; <nl> + } <nl> + } <nl> + } , <nl> + } ; <nl> + <nl> + } ; <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief executes the test suites <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + function main ( argv ) { <nl> + if ( internal . debugCanUseFailAt ( ) ) { <nl> + if ( argv [ 1 ] = = = ' setup ' ) { <nl> + runSetup ( ) ; <nl> + return 0 ; <nl> + } else { <nl> + jsunity . run ( recoverySuite ) ; <nl> + return jsunity . done ( ) . status ? 0 : 1 ; <nl> + } <nl> + } else { <nl> + return jsunity . done ( ) ; <nl> + } <nl> + } <nl> new file mode 100644 <nl> index 00000000000 . . a8d7d0809d6 <nl> mmm / dev / null <nl> ppp b / js / server / tests / recovery / truncate - collection - failures - between - commits - rocksdb . js <nl> <nl> + / * jshint globalstrict : false , strict : false , unused : false * / <nl> + / * global assertEqual , assertFalse , assertTrue , fail * / <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief tests for truncate on rocksdb with intermediate commits & failures <nl> + / / / <nl> + / / / @ file <nl> + / / / <nl> + / / / DISCLAIMER <nl> + / / / <nl> + / / / Copyright 2010 - 2012 triagens GmbH , Cologne , Germany <nl> + / / / <nl> + / / / Licensed under the Apache License , Version 2 . 0 ( the " License " ) <nl> + / / / you may not use this file except in compliance with the License . <nl> + / / / You may obtain a copy of the License at <nl> + / / / <nl> + / / / http : / / www . apache . org / licenses / LICENSE - 2 . 0 <nl> + / / / <nl> + / / / Unless required by applicable law or agreed to in writing , software <nl> + / / / distributed under the License is distributed on an " AS IS " BASIS , <nl> + / / / WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND , either express or implied . <nl> + / / / See the License for the specific language governing permissions and <nl> + / / / limitations under the License . <nl> + / / / <nl> + / / / Copyright holder is ArangoDB GmbH , Cologne , Germany <nl> + / / / <nl> + / / / @ author Michael Hackstein <nl> + / / / @ author Copyright 2017 , ArangoDB GmbH , Cologne , Germany <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + ' use strict ' ; <nl> + const db = require ( ' @ arangodb ' ) . db ; <nl> + const internal = require ( ' internal ' ) ; <nl> + const jsunity = require ( ' jsunity ' ) ; <nl> + const colName = " UnitTestsRecovery " ; <nl> + <nl> + const runSetup = function ( ) { <nl> + internal . debugClearFailAt ( ) ; <nl> + <nl> + db . _drop ( colName ) ; <nl> + const c = db . _create ( colName ) ; <nl> + c . ensureHashIndex ( " value " ) ; <nl> + c . ensureSkiplist ( " value2 " ) ; <nl> + <nl> + const docs = [ ] ; <nl> + for ( let i = 0 ; i < 10000 ; + + i ) { <nl> + docs . push ( { value : i % 250 , value2 : i % 100 } ) ; <nl> + } <nl> + / / Add two packs of 10 . 000 Documents . <nl> + / / Intermediate commits will commit after 10 . 000 removals <nl> + c . save ( docs ) ; <nl> + c . save ( docs ) ; <nl> + <nl> + internal . debugSetFailAt ( " SegfaultAfterIntermediateCommit " ) ; <nl> + <nl> + / / This will crash the server <nl> + c . truncate ( ) ; <nl> + <nl> + fail ( ) ; <nl> + } ; <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief test suite <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + const recoverySuite = function ( ) { <nl> + jsunity . jsUnity . attachAssertions ( ) ; <nl> + <nl> + const c = db . _collection ( colName ) ; <nl> + const docsWithEqHash = 20000 / 250 ; <nl> + const docsWithEqSkip = 20000 / 100 ; <nl> + <nl> + return { <nl> + setUp : function ( ) { } , <nl> + tearDown : function ( ) { } , <nl> + <nl> + / / Test that count of collection remains unmodified . <nl> + / / We crashed after one remove commit . But before the other <nl> + testCollectionCount : ( ) = > { <nl> + assertEqual ( c . count ( ) , 10000 ) ; <nl> + } , <nl> + <nl> + / / Test that the HashIndex remains intact . <nl> + testHashIndex : ( ) = > { <nl> + let sum = 0 ; <nl> + let q = ` FOR x IN @ @ c FILTER x . value = = @ i RETURN x ` ; <nl> + for ( let i = 0 ; i < 250 ; + + i ) { <nl> + / / This validates that all documents can be found again <nl> + let res = db . _query ( q , { " @ c " : colName , i : i } ) . toArray ( ) ; <nl> + let c = res . length ; <nl> + assertTrue ( c < docsWithEqHash ) ; <nl> + sum + = c ; <nl> + } <nl> + assertEqual ( sum , 10000 ) ; <nl> + <nl> + / / just validate that no other values are inserted . <nl> + let res2 = db . _query ( q , { " @ c " : colName , i : 251 } ) . toArray ( ) ; <nl> + assertEqual ( res2 . length , 0 ) ; <nl> + } , <nl> + <nl> + / / Test that the SkiplistIndex remains intact . <nl> + testSkiplistIndex : ( ) = > { <nl> + let sum = 0 ; <nl> + let q = ` FOR x IN @ @ c FILTER x . value2 = = @ i RETURN x ` ; <nl> + for ( let i = 0 ; i < 100 ; + + i ) { <nl> + / / This validates that all documents can be found again <nl> + let res = db . _query ( q , { " @ c " : colName , i : i } ) . toArray ( ) ; <nl> + let c = res . length ; <nl> + assertTrue ( c < docsWithEqSkip ) ; <nl> + sum + = c ; <nl> + } <nl> + assertEqual ( sum , 10000 ) ; <nl> + <nl> + / / just validate that no other values are inserted . <nl> + let res2 = db . _query ( q , { " @ c " : colName , i : 101 } ) . toArray ( ) ; <nl> + assertEqual ( res2 . length , 0 ) ; <nl> + } , <nl> + <nl> + testSelectivityEstimates : ( ) = > { <nl> + let indexes = c . getIndexes ( true ) ; <nl> + for ( let i of indexes ) { <nl> + switch ( i . type ) { <nl> + case ' primary ' : <nl> + assertEqual ( i . selectivityEstimate , 1 ) ; <nl> + break ; <nl> + case ' hash ' : <nl> + assertEqual ( i . selectivityEstimate , 0 . 025 ) ; <nl> + break ; <nl> + case ' skiplist ' : <nl> + assertEqual ( i . selectivityEstimate , 0 . 01 ) ; <nl> + break ; <nl> + default : <nl> + fail ( ) ; <nl> + } <nl> + } <nl> + } <nl> + } ; <nl> + <nl> + } ; <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief executes the test suites <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + function main ( argv ) { <nl> + ' use strict ' ; <nl> + <nl> + if ( internal . debugCanUseFailAt ( ) ) { <nl> + if ( argv [ 1 ] = = = ' setup ' ) { <nl> + runSetup ( ) ; <nl> + return 0 ; <nl> + } else { <nl> + jsunity . run ( recoverySuite ) ; <nl> + return jsunity . done ( ) . status ? 0 : 1 ; <nl> + } <nl> + } else { <nl> + return jsunity . done ( ) ; <nl> + } <nl> + } <nl> + <nl> | Bug fix / rocksdb truncate ( ) | arangodb/arangodb | d32ac3b9c84291eebe90087077f5d9b510131ede | 2018-01-16T08:01:04Z |
mmm a / R - package / src / install . libs . R <nl> ppp b / R - package / src / install . libs . R <nl> if ( ! use_precompile ) { <nl> cmake_cmd < - paste0 ( cmake_cmd , " - DUSE_R35 = ON " ) <nl> } <nl> <nl> + # Could NOT find OpenMP_C on Mojave workaround <nl> + if ( Sys . info ( ) [ ' sysname ' ] = = ' Darwin ' & & ! ( grepl ( ' ^ gcc ' , Sys . getenv ( ' CC ' , ' ' ) ) & grepl ( ' ^ g \ \ + \ \ + ' , Sys . getenv ( ' CXX ' , ' ' ) ) ) ) { <nl> + cmake_cmd < - paste ( cmake_cmd , ' - DOpenMP_C_FLAGS = " - Xpreprocessor - fopenmp - I $ ( brew - - prefix libomp ) / include " ' ) <nl> + cmake_cmd < - paste ( cmake_cmd , ' - DOpenMP_C_LIB_NAMES = " omp " ' ) <nl> + cmake_cmd < - paste ( cmake_cmd , ' - DOpenMP_CXX_FLAGS = " - Xpreprocessor - fopenmp - I $ ( brew - - prefix libomp ) / include " ' ) <nl> + cmake_cmd < - paste ( cmake_cmd , ' - DOpenMP_CXX_LIB_NAMES = " omp " ' ) <nl> + cmake_cmd < - paste ( cmake_cmd , ' - DOpenMP_omp_LIBRARY = " $ ( brew - - prefix libomp ) / lib / libomp . dylib " ' ) <nl> + } <nl> + <nl> # Check if Windows installation ( for gcc vs Visual Studio ) <nl> if ( WINDOWS ) { <nl> if ( use_mingw ) { <nl> | [ R - package ] mojave install r openmp fix ( ) | microsoft/LightGBM | c4cd65ff05f4594be926305ff6fad4dfb4cfdd67 | 2019-06-13T11:02:16Z |
mmm a / xbmc / cores / AudioEngine / Sinks / AESinkSNDIO . cpp <nl> ppp b / xbmc / cores / AudioEngine / Sinks / AESinkSNDIO . cpp <nl> <nl> * <nl> * / <nl> <nl> - # include " system . h " <nl> - # ifdef HAS_SNDIO <nl> # include " AESinkSNDIO . h " <nl> # include " cores / AudioEngine / AESinkFactory . h " <nl> # include " cores / AudioEngine / Utils / AEUtil . h " <nl> void CAESinkSNDIO : : EnumerateDevicesEx ( AEDeviceInfoList & list , bool force ) <nl> list . push_back ( info ) ; <nl> } <nl> } <nl> - <nl> - # endif <nl> mmm a / xbmc / cores / VideoPlayer / DVDCodecs / Video / MMALCodec . h <nl> ppp b / xbmc / cores / VideoPlayer / DVDCodecs / Video / MMALCodec . h <nl> <nl> * <nl> * / <nl> <nl> - # if defined ( HAS_MMAL ) <nl> - <nl> # include " cores / VideoPlayer / DVDStreamInfo . h " <nl> # include " DVDVideoCodec . h " <nl> # include " threads / Event . h " <nl> class CMMALVideo : public CDVDVideoCodec <nl> } ; <nl> <nl> } ; <nl> - / / defined ( HAS_MMAL ) <nl> - # endif <nl> mmm a / xbmc / cores / VideoPlayer / DVDCodecs / Video / MMALFFmpeg . cpp <nl> ppp b / xbmc / cores / VideoPlayer / DVDCodecs / Video / MMALFFmpeg . cpp <nl> <nl> * <nl> * / <nl> <nl> - # include " system . h " <nl> - # ifdef HAS_MMAL <nl> - <nl> # include < interface / mmal / util / mmal_default_components . h > <nl> <nl> # include " cores / VideoPlayer / VideoRenderers / RenderManager . h " <nl> void CDecoder : : Register ( ) <nl> { <nl> CDVDFactoryCodec : : RegisterHWAccel ( " mmalffmpeg " , CDecoder : : Create ) ; <nl> } <nl> - <nl> - # endif <nl> mmm a / xbmc / cores / VideoPlayer / VideoRenderers / HwDecRender / RendererAML . cpp <nl> ppp b / xbmc / cores / VideoPlayer / VideoRenderers / HwDecRender / RendererAML . cpp <nl> <nl> <nl> # include " RendererAML . h " <nl> <nl> - # if defined ( HAS_LIBAMCODEC ) <nl> # include " cores / VideoPlayer / DVDCodecs / Video / DVDVideoCodecAmlogic . h " <nl> # include " cores / VideoPlayer / DVDCodecs / Video / AMLCodec . h " <nl> # include " utils / log . h " <nl> void CRendererAML : : RenderUpdate ( int index , int index2 , bool clear , unsigned int <nl> } <nl> CAMLCodec : : PollFrame ( ) ; <nl> } <nl> - <nl> - # endif <nl> mmm a / xbmc / cores / VideoPlayer / VideoRenderers / HwDecRender / RendererAML . h <nl> ppp b / xbmc / cores / VideoPlayer / VideoRenderers / HwDecRender / RendererAML . h <nl> <nl> <nl> # pragma once <nl> <nl> - # include " system . h " <nl> - <nl> - # if defined ( HAS_LIBAMCODEC ) <nl> - <nl> # include " cores / VideoPlayer / VideoRenderers / BaseRenderer . h " <nl> <nl> class CRendererAML : public CBaseRenderer <nl> class CRendererAML : public CBaseRenderer <nl> int m_prevVPts ; <nl> bool m_bConfigured ; <nl> } ; <nl> - <nl> - # endif <nl> mmm a / xbmc / cores / VideoPlayer / VideoRenderers / OverlayRendererGL . h <nl> ppp b / xbmc / cores / VideoPlayer / VideoRenderers / OverlayRendererGL . h <nl> class CDVDOverlaySpu ; <nl> class CDVDOverlaySSA ; <nl> typedef struct ass_image ASS_Image ; <nl> <nl> - # if defined ( HAS_GL ) | | HAS_GLES > = 2 <nl> - <nl> namespace OVERLAY { <nl> <nl> class COverlayTextureGL : public COverlay <nl> namespace OVERLAY { <nl> } ; <nl> <nl> } <nl> - <nl> - # endif <nl> - <nl> mmm a / xbmc / dbwrappers / mysqldataset . cpp <nl> ppp b / xbmc / dbwrappers / mysqldataset . cpp <nl> <nl> # include " Util . h " <nl> # include " utils / StringUtils . h " <nl> <nl> - # ifdef HAS_MYSQL <nl> # include " mysqldataset . h " <nl> # include " mysql / errmsg . h " <nl> <nl> void MysqlDataset : : interrupt ( ) { <nl> } <nl> <nl> } / / namespace <nl> - # endif / / HAS_MYSQL <nl> - <nl> mmm a / xbmc / filesystem / test / TestNfsFile . cpp <nl> ppp b / xbmc / filesystem / test / TestNfsFile . cpp <nl> <nl> * <nl> * / <nl> <nl> - # include " system . h " <nl> - # if defined ( HAS_FILESYSTEM_NFS ) <nl> # include " filesystem / NFSFile . h " <nl> # include " test / TestUtils . h " <nl> <nl> TEST_P ( TestNfs , splitUrlIntoExportAndPath ) <nl> } <nl> <nl> INSTANTIATE_TEST_CASE_P ( NfsFile , TestNfs , ValuesIn ( g_TestData ) ) ; <nl> - # endif / / HAS_FILESYSTEM_NFS <nl> mmm a / xbmc / guilib / MatrixGLES . cpp <nl> ppp b / xbmc / guilib / MatrixGLES . cpp <nl> <nl> * / <nl> <nl> <nl> - # include " system . h " <nl> - <nl> - # if defined ( HAS_GL ) | | HAS_GLES > = 2 <nl> # include " system_gl . h " <nl> <nl> # include < cmath > <nl> void CMatrixGLStack : : Load ( ) <nl> { <nl> <nl> } <nl> - <nl> - # endif <nl> mmm a / xbmc / network / linux / ZeroconfAvahi . h <nl> ppp b / xbmc / network / linux / ZeroconfAvahi . h <nl> <nl> * <nl> * / <nl> <nl> - # include " system . h " <nl> - <nl> - # ifdef HAS_AVAHI <nl> - <nl> # include < memory > <nl> # include < map > <nl> # include < vector > <nl> class CZeroconfAvahi : public CZeroconf <nl> bool m_shutdown ; <nl> pthread_t m_thread_id ; <nl> } ; <nl> - <nl> - # endif / / HAS_AVAHI <nl> - <nl> mmm a / xbmc / network / linux / ZeroconfBrowserAvahi . h <nl> ppp b / xbmc / network / linux / ZeroconfBrowserAvahi . h <nl> <nl> * <nl> * / <nl> <nl> - # include " system . h " <nl> - # ifdef HAS_AVAHI <nl> - <nl> # include < memory > <nl> # include < map > <nl> # include < vector > <nl> class CZeroconfBrowserAvahi : public CZeroconfBrowser <nl> CZeroconfBrowser : : ZeroconfService m_resolving_service ; <nl> CEvent m_resolved_event ; <nl> } ; <nl> - <nl> - # endif / / HAS_AVAHI <nl> mmm a / xbmc / rendering / gl / GUIWindowTestPatternGL . cpp <nl> ppp b / xbmc / rendering / gl / GUIWindowTestPatternGL . cpp <nl> <nl> * <nl> * / <nl> <nl> - # include " system . h " <nl> - <nl> - # ifdef HAS_GL <nl> # include " system_gl . h " <nl> # include " GUIWindowTestPatternGL . h " <nl> <nl> void CGUIWindowTestPatternGL : : EndRender ( ) <nl> { <nl> <nl> } <nl> - <nl> - # endif <nl> | [ cleanup ] remove ifdef conditions already handled by cmake | xbmc/xbmc | 68d5498909a1f225a6ce006269d8aa4d086b0f6d | 2018-01-10T14:00:00Z |
mmm a / Documentation / current_iteration . md <nl> ppp b / Documentation / current_iteration . md <nl> <nl> func . custom_attributes = { ' test ' : ' abc ' , ' dict ' : { ' a ' : 1 , ' b ' : 2 } , ' list ' : [ 1 , 2 , 3 ] } <nl> func . custom_attributes [ ' test2 ' ] = ' def ' <nl> ` ` ` <nl> + # # # Enabled data unit in frequency specification ( Python ) <nl> + Now we can specify data unit in sample , minibatch and sweep in training session progress frequency , CrossValidationConfig , and Checkpoint Config . For example , <nl> + ` ` ` python <nl> + C . training_session ( <nl> + trainer = t , <nl> + mb_source = mbs , <nl> + mb_size = C . minibatch_size_schedule ( 4 ) , <nl> + model_inputs_to_streams = input_map , <nl> + max_samples = 60 , <nl> + progress_frequency = ( 5 , C . train . DataUnit . minibatch ) , <nl> + checkpoint_config = C . CheckpointConfig ( frequency = ( 1 , C . train . DataUnit . sweep ) , preserve_all = True , <nl> + filename = str ( tmpdir / " checkpoint_save_all " ) ) , <nl> + cv_config = C . CrossValidationConfig ( mbs1 , frequency = ( 100 , C . train . DataUnit . sample ) , minibatch_size = 32 ) , <nl> + ) . train ( device ) <nl> + ` ` ` <nl> + For details , see : <nl> + - [ training_session ] ( https : / / cntk . ai / pythondocs / cntk . train . training_session . html ? highlight = training % 20session # module - cntk . train . training_session ) <nl> + - [ CrossValidationConfig ] ( https : / / cntk . ai / pythondocs / cntk . train . training_session . html ? highlight = crossvalidationconfig # cntk . train . training_session . CrossValidationConfig ) <nl> + - [ CheckPointConfig ] ( https : / / cntk . ai / pythondocs / cntk . train . training_session . html ? highlight = checkpointconfig # cntk . train . training_session . CheckpointConfig ) <nl> + <nl> + If no data unit is specified , the default data unit is in samples . <nl> + <nl> # # # Netopt Module – Network Optimizations for faster Inferences <nl> - In recent years , the DNN Research community has proposed many techniques to make inference faster and more compact . Proposed techniques include factoring matrix - vector - product and convolution operations , binarization / quantization , sparsification and the use of frequency - domain representations . <nl> - The goal of cntk . contrib . netopt module is to provide users of CNTK easy - to - use interfaces to speed up or compress their networks using such optimizations , and writers of optimizations a framework within which to export them to CNTK users . <nl> | Learner change | microsoft/CNTK | 055ce76ec48d4f5227972c8cbb69d8230a1a5683 | 2017-11-21T19:20:42Z |
mmm a / atom / browser / native_window . cc <nl> ppp b / atom / browser / native_window . cc <nl> void NativeWindow : : Observe ( int type , <nl> } <nl> } <nl> <nl> - bool NativeWindow : : DevToolsSetDockSide ( const std : : string & dock_side , <nl> - bool * succeed ) { <nl> - if ( dock_side = = " undocked " ) { <nl> - * succeed = false ; <nl> - return true ; <nl> - } else { <nl> - return false ; <nl> - } <nl> - } <nl> - <nl> - bool NativeWindow : : DevToolsShow ( std : : string * dock_side ) { <nl> - if ( * dock_side = = " undocked " ) <nl> - * dock_side = " bottom " ; <nl> - return false ; <nl> - } <nl> - <nl> void NativeWindow : : DevToolsSaveToFile ( const std : : string & url , <nl> const std : : string & content , <nl> bool save_as ) { <nl> mmm a / atom / browser / native_window . h <nl> ppp b / atom / browser / native_window . h <nl> class NativeWindow : public brightray : : DefaultWebContentsDelegate , <nl> const content : : NotificationDetails & details ) OVERRIDE ; <nl> <nl> / / Implementations of brightray : : InspectableWebContentsDelegate . <nl> - virtual bool DevToolsSetDockSide ( const std : : string & dock_side , <nl> - bool * succeed ) OVERRIDE ; <nl> - virtual bool DevToolsShow ( std : : string * dock_side ) OVERRIDE ; <nl> virtual void DevToolsSaveToFile ( const std : : string & url , <nl> const std : : string & content , <nl> bool save_as ) OVERRIDE ; <nl> | Do not disable detached devtools . | electron/electron | f4aadcbbfce389e88d0fd24335e243626beb6dc3 | 2014-06-17T08:35:23Z |
mmm a / swoole_mysql . c <nl> ppp b / swoole_mysql . c <nl> static void mysql_client_free ( mysql_client * client , zval * zobject ) <nl> if ( client - > connector . host ) <nl> { <nl> efree ( client - > connector . host ) ; <nl> + client - > connector . host = NULL ; <nl> } <nl> if ( client - > connector . user ) <nl> { <nl> efree ( client - > connector . user ) ; <nl> + client - > connector . user = NULL ; <nl> } <nl> if ( client - > connector . password ) <nl> { <nl> efree ( client - > connector . password ) ; <nl> + client - > connector . password = NULL ; <nl> } <nl> if ( client - > connector . database ) <nl> { <nl> efree ( client - > connector . database ) ; <nl> + client - > connector . database = NULL ; <nl> } <nl> / / close the connection <nl> client - > cli - > close ( client - > cli ) ; <nl> static PHP_METHOD ( swoole_mysql , connect ) <nl> if ( php_swoole_array_get_value ( _ht , " user " , value ) ) <nl> { <nl> str_user = zval_get_string ( value ) ; <nl> - connector - > user = ZSTR_VAL ( str_host ) ; <nl> - connector - > user_len = ZSTR_LEN ( str_host ) ; <nl> + connector - > user = ZSTR_VAL ( str_user ) ; <nl> + connector - > user_len = ZSTR_LEN ( str_user ) ; <nl> } <nl> else <nl> { <nl> mmm a / swoole_mysql_coro . cc <nl> ppp b / swoole_mysql_coro . cc <nl> static int swoole_mysql_coro_close ( zval * zobject ) <nl> if ( client - > connector . host ) <nl> { <nl> efree ( client - > connector . host ) ; <nl> + client - > connector . host = NULL ; <nl> } <nl> if ( client - > connector . user ) <nl> { <nl> efree ( client - > connector . user ) ; <nl> + client - > connector . user = NULL ; <nl> } <nl> if ( client - > connector . password ) <nl> { <nl> efree ( client - > connector . password ) ; <nl> + client - > connector . password = NULL ; <nl> } <nl> if ( client - > connector . database ) <nl> { <nl> efree ( client - > connector . database ) ; <nl> + client - > connector . database = NULL ; <nl> } <nl> <nl> client - > cli - > close ( client - > cli ) ; <nl> | str_user | swoole/swoole-src | d118fe3f9e5b3b15877bb49eacccc38bd4b992d8 | 2019-01-18T00:41:27Z |
mmm a / tensorflow / lite / tools / make / targets / riscv_makefile . inc <nl> ppp b / tensorflow / lite / tools / make / targets / riscv_makefile . inc <nl> ifeq ( $ ( TARGET ) , riscv ) <nl> LIBS + = - ldl <nl> BUILD_TYPE : = micro <nl> endif <nl> + <nl> + ifeq ( $ ( TARGET ) , linux_riscv64 ) <nl> + TARGET_ARCH : = riscv64 <nl> + TARGET_TOOLCHAIN_PREFIX : = riscv64 - unknown - linux - gnu - <nl> + TARGET_OUT_DIR : = linux_riscv64 <nl> + LIBS : = - lstdc + + - lpthread - lm - ldl - latomic <nl> + LDFLAGS : = \ <nl> + - Wl , - - no - export - dynamic \ <nl> + - Wl , - - exclude - libs , ALL \ <nl> + - Wl , - - gc - sections \ <nl> + - Wl , - - as - needed \ <nl> + - lrt <nl> + endif <nl> | RISC - V Linux port for TensorFlow Lite | tensorflow/tensorflow | 0d66cb7ec74c3c0cbb620966a8b9b21cd45d92bd | 2020-12-18T08:05:11Z |
mmm a / python / pyphantomjs / bootstrap . js <nl> ppp b / python / pyphantomjs / bootstrap . js <nl> window . WebPage = function ( ) { <nl> <nl> return page ; <nl> } <nl> + <nl> + <nl> + / / override settimeout / setinterval with a try . . catch <nl> + window . _setTimeout = window . setTimeout ; <nl> + window . _setInterval = window . setInterval ; <nl> + window . setTimeout = function ( func , delay ) { <nl> + var f = function ( ) { <nl> + try { <nl> + typeof func = = = ' function ' ? func ( ) : eval ( func ) ; <nl> + } catch ( err ) { <nl> + if ( err ! = = ' phantom . exit ' ) { <nl> + throw err ; <nl> + } <nl> + } <nl> + } <nl> + <nl> + return window . _setTimeout ( f , delay ) ; <nl> + } <nl> + <nl> + window . setInterval = function ( func , delay , lang ) { <nl> + var f = function ( ) { <nl> + try { <nl> + typeof func = = = ' function ' ? func ( ) : eval ( func ) ; <nl> + } catch ( err ) { <nl> + if ( err ! = = ' phantom . exit ' ) { <nl> + throw err ; <nl> + } <nl> + } <nl> + } <nl> + <nl> + return window . _setInterval ( f , delay , lang ) ; <nl> + } <nl> + <nl> + <nl> + phantom . exit = function ( code ) { <nl> + if ( code = = null ) { <nl> + code = 0 ; <nl> + } <nl> + <nl> + phantom . _exit ( code ) ; <nl> + <nl> + / / halt javascript execution <nl> + throw " phantom . exit " ; <nl> + } <nl> mmm a / python / pyphantomjs / csconverter . py <nl> ppp b / python / pyphantomjs / csconverter . py <nl> <nl> <nl> import sys <nl> <nl> - from PyQt4 . QtCore import QObject , QFile , qWarning <nl> + from PyQt4 . QtCore import QObject , QFile <nl> from PyQt4 . QtWebKit import QWebPage <nl> <nl> <nl> def convert ( self , script ) : <nl> [ true , this . CoffeeScript . compile ( converter . source ) ] ; <nl> } catch ( error ) { <nl> [ false , error . message ] ; <nl> - } ' ' ' ) <nl> - if result [ 0 ] is False : <nl> - qWarning ( result [ 1 ] ) <nl> - return ' ' <nl> - return result [ 1 ] <nl> + } <nl> + ' ' ' ) <nl> + return result <nl> mmm a / python / pyphantomjs / phantom . py <nl> ppp b / python / pyphantomjs / phantom . py <nl> def __init__ ( self , args , parent = None ) : <nl> do_action ( ' PhantomInitPost ' , Bunch ( locals ( ) ) ) <nl> <nl> def execute ( self ) : <nl> - injectJsInFrame ( self . m_scriptFile , os . path . dirname ( os . path . abspath ( __file__ ) ) , self . m_page . mainFrame ( ) ) <nl> + injectJsInFrame ( self . m_scriptFile , os . path . dirname ( os . path . abspath ( __file__ ) ) , self . m_page . mainFrame ( ) , True ) <nl> return not self . m_terminated <nl> <nl> - def printConsoleMessage ( self , msg ) : <nl> - print msg <nl> + def printConsoleMessage ( self , message , lineNumber , source ) : <nl> + if source : <nl> + message = ' % s : % d % s ' % ( source , lineNumber , message ) <nl> + print message <nl> <nl> def returnValue ( self ) : <nl> return self . m_returnValue <nl> def returnValue ( self ) : <nl> # Properties and methods exposed to JavaScript <nl> # # <nl> <nl> + @ pyqtSlot ( int ) <nl> + def _exit ( self , code ) : <nl> + self . m_terminated = True <nl> + self . m_returnValue = code <nl> + QApplication . instance ( ) . exit ( code ) <nl> + <nl> @ pyqtProperty ( ' QStringList ' ) <nl> def args ( self ) : <nl> return self . m_args <nl> def createWebPage ( self ) : <nl> def defaultPageSettings ( self ) : <nl> return self . m_defaultPageSettings <nl> <nl> - @ pyqtSlot ( ) <nl> - @ pyqtSlot ( int ) <nl> - def exit ( self , code = 0 ) : <nl> - self . m_terminated = True <nl> - self . m_returnValue = code <nl> - QApplication . instance ( ) . exit ( code ) <nl> - <nl> @ pyqtSlot ( str , result = bool ) <nl> def injectJs ( self , filePath ) : <nl> return injectJsInFrame ( filePath , self . libraryPath , self . m_page . mainFrame ( ) ) <nl> mmm a / python / pyphantomjs / pyphantomjs . py <nl> ppp b / python / pyphantomjs / pyphantomjs . py <nl> def main ( ) : <nl> app . setOrganizationDomain ( ' www . umaclan . com ' ) <nl> app . setApplicationVersion ( version ) <nl> <nl> - phantom = Phantom ( args , app ) <nl> + phantom = Phantom ( args ) <nl> <nl> do_action ( ' Main ' , Bunch ( locals ( ) ) ) <nl> <nl> mmm a / python / pyphantomjs / resources . py <nl> ppp b / python / pyphantomjs / resources . py <nl> <nl> <nl> # Resource object code <nl> # <nl> - # Created : Fri Jun 17 01 : 01 : 41 2011 <nl> + # Created : Sun Jun 19 21 : 18 : 36 2011 <nl> # by : The Resource Compiler for PyQt ( Qt v4 . 7 . 2 ) <nl> # <nl> # WARNING ! All changes made in this file will be lost ! <nl> <nl> from PyQt4 import QtCore <nl> <nl> qt_resource_data = " \ <nl> - \ x00 \ x00 \ x0a \ x29 \ <nl> + \ x00 \ x00 \ x0d \ xdb \ <nl> \ x2f \ <nl> \ x2f \ x20 \ x54 \ x68 \ x69 \ x73 \ x20 \ x61 \ x6c \ x6c \ x6f \ x77 \ x73 \ x20 \ x63 \ x72 \ <nl> \ x65 \ x61 \ x74 \ x69 \ x6e \ x67 \ x20 \ x61 \ x20 \ x6e \ x65 \ x77 \ x20 \ x77 \ x65 \ x62 \ <nl> <nl> \ x65 \ x6e \ x64 \ x53 \ x63 \ x72 \ x69 \ x70 \ x74 \ x45 \ x6c \ x65 \ x6d \ x65 \ x6e \ x74 \ <nl> \ x28 \ x73 \ x63 \ x72 \ x69 \ x70 \ x74 \ x55 \ x72 \ x6c \ x29 \ x3b \ x0a \ x20 \ x20 \ x20 \ <nl> \ x20 \ x7d \ x3b \ x0a \ x0a \ x20 \ x20 \ x20 \ x20 \ x72 \ x65 \ x74 \ x75 \ x72 \ x6e \ x20 \ <nl> - \ x70 \ x61 \ x67 \ x65 \ x3b \ x0a \ x7d \ x0a \ <nl> + \ x70 \ x61 \ x67 \ x65 \ x3b \ x0a \ x7d \ x0a \ x0a \ x0a \ x2f \ x2f \ x20 \ x6f \ x76 \ x65 \ <nl> + \ x72 \ x72 \ x69 \ x64 \ x65 \ x20 \ x73 \ x65 \ x74 \ x74 \ x69 \ x6d \ x65 \ x6f \ x75 \ x74 \ <nl> + \ x2f \ x73 \ x65 \ x74 \ x69 \ x6e \ x74 \ x65 \ x72 \ x76 \ x61 \ x6c \ x20 \ x77 \ x69 \ x74 \ <nl> + \ x68 \ x20 \ x61 \ x20 \ x74 \ x72 \ x79 \ x2e \ x2e \ x63 \ x61 \ x74 \ x63 \ x68 \ x0a \ x77 \ <nl> + \ x69 \ x6e \ x64 \ x6f \ x77 \ x2e \ x5f \ x73 \ x65 \ x74 \ x54 \ x69 \ x6d \ x65 \ x6f \ x75 \ <nl> + \ x74 \ x20 \ x3d \ x20 \ x77 \ x69 \ x6e \ x64 \ x6f \ x77 \ x2e \ x73 \ x65 \ x74 \ x54 \ x69 \ <nl> + \ x6d \ x65 \ x6f \ x75 \ x74 \ x3b \ x0a \ x77 \ x69 \ x6e \ x64 \ x6f \ x77 \ x2e \ x5f \ x73 \ <nl> + \ x65 \ x74 \ x49 \ x6e \ x74 \ x65 \ x72 \ x76 \ x61 \ x6c \ x20 \ x3d \ x20 \ x77 \ x69 \ x6e \ <nl> + \ x64 \ x6f \ x77 \ x2e \ x73 \ x65 \ x74 \ x49 \ x6e \ x74 \ x65 \ x72 \ x76 \ x61 \ x6c \ x3b \ <nl> + \ x0a \ x77 \ x69 \ x6e \ x64 \ x6f \ x77 \ x2e \ x73 \ x65 \ x74 \ x54 \ x69 \ x6d \ x65 \ x6f \ <nl> + \ x75 \ x74 \ x20 \ x3d \ x20 \ x66 \ x75 \ x6e \ x63 \ x74 \ x69 \ x6f \ x6e \ x28 \ x66 \ x75 \ <nl> + \ x6e \ x63 \ x2c \ x20 \ x64 \ x65 \ x6c \ x61 \ x79 \ x29 \ x20 \ x7b \ x0a \ x20 \ x20 \ x20 \ <nl> + \ x20 \ x76 \ x61 \ x72 \ x20 \ x66 \ x20 \ x3d \ x20 \ x66 \ x75 \ x6e \ x63 \ x74 \ x69 \ x6f \ <nl> + \ x6e \ x28 \ x29 \ x20 \ x7b \ x0a \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x74 \ x72 \ <nl> + \ x79 \ x20 \ x7b \ x0a \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ <nl> + \ x74 \ x79 \ x70 \ x65 \ x6f \ x66 \ x20 \ x66 \ x75 \ x6e \ x63 \ x20 \ x3d \ x3d \ x3d \ x20 \ <nl> + \ x27 \ x66 \ x75 \ x6e \ x63 \ x74 \ x69 \ x6f \ x6e \ x27 \ x20 \ x3f \ x20 \ x66 \ x75 \ x6e \ <nl> + \ x63 \ x28 \ x29 \ x20 \ x3a \ x20 \ x65 \ x76 \ x61 \ x6c \ x28 \ x66 \ x75 \ x6e \ x63 \ x29 \ <nl> + \ x3b \ x0a \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x7d \ x20 \ x63 \ x61 \ x74 \ x63 \ <nl> + \ x68 \ x20 \ x28 \ x65 \ x72 \ x72 \ x29 \ x20 \ x7b \ x0a \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ <nl> + \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x69 \ x66 \ x20 \ x28 \ x65 \ x72 \ x72 \ x20 \ x21 \ x3d \ <nl> + \ x3d \ x20 \ x27 \ x70 \ x68 \ x61 \ x6e \ x74 \ x6f \ x6d \ x2e \ x65 \ x78 \ x69 \ x74 \ x27 \ <nl> + \ x29 \ x20 \ x7b \ x0a \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ <nl> + \ x20 \ x20 \ x20 \ x20 \ x74 \ x68 \ x72 \ x6f \ x77 \ x20 \ x65 \ x72 \ x72 \ x3b \ x0a \ x20 \ <nl> + \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x7d \ x0a \ x20 \ x20 \ x20 \ <nl> + \ x20 \ x20 \ x20 \ x20 \ x20 \ x7d \ x0a \ x20 \ x20 \ x20 \ x20 \ x7d \ x0a \ x0a \ x20 \ x20 \ <nl> + \ x20 \ x20 \ x72 \ x65 \ x74 \ x75 \ x72 \ x6e \ x20 \ x77 \ x69 \ x6e \ x64 \ x6f \ x77 \ x2e \ <nl> + \ x5f \ x73 \ x65 \ x74 \ x54 \ x69 \ x6d \ x65 \ x6f \ x75 \ x74 \ x28 \ x66 \ x2c \ x20 \ x64 \ <nl> + \ x65 \ x6c \ x61 \ x79 \ x29 \ x3b \ x0a \ x7d \ x0a \ x0a \ x77 \ x69 \ x6e \ x64 \ x6f \ x77 \ <nl> + \ x2e \ x73 \ x65 \ x74 \ x49 \ x6e \ x74 \ x65 \ x72 \ x76 \ x61 \ x6c \ x20 \ x3d \ x20 \ x66 \ <nl> + \ x75 \ x6e \ x63 \ x74 \ x69 \ x6f \ x6e \ x28 \ x66 \ x75 \ x6e \ x63 \ x2c \ x20 \ x64 \ x65 \ <nl> + \ x6c \ x61 \ x79 \ x2c \ x20 \ x6c \ x61 \ x6e \ x67 \ x29 \ x20 \ x7b \ x0a \ x20 \ x20 \ x20 \ <nl> + \ x20 \ x76 \ x61 \ x72 \ x20 \ x66 \ x20 \ x3d \ x20 \ x66 \ x75 \ x6e \ x63 \ x74 \ x69 \ x6f \ <nl> + \ x6e \ x28 \ x29 \ x20 \ x7b \ x0a \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x74 \ x72 \ <nl> + \ x79 \ x20 \ x7b \ x0a \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ <nl> + \ x74 \ x79 \ x70 \ x65 \ x6f \ x66 \ x20 \ x66 \ x75 \ x6e \ x63 \ x20 \ x3d \ x3d \ x3d \ x20 \ <nl> + \ x27 \ x66 \ x75 \ x6e \ x63 \ x74 \ x69 \ x6f \ x6e \ x27 \ x20 \ x3f \ x20 \ x66 \ x75 \ x6e \ <nl> + \ x63 \ x28 \ x29 \ x20 \ x3a \ x20 \ x65 \ x76 \ x61 \ x6c \ x28 \ x66 \ x75 \ x6e \ x63 \ x29 \ <nl> + \ x3b \ x0a \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x7d \ x20 \ x63 \ x61 \ x74 \ x63 \ <nl> + \ x68 \ x20 \ x28 \ x65 \ x72 \ x72 \ x29 \ x20 \ x7b \ x0a \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ <nl> + \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x69 \ x66 \ x20 \ x28 \ x65 \ x72 \ x72 \ x20 \ x21 \ x3d \ <nl> + \ x3d \ x20 \ x27 \ x70 \ x68 \ x61 \ x6e \ x74 \ x6f \ x6d \ x2e \ x65 \ x78 \ x69 \ x74 \ x27 \ <nl> + \ x29 \ x20 \ x7b \ x0a \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ <nl> + \ x20 \ x20 \ x20 \ x20 \ x74 \ x68 \ x72 \ x6f \ x77 \ x20 \ x65 \ x72 \ x72 \ x3b \ x0a \ x20 \ <nl> + \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ x7d \ x0a \ x20 \ x20 \ x20 \ <nl> + \ x20 \ x20 \ x20 \ x20 \ x20 \ x7d \ x0a \ x20 \ x20 \ x20 \ x20 \ x7d \ x0a \ x0a \ x20 \ x20 \ <nl> + \ x20 \ x20 \ x72 \ x65 \ x74 \ x75 \ x72 \ x6e \ x20 \ x77 \ x69 \ x6e \ x64 \ x6f \ x77 \ x2e \ <nl> + \ x5f \ x73 \ x65 \ x74 \ x49 \ x6e \ x74 \ x65 \ x72 \ x76 \ x61 \ x6c \ x28 \ x66 \ x2c \ x20 \ <nl> + \ x64 \ x65 \ x6c \ x61 \ x79 \ x2c \ x20 \ x6c \ x61 \ x6e \ x67 \ x29 \ x3b \ x0a \ x7d \ x0a \ <nl> + \ x0a \ x0a \ x70 \ x68 \ x61 \ x6e \ x74 \ x6f \ x6d \ x2e \ x65 \ x78 \ x69 \ x74 \ x20 \ x3d \ <nl> + \ x20 \ x66 \ x75 \ x6e \ x63 \ x74 \ x69 \ x6f \ x6e \ x28 \ x63 \ x6f \ x64 \ x65 \ x29 \ x20 \ <nl> + \ x7b \ x0a \ x20 \ x20 \ x20 \ x20 \ x69 \ x66 \ x20 \ x28 \ x63 \ x6f \ x64 \ x65 \ x20 \ x3d \ <nl> + \ x3d \ x20 \ x6e \ x75 \ x6c \ x6c \ x29 \ x20 \ x7b \ x0a \ x20 \ x20 \ x20 \ x20 \ x20 \ x20 \ <nl> + \ x20 \ x20 \ x63 \ x6f \ x64 \ x65 \ x20 \ x3d \ x20 \ x30 \ x3b \ x0a \ x20 \ x20 \ x20 \ x20 \ <nl> + \ x7d \ x0a \ x0a \ x20 \ x20 \ x20 \ x20 \ x70 \ x68 \ x61 \ x6e \ x74 \ x6f \ x6d \ x2e \ x5f \ <nl> + \ x65 \ x78 \ x69 \ x74 \ x28 \ x63 \ x6f \ x64 \ x65 \ x29 \ x3b \ x0a \ x0a \ x20 \ x20 \ x20 \ <nl> + \ x20 \ x2f \ x2f \ x20 \ x68 \ x61 \ x6c \ x74 \ x20 \ x6a \ x61 \ x76 \ x61 \ x73 \ x63 \ x72 \ <nl> + \ x69 \ x70 \ x74 \ x20 \ x65 \ x78 \ x65 \ x63 \ x75 \ x74 \ x69 \ x6f \ x6e \ x0a \ x20 \ x20 \ <nl> + \ x20 \ x20 \ x74 \ x68 \ x72 \ x6f \ x77 \ x20 \ x22 \ x70 \ x68 \ x61 \ x6e \ x74 \ x6f \ x6d \ <nl> + \ x2e \ x65 \ x78 \ x69 \ x74 \ x22 \ x3b \ x0a \ x7d \ x0a \ <nl> \ x00 \ x00 \ x56 \ x27 \ <nl> \ x89 \ <nl> \ x50 \ x4e \ x47 \ x0d \ x0a \ x1a \ x0a \ x00 \ x00 \ x00 \ x0d \ x49 \ x48 \ x44 \ x52 \ x00 \ <nl> <nl> \ x00 \ x00 \ x00 \ x00 \ x00 \ x02 \ x00 \ x00 \ x00 \ x02 \ x00 \ x00 \ x00 \ x01 \ <nl> \ x00 \ x00 \ x00 \ x00 \ x00 \ x00 \ x00 \ x00 \ x00 \ x01 \ x00 \ x00 \ x00 \ x00 \ <nl> \ x00 \ x00 \ x00 \ x1e \ x00 \ x02 \ x00 \ x00 \ x00 \ x02 \ x00 \ x00 \ x00 \ x03 \ <nl> - \ x00 \ x00 \ x00 \ x64 \ x00 \ x01 \ x00 \ x00 \ x00 \ x01 \ x00 \ x00 \ x60 \ x58 \ <nl> - \ x00 \ x00 \ x00 \ x36 \ x00 \ x00 \ x00 \ x00 \ x00 \ x01 \ x00 \ x00 \ x0a \ x2d \ <nl> + \ x00 \ x00 \ x00 \ x64 \ x00 \ x01 \ x00 \ x00 \ x00 \ x01 \ x00 \ x00 \ x64 \ x0a \ <nl> + \ x00 \ x00 \ x00 \ x36 \ x00 \ x00 \ x00 \ x00 \ x00 \ x01 \ x00 \ x00 \ x0d \ xdf \ <nl> " <nl> <nl> def qInitResources ( ) : <nl> mmm a / python / pyphantomjs / utils . py <nl> ppp b / python / pyphantomjs / utils . py <nl> def coffee2js ( script ) : <nl> return coffeeScriptConverter . convert ( script ) <nl> <nl> <nl> - def injectJsInFrame ( filePath , libraryPath , targetFrame ) : <nl> + def injectJsInFrame ( filePath , libraryPath , targetFrame , startingScript = False ) : <nl> try : <nl> # if file doesn ' t exist in the CWD , use the lookup <nl> if not os . path . exists ( filePath ) : <nl> def injectJsInFrame ( filePath , libraryPath , targetFrame ) : <nl> if script . startswith ( ' # ! ' ) and not filePath . lower ( ) . endswith ( ' . coffee ' ) : <nl> script = ' / / ' + script <nl> <nl> - targetFrame . evaluateJavaScript ( script if not filePath . lower ( ) . endswith ( ' . coffee ' ) else coffee2js ( script ) ) <nl> + if filePath . lower ( ) . endswith ( ' . coffee ' ) : <nl> + result = coffee2js ( script ) <nl> + if result [ 0 ] is False : <nl> + if startingScript : <nl> + sys . exit ( result [ 1 ] ) <nl> + else : <nl> + qWarning ( result [ 1 ] ) <nl> + script = ' ' <nl> + else : <nl> + script = result [ 1 ] <nl> + <nl> + # prepare start script for exiting <nl> + if startingScript : <nl> + script = ' ' ' try { % s } catch ( err ) { <nl> + if ( err ! = = ' phantom . exit ' ) { <nl> + phantom . _exit ( 1 ) ; <nl> + throw err ; <nl> + } <nl> + } <nl> + ' ' ' % script <nl> + <nl> + targetFrame . evaluateJavaScript ( script ) <nl> return True <nl> except IOError : <nl> qWarning ( ' No such file or directory : \ ' % s \ ' ' % filePath ) <nl> def __init__ ( self , target ) : <nl> self . target = target <nl> self . encoding = ' utf - 8 ' <nl> self . errors = ' replace ' <nl> - self . encode_to = self . target . encoding <nl> + self . encode_to = self . target . encoding or ' utf - 8 ' <nl> <nl> def write ( self , s ) : <nl> s = self . encode ( s ) <nl> mmm a / python / pyphantomjs / webpage . py <nl> ppp b / python / pyphantomjs / webpage . py <nl> def javaScriptAlert ( self , originatingFrame , msg ) : <nl> self . parent . javaScriptAlertSent . emit ( msg ) <nl> <nl> def javaScriptConsoleMessage ( self , message , lineNumber , sourceID ) : <nl> - if sourceID : <nl> - message = ' % s : % d % s ' % ( sourceID , lineNumber , message ) <nl> - self . parent . javaScriptConsoleMessageSent . emit ( message ) <nl> + self . parent . javaScriptConsoleMessageSent . emit ( message , lineNumber , sourceID ) <nl> <nl> def userAgentForUrl ( self , url ) : <nl> return self . m_userAgent <nl> def userAgentForUrl ( self , url ) : <nl> <nl> class WebPage ( QObject ) : <nl> javaScriptAlertSent = pyqtSignal ( str ) <nl> - javaScriptConsoleMessageSent = pyqtSignal ( str ) <nl> + javaScriptConsoleMessageSent = pyqtSignal ( str , int , str ) <nl> loadStarted = pyqtSignal ( ) <nl> loadFinished = pyqtSignal ( str ) <nl> resourceReceived = pyqtSignal ( ' QVariantMap ' ) <nl> mmm a / src / bootstrap . js <nl> ppp b / src / bootstrap . js <nl> window . WebPage = function ( ) { <nl> <nl> return page ; <nl> } <nl> + <nl> + <nl> + / / override settimeout / setinterval with a try . . catch <nl> + window . _setTimeout = window . setTimeout ; <nl> + window . _setInterval = window . setInterval ; <nl> + window . setTimeout = function ( func , delay ) { <nl> + var f = function ( ) { <nl> + try { <nl> + typeof func = = = ' function ' ? func ( ) : eval ( func ) ; <nl> + } catch ( err ) { <nl> + if ( err ! = = ' phantom . exit ' ) { <nl> + throw err ; <nl> + } <nl> + } <nl> + } <nl> + <nl> + return window . _setTimeout ( f , delay ) ; <nl> + } <nl> + <nl> + window . setInterval = function ( func , delay , lang ) { <nl> + var f = function ( ) { <nl> + try { <nl> + typeof func = = = ' function ' ? func ( ) : eval ( func ) ; <nl> + } catch ( err ) { <nl> + if ( err ! = = ' phantom . exit ' ) { <nl> + throw err ; <nl> + } <nl> + } <nl> + } <nl> + <nl> + return window . _setInterval ( f , delay , lang ) ; <nl> + } <nl> + <nl> + <nl> + phantom . exit = function ( code ) { <nl> + if ( code = = null ) { <nl> + code = 0 ; <nl> + } <nl> + <nl> + phantom . _exit ( code ) ; <nl> + <nl> + / / halt javascript execution <nl> + throw " phantom . exit " ; <nl> + } <nl> mmm a / src / csconverter . cpp <nl> ppp b / src / csconverter . cpp <nl> CSConverter : : CSConverter ( QObject * parent ) <nl> m_webPage . mainFrame ( ) - > addToJavaScriptWindowObject ( " converter " , this ) ; <nl> } <nl> <nl> - QString CSConverter : : convert ( const QString & script ) <nl> + QVariant CSConverter : : convert ( const QString & script ) <nl> { <nl> setProperty ( " source " , script ) ; <nl> QVariant result = m_webPage . mainFrame ( ) - > evaluateJavaScript ( " try { " \ <nl> QString CSConverter : : convert ( const QString & script ) <nl> " } catch ( error ) { " \ <nl> " [ false , error . message ] ; " \ <nl> " } " ) ; <nl> - if ( result . toStringList ( ) . at ( 0 ) = = " false " ) { <nl> - qWarning ( qPrintable ( result . toStringList ( ) . at ( 1 ) ) ) ; <nl> - return QString ( ) ; <nl> - } <nl> - return result . toStringList ( ) . at ( 1 ) ; <nl> + return result ; <nl> } <nl> mmm a / src / csconverter . h <nl> ppp b / src / csconverter . h <nl> class CSConverter : public QObject <nl> { <nl> public : <nl> CSConverter ( QObject * parent = 0 ) ; <nl> - QString convert ( const QString & script ) ; <nl> + QVariant convert ( const QString & script ) ; <nl> <nl> private : <nl> QWebPage m_webPage ; <nl> mmm a / src / phantom . cpp <nl> ppp b / src / phantom . cpp <nl> bool Phantom : : execute ( ) <nl> if ( m_scriptFile . isEmpty ( ) ) <nl> return false ; <nl> <nl> - if ( ! Utils : : injectJsInFrame ( m_scriptFile , QDir : : currentPath ( ) , m_page - > mainFrame ( ) ) ) { <nl> + if ( ! Utils : : injectJsInFrame ( m_scriptFile , QDir : : currentPath ( ) , m_page - > mainFrame ( ) , true ) ) { <nl> m_returnValue = - 1 ; <nl> return false ; <nl> } <nl> QObject * Phantom : : createWebPage ( ) <nl> return page ; <nl> } <nl> <nl> - void Phantom : : exit ( int code ) <nl> + void Phantom : : _exit ( int code ) <nl> { <nl> m_terminated = true ; <nl> m_returnValue = code ; <nl> mmm a / src / phantom . h <nl> ppp b / src / phantom . h <nl> class Phantom : public QObject <nl> public slots : <nl> QObject * createWebPage ( ) ; <nl> bool injectJs ( const QString & jsFilePath ) ; <nl> - void exit ( int code = 0 ) ; <nl> + void _exit ( int code ) ; <nl> <nl> private slots : <nl> void printConsoleMessage ( const QString & msg , int lineNumber , const QString & source ) ; <nl> mmm a / src / utils . cpp <nl> ppp b / src / utils . cpp <nl> void Utils : : messageHandler ( QtMsgType type , const char * msg ) <nl> } <nl> } <nl> <nl> - QString Utils : : coffee2js ( const QString & script ) <nl> + QVariant Utils : : coffee2js ( const QString & script ) <nl> { <nl> / / We need only one instance of the CSConverter to survive for the whole life of PhantomJS <nl> static CSConverter * coffeeScriptConverter = NULL ; <nl> QString Utils : : coffee2js ( const QString & script ) <nl> return coffeeScriptConverter - > convert ( script ) ; <nl> } <nl> <nl> - bool Utils : : injectJsInFrame ( const QString & jsFilePath , const QString & libraryPath , QWebFrame * targetFrame ) <nl> + bool Utils : : injectJsInFrame ( const QString & jsFilePath , const QString & libraryPath , QWebFrame * targetFrame , const bool startingScript ) <nl> { <nl> / / Don ' t do anything if an empty string is passed <nl> if ( ! jsFilePath . isEmpty ( ) ) { <nl> bool Utils : : injectJsInFrame ( const QString & jsFilePath , const QString & libraryPat <nl> scriptBody . prepend ( " / / " ) ; <nl> } <nl> <nl> + if ( jsFile . fileName ( ) . endsWith ( COFFEE_SCRIPT_EXTENSION ) ) { <nl> + QVariant result = Utils : : coffee2js ( scriptBody ) ; <nl> + if ( result . toStringList ( ) . at ( 0 ) = = " false " ) { <nl> + if ( startingScript ) { <nl> + std : : cerr < < qPrintable ( result . toStringList ( ) . at ( 1 ) ) < < std : : endl ; <nl> + exit ( 1 ) ; <nl> + } else { <nl> + qWarning ( ) < < qPrintable ( result . toStringList ( ) . at ( 1 ) ) ; <nl> + scriptBody = QString ( ) ; <nl> + } <nl> + } else { <nl> + scriptBody = result . toStringList ( ) . at ( 1 ) ; <nl> + } <nl> + } <nl> + <nl> + / / prepare start script for exiting <nl> + if ( startingScript ) { <nl> + scriptBody = QString ( " try { " \ <nl> + " % 1 " \ <nl> + " } catch ( err ) { " \ <nl> + " if ( err ! = = ' phantom . exit ' ) { " \ <nl> + " phantom . _exit ( 1 ) ; " \ <nl> + " throw err ; " \ <nl> + " } " \ <nl> + " } " ) . arg ( scriptBody ) ; <nl> + } <nl> + <nl> / / Execute JS code in the context of the document <nl> - targetFrame - > evaluateJavaScript ( jsFile . fileName ( ) . endsWith ( COFFEE_SCRIPT_EXTENSION ) ? <nl> - Utils : : coffee2js ( scriptBody ) : / / < convert from Coffee Script <nl> - scriptBody ) ; <nl> + targetFrame - > evaluateJavaScript ( scriptBody ) ; <nl> jsFile . close ( ) ; <nl> return true ; <nl> } else { <nl> - qWarning ( ) < < " Can ' t open ' " < < qPrintable ( jsFilePath ) < < " ' " ; <nl> + if ( startingScript ) { <nl> + std : : cerr < < " Can ' t open ' " < < qPrintable ( jsFilePath ) < < " ' " < < std : : endl ; <nl> + } else { <nl> + qWarning ( " Can ' t open ' % s ' " , qPrintable ( jsFilePath ) ) ; <nl> + } <nl> } <nl> } <nl> return false ; <nl> mmm a / src / utils . h <nl> ppp b / src / utils . h <nl> class Utils <nl> public : <nl> static void showUsage ( ) ; <nl> static void messageHandler ( QtMsgType type , const char * msg ) ; <nl> - static QString coffee2js ( const QString & script ) ; <nl> - static bool injectJsInFrame ( const QString & jsFilePath , const QString & libraryPath , QWebFrame * targetFrame ) ; <nl> + static QVariant coffee2js ( const QString & script ) ; <nl> + static bool injectJsInFrame ( const QString & jsFilePath , const QString & libraryPath , QWebFrame * targetFrame , const bool startingScript = false ) ; <nl> <nl> private : <nl> Utils ( ) ; / / < This class shouldn ' t be instantiated <nl> | Merge pull request from Roejames12 / master | ariya/phantomjs | 7ba0d6964e3a158a6b63fa2ea3012a2db4962481 | 2011-06-20T06:19:44Z |
mmm a / src / common / exec_utils . h <nl> ppp b / src / common / exec_utils . h <nl> inline void CastNonDefaultStorage ( const std : : vector < NDArray > & src , <nl> } <nl> } <nl> } <nl> + <nl> + / * ! \ brief The default type inference function , which assigns all undefined <nl> + * types to the same type of one of the inputs or outputs . <nl> + * / <nl> + inline bool SameType ( const nnvm : : NodeAttrs & attrs , <nl> + std : : vector < int > * iattr , <nl> + std : : vector < int > * oattr ) { <nl> + int def_v = - 1 ; <nl> + for ( int v : * oattr ) { <nl> + if ( v ! = - 1 ) { <nl> + def_v = v ; break ; <nl> + } <nl> + } <nl> + if ( def_v = = - 1 ) { <nl> + for ( int v : * iattr ) { <nl> + if ( v ! = - 1 ) { <nl> + def_v = v ; break ; <nl> + } <nl> + } <nl> + } <nl> + if ( def_v = = - 1 ) return false ; <nl> + for ( int & v : * oattr ) { <nl> + v = def_v ; <nl> + } <nl> + for ( int & v : * iattr ) { <nl> + v = def_v ; <nl> + } <nl> + return true ; <nl> + } <nl> + <nl> + <nl> + / * ! \ brief The default storage type inference function , which assigns all undefined <nl> + * storage types to kDefaultStorage . If all of input and output storage types <nl> + * are kDefaultStorage , DispatchMode : : kFCompute is assigned to dispatch_mode . Otherwise , <nl> + * DispatchMode : : kFComputeFallback is assigned to dispatch_mode . <nl> + * / <nl> + inline bool DefaultStorageType ( const nnvm : : NodeAttrs & attrs , <nl> + const int dev_mask , <nl> + DispatchMode * dispatch_mode , <nl> + std : : vector < int > * iattr , <nl> + std : : vector < int > * oattr ) { <nl> + bool fallback = false ; <nl> + for ( int & v : * oattr ) { <nl> + if ( v = = - 1 ) v = kDefaultStorage ; <nl> + if ( v ! = kDefaultStorage ) fallback = true ; <nl> + } <nl> + for ( int & v : * iattr ) { <nl> + if ( v = = - 1 ) v = kDefaultStorage ; <nl> + if ( v ! = kDefaultStorage ) fallback = true ; <nl> + } <nl> + if ( * dispatch_mode = = DispatchMode : : kUndefined ) { <nl> + if ( fallback ) { <nl> + * dispatch_mode = DispatchMode : : kFComputeFallback ; <nl> + } else { <nl> + * dispatch_mode = DispatchMode : : kFCompute ; <nl> + } <nl> + } <nl> + return true ; <nl> + } <nl> + <nl> + <nl> } / / namespace common <nl> } / / namespace mxnet <nl> # endif / / MXNET_COMMON_EXEC_UTILS_H_ <nl> mmm a / src / executor / exec_pass . h <nl> ppp b / src / executor / exec_pass . h <nl> Graph InferStorageType ( Graph & & graph , <nl> StorageTypeVector & & storage_type_inputs = StorageTypeVector ( ) , <nl> const std : : string & storage_type_attr_key = " " ) ; <nl> <nl> - / * ! \ brief The default storage type inference function , which assigns all undefined <nl> - * storage types to kDefaultStorage . If all of input and output storage types <nl> - * are kDefaultStorage , DispatchMode : : kFCompute is assigned to dispatch_mode . Otherwise , <nl> - * DispatchMode : : kFComputeFallback is assigned to dispatch_mode . <nl> - * / <nl> - bool DefaultStorageType ( const nnvm : : NodeAttrs & attrs , <nl> - const int dev_mask , <nl> - DispatchMode * dispatch_mode , <nl> - std : : vector < int > * iattr , <nl> - std : : vector < int > * oattr ) ; <nl> - <nl> } / / namespace exec <nl> } / / namespace mxnet <nl> <nl> mmm a / src / executor / infer_graph_attr_pass . cc <nl> ppp b / src / executor / infer_graph_attr_pass . cc <nl> <nl> # include < mxnet / graph_attr_types . h > <nl> # include " . / exec_pass . h " <nl> # include " . . / operator / operator_common . h " <nl> + # include " . . / common / exec_utils . h " <nl> <nl> namespace mxnet { <nl> namespace exec { <nl> nnvm : : Graph InferAttr ( nnvm : : Graph & & ret , <nl> return ret ; <nl> } <nl> <nl> - / / inference fucntion for same type <nl> - inline bool SameType ( const nnvm : : NodeAttrs & attrs , <nl> - std : : vector < int > * iattr , <nl> - std : : vector < int > * oattr ) { <nl> - int def_v = - 1 ; <nl> - for ( int v : * oattr ) { <nl> - if ( v ! = - 1 ) { <nl> - def_v = v ; break ; <nl> - } <nl> - } <nl> - if ( def_v = = - 1 ) { <nl> - for ( int v : * iattr ) { <nl> - if ( v ! = - 1 ) { <nl> - def_v = v ; break ; <nl> - } <nl> - } <nl> - } <nl> - if ( def_v = = - 1 ) return false ; <nl> - for ( int & v : * oattr ) { <nl> - v = def_v ; <nl> - } <nl> - for ( int & v : * iattr ) { <nl> - v = def_v ; <nl> - } <nl> - return true ; <nl> - } <nl> - <nl> - inline bool DefaultStorageType ( const nnvm : : NodeAttrs & attrs , <nl> - const int dev_mask , <nl> - DispatchMode * dispatch_mode , <nl> - std : : vector < int > * iattr , <nl> - std : : vector < int > * oattr ) { <nl> - bool fallback = false ; <nl> - for ( int & v : * oattr ) { <nl> - if ( v = = - 1 ) v = kDefaultStorage ; <nl> - if ( v ! = kDefaultStorage ) fallback = true ; <nl> - } <nl> - for ( int & v : * iattr ) { <nl> - if ( v = = - 1 ) v = kDefaultStorage ; <nl> - if ( v ! = kDefaultStorage ) fallback = true ; <nl> - } <nl> - if ( * dispatch_mode = = DispatchMode : : kUndefined ) { <nl> - if ( fallback ) { <nl> - * dispatch_mode = DispatchMode : : kFComputeFallback ; <nl> - } else { <nl> - * dispatch_mode = DispatchMode : : kFCompute ; <nl> - } <nl> - } <nl> - return true ; <nl> - } <nl> - <nl> nnvm : : Graph InferShape ( nnvm : : Graph & & graph , <nl> nnvm : : ShapeVector & & shape_inputs , <nl> const std : : string & shape_attr_key ) { <nl> nnvm : : Graph InferType ( nnvm : : Graph & & graph , <nl> " FInferType " , " dtype_inputs " , " dtype_attr_key " , <nl> " dtype " , " dtype_num_unknown_nodes " , <nl> [ ] ( const int t ) { return t = = - 1 ; } , <nl> - SameType , true , nullptr ) ; <nl> + common : : SameType , true , nullptr ) ; <nl> } <nl> <nl> nnvm : : Graph InferStorageType ( nnvm : : Graph & & graph , <nl> nnvm : : Graph InferStorageType ( nnvm : : Graph & & graph , <nl> " FInferStorageType " , " storage_type_inputs " , " storage_type_attr_key " , <nl> " storage_type " , " storage_type_num_unknown_nodes " , <nl> [ ] ( const int t ) { return t = = - 1 ; } , <nl> - DefaultStorageType , false , " dispatch_mode " , DispatchMode : : kVariable ) ; <nl> + common : : DefaultStorageType , false , " dispatch_mode " , DispatchMode : : kVariable ) ; <nl> <nl> / / log the storage types and dispatch modes of the graph <nl> bool log_verbose = dmlc : : GetEnv ( " MXNET_INFER_STORAGE_TYPE_VERBOSE_LOGGING " , false ) ; <nl> mmm a / src / imperative / imperative_utils . h <nl> ppp b / src / imperative / imperative_utils . h <nl> inline void SetShapeType ( const Context & ctx , <nl> for ( auto & i : outputs ) { <nl> out_types . push_back ( i - > dtype ( ) ) ; <nl> } <nl> - CHECK ( infertype . count ( attrs . op ) ) <nl> - < < " Operator " < < attrs . op - > name < < " is missing FInferType attribute " ; <nl> - CHECK ( infertype [ attrs . op ] ( attrs , & in_types , & out_types ) ) ; <nl> + bool infer_type_success = false ; <nl> + if ( infertype . count ( attrs . op ) ) { <nl> + infer_type_success = infertype [ attrs . op ] ( attrs , & in_types , & out_types ) ; <nl> + } else { <nl> + infer_type_success = common : : SameType ( attrs , & in_types , & out_types ) ; <nl> + } <nl> + CHECK ( infer_type_success ) < < " Operator " < < attrs . op - > name < < " is missing FInferType attribute " ; <nl> CHECK_EQ ( out_types . size ( ) , outputs . size ( ) ) ; <nl> <nl> / / infer storage type <nl> inline void SetShapeType ( const Context & ctx , <nl> for ( auto & i : outputs ) { <nl> out_storage_types . push_back ( i - > storage_type ( ) ) ; <nl> } <nl> - bool infer_stype_success ; <nl> + bool infer_stype_success = false ; <nl> if ( inferstorage . count ( attrs . op ) ) { <nl> infer_stype_success = inferstorage [ attrs . op ] ( attrs , ctx . dev_mask ( ) , dispatch_mode , <nl> & in_storage_types , & out_storage_types ) ; <nl> } else { <nl> / / if infer storage attr is not present , apply the default infer storage function <nl> - infer_stype_success = exec : : DefaultStorageType ( attrs , ctx . dev_mask ( ) , dispatch_mode , <nl> + infer_stype_success = common : : DefaultStorageType ( attrs , ctx . dev_mask ( ) , dispatch_mode , <nl> & in_storage_types , & out_storage_types ) ; <nl> } <nl> CHECK ( infer_stype_success ) < < " Operator not implemented : " <nl> | add SameType as default type inference function in imperative mode ( ) | apache/incubator-mxnet | 0fe04e9d778ac9c55e933ff3f21c4ddf28a4a101 | 2018-03-07T05:43:32Z |
mmm a / plugins / net_plugin / net_plugin . cpp <nl> ppp b / plugins / net_plugin / net_plugin . cpp <nl> namespace eosio { <nl> c - > enqueue ( note ) ; <nl> } <nl> c - > syncing = true ; <nl> - request_message req ; <nl> - req . req_blocks . mode = catch_up ; <nl> - req . req_trx . mode = none ; <nl> - c - > enqueue ( req ) ; <nl> + if ( cc . get_block_id_for_num ( msg . head_num ) ! = msg . head_id ) { <nl> + request_message req ; <nl> + req . req_blocks . mode = catch_up ; <nl> + req . req_trx . mode = none ; <nl> + c - > enqueue ( req ) ; <nl> + } <nl> return ; <nl> } <nl> fc_elog ( logger , " sync check failed to resolve status " ) ; <nl> | Only request_message for our head greater than msg . head when we suspect they are on a fork | EOSIO/eos | ffbf338b8e8481a54b8b524c2def0508b6e51023 | 2019-08-30T18:52:26Z |
mmm a / modules / prediction / BUILD <nl> ppp b / modules / prediction / BUILD <nl> cc_library ( <nl> " / / modules / common / time " , <nl> " / / modules / common / util " , <nl> " / / modules / localization / proto : localization_proto " , <nl> + " / / modules / map / relative_map : relative_map_lib " , <nl> " / / modules / perception / proto : perception_proto " , <nl> " / / modules / planning / proto : planning_proto " , <nl> " / / modules / prediction / common : feature_output " , <nl> mmm a / modules / prediction / prediction . cc <nl> ppp b / modules / prediction / prediction . cc <nl> <nl> # include " modules / common / math / vec2d . h " <nl> # include " modules / common / time / time . h " <nl> # include " modules / common / util / file . h " <nl> + # include " modules / map / relative_map / relative_map . h " <nl> # include " modules / prediction / common / feature_output . h " <nl> # include " modules / prediction / common / prediction_gflags . h " <nl> # include " modules / prediction / common / prediction_map . h " <nl> Status Prediction : : Init ( ) { <nl> <nl> CHECK ( AdapterManager : : GetLocalization ( ) ) < < " Localization is not ready . " ; <nl> CHECK ( AdapterManager : : GetPerceptionObstacles ( ) ) < < " Perception is not ready . " ; <nl> + if ( FLAGS_use_navigation_mode ) { <nl> + CHECK ( AdapterManager : : GetRelativeMap ( ) ) ; <nl> + } <nl> <nl> / / Set perception obstacle callback function <nl> AdapterManager : : AddPerceptionObstaclesCallback ( & Prediction : : RunOnce , this ) ; <nl> Status Prediction : : Init ( ) { <nl> / / Set planning callback function <nl> AdapterManager : : AddPlanningCallback ( & Prediction : : OnPlanning , this ) ; <nl> <nl> - if ( ! PredictionMap : : Ready ( ) ) { <nl> + if ( ! FLAGS_use_navigation_mode & & ! PredictionMap : : Ready ( ) ) { <nl> return OnError ( " Map cannot be loaded . " ) ; <nl> } <nl> <nl> void Prediction : : OnPlanning ( const planning : : ADCTrajectory & adc_trajectory ) { <nl> } <nl> <nl> void Prediction : : RunOnce ( const PerceptionObstacles & perception_obstacles ) { <nl> + if ( FLAGS_prediction_offline_mode ) { <nl> + PredictOnNavigation ( perception_obstacles ) ; <nl> + } else { <nl> + PredictOnHDMap ( perception_obstacles ) ; <nl> + } <nl> + } <nl> + <nl> + void Prediction : : PredictOnHDMap ( <nl> + const PerceptionObstacles & perception_obstacles ) { <nl> if ( FLAGS_prediction_test_mode & & FLAGS_prediction_test_duration > 0 & & <nl> ( Clock : : NowInSeconds ( ) - start_time_ > FLAGS_prediction_test_duration ) ) { <nl> AINFO < < " Prediction finished running in test mode " ; <nl> void Prediction : : RunOnce ( const PerceptionObstacles & perception_obstacles ) { <nl> Publish ( & prediction_obstacles ) ; <nl> } <nl> <nl> + void Prediction : : PredictOnNavigation ( <nl> + const PerceptionObstacles & perception_obstacles ) { <nl> + / / TODO ( kechxu ) : implement <nl> + } <nl> + <nl> Status Prediction : : OnError ( const std : : string & error_msg ) { <nl> return Status ( ErrorCode : : PREDICTION_ERROR , error_msg ) ; <nl> } <nl> mmm a / modules / prediction / prediction . h <nl> ppp b / modules / prediction / prediction . h <nl> class Prediction : public PredictionInterface { <nl> private : <nl> common : : Status OnError ( const std : : string & error_msg ) ; <nl> <nl> + void PredictOnHDMap ( <nl> + const perception : : PerceptionObstacles & perception_obstacles ) ; <nl> + <nl> + void PredictOnNavigation ( <nl> + const perception : : PerceptionObstacles & perception_obstacles ) ; <nl> + <nl> void OnLocalization ( const localization : : LocalizationEstimate & localization ) ; <nl> <nl> void OnPlanning ( const planning : : ADCTrajectory & adc_trajectory ) ; <nl> | Prediction : setup the framework for prediction on navigation mode | ApolloAuto/apollo | d14c36a60a9a0d04603d9cce2058b08957efbdcd | 2018-02-22T19:13:34Z |
mmm a / ChangeLog <nl> ppp b / ChangeLog <nl> <nl> + 2010 - 08 - 29 Tatsuhiro Tsujikawa < t - tujikawa @ users . sourceforge . net > <nl> + <nl> + Added a note about the number of connections to help message . <nl> + * src / version_usage . cc <nl> + <nl> 2010 - 08 - 29 Tatsuhiro Tsujikawa < t - tujikawa @ users . sourceforge . net > <nl> <nl> Run PeerLookupTask more frequently when the number of peer is low . <nl> mmm a / src / version_usage . cc <nl> ppp b / src / version_usage . cc <nl> void showUsage ( const std : : string & keyword , const OptionParser & oparser ) { <nl> < < _ ( " Make sure that URI is quoted with single ( \ ' ) or double ( \ " ) quotation if it \ n " <nl> " contains \ " & \ " or any characters that have special meaning in shell . " ) < < " \ n " <nl> < < " \ n " ; <nl> + std : : cout < < " About the number of connections \ n " <nl> + < < " Since 1 . 10 . 0 release , aria2 uses 1 connection per host by default and has 20MiB \ n " <nl> + < < " segment size restriction . So whatever value you specify using - s option , it \ n " <nl> + < < " uses 1 connection per host . To make it behave like 1 . 9 . x , use \ n " <nl> + < < " - - max - connection - per - server = 4 - - min - split - size = 1M . \ n " <nl> + < < " \ n " ; <nl> } <nl> std : : cout < < _ ( " Refer to man page for more information . " ) < < std : : endl ; <nl> } <nl> | 2010 - 08 - 29 Tatsuhiro Tsujikawa < t - tujikawa @ users . sourceforge . net > | aria2/aria2 | 98c5a866840426a3de3d8a277fc3a7f762743057 | 2010-08-29T13:46:21Z |
mmm a / unittests / block_tests . cpp <nl> ppp b / unittests / block_tests . cpp <nl> BOOST_AUTO_TEST_CASE ( block_with_invalid_tx_test ) <nl> auto b = main . produce_block ( ) ; <nl> <nl> / / Make a copy of the valid block and corrupt the transaction <nl> - auto copy_b = std : : make_shared < signed_block > ( * b ) ; <nl> + auto copy_b = std : : make_shared < signed_block > ( std : : move ( * b ) ) ; <nl> auto signed_tx = copy_b - > transactions . back ( ) . trx . get < packed_transaction > ( ) . get_signed_transaction ( ) ; <nl> auto & act = signed_tx . actions . back ( ) ; <nl> auto act_data = act . data_as < newaccount > ( ) ; <nl> std : : pair < signed_block_ptr , signed_block_ptr > corrupt_trx_in_block ( validating_te <nl> signed_block_ptr b = main . produce_block_no_validation ( ) ; <nl> <nl> / / Make a copy of the valid block and corrupt the transaction <nl> - auto copy_b = std : : make_shared < signed_block > ( * b ) ; <nl> + auto copy_b = std : : make_shared < signed_block > ( b - > clone ( ) ) ; <nl> auto signed_tx = copy_b - > transactions . back ( ) . trx . get < packed_transaction > ( ) . get_signed_transaction ( ) ; <nl> / / Corrupt one signature <nl> signed_tx . signatures . clear ( ) ; <nl> mmm a / unittests / forked_tests . cpp <nl> ppp b / unittests / forked_tests . cpp <nl> BOOST_AUTO_TEST_CASE ( fork_with_bad_block ) try { <nl> auto & fork = forks . at ( j ) ; <nl> <nl> if ( j < = i ) { <nl> - auto copy_b = std : : make_shared < signed_block > ( * b ) ; <nl> + auto copy_b = std : : make_shared < signed_block > ( b - > clone ( ) ) ; <nl> if ( j = = i ) { <nl> / / corrupt this block <nl> fork . block_merkle = remote . control - > head_block_state ( ) - > blockroot_merkle ; <nl> BOOST_AUTO_TEST_CASE ( forking ) try { <nl> } <nl> wlog ( " end push c2 blocks to c1 " ) ; <nl> wlog ( " now push dan ' s block to c1 but first corrupt it so it is a bad block " ) ; <nl> - auto bad_block = * b ; <nl> + signed_block bad_block = std : : move ( * b ) ; <nl> bad_block . transaction_mroot = bad_block . previous ; <nl> - auto bad_block_bs = c . control - > create_block_state_future ( std : : make_shared < signed_block > ( bad_block ) ) ; <nl> + auto bad_block_bs = c . control - > create_block_state_future ( std : : make_shared < signed_block > ( std : : move ( bad_block ) ) ) ; <nl> c . control - > abort_block ( ) ; <nl> BOOST_REQUIRE_EXCEPTION ( c . control - > push_block ( bad_block_bs ) , fc : : exception , <nl> [ ] ( const fc : : exception & ex ) - > bool { <nl> | Update tests for private signed_block copy constructor | EOSIO/eos | 6b18a1b789be3968811899c0dff76e96c3c7893f | 2018-11-27T18:48:31Z |
mmm a / examples / wave . py <nl> ppp b / examples / wave . py <nl> <nl> inv_dx = 1 / dx <nl> dt = 3e - 4 <nl> max_steps = 512 <nl> - vis_interval = 16 <nl> - steps = max_steps <nl> + vis_interval = 1 <nl> + steps = 16 <nl> gravity = 9 . 8 <nl> - amplify = 2 <nl> + amplify = 1 <nl> <nl> scalar = lambda : ti . var ( dt = real ) <nl> vec = lambda : ti . Vector ( 2 , dt = real ) <nl> def initialize ( ) : <nl> <nl> <nl> @ ti . kernel <nl> - def ftdt ( t : ti . i32 ) : <nl> + def fdtd ( t : ti . i32 ) : <nl> for i in range ( n_grid ) : <nl> for j in range ( n_grid ) : <nl> laplacian_p = laplacian ( t - 2 , i , j ) <nl> def ftdt ( t : ti . i32 ) : <nl> t - 2 , i , j ] - c * alpha * dt * laplacian_p <nl> <nl> @ ti . kernel <nl> - def compute_loss ( ) : <nl> + def compute_loss ( t : ti . i32 ) : <nl> for i in range ( n_grid ) : <nl> for j in range ( n_grid ) : <nl> - ti . atomic_add ( loss , dx * dx * ti . sqr ( target [ i , j ] - p [ steps - 1 , i , j ] ) ) <nl> + ti . atomic_add ( loss , ti . abs ( target [ i , j ] - p [ t , i , j ] ) ) <nl> + <nl> + @ ti . kernel <nl> + def apply_grad ( ) : <nl> + # gradient descent <nl> + for i , j in initial . grad : <nl> + initial [ i , j ] - = learning_rate * initial . grad [ i , j ] <nl> <nl> def forward ( ) : <nl> initialize ( ) <nl> - for t in range ( 2 , max_steps ) : <nl> - ftdt ( t ) <nl> + for t in range ( 2 , steps ) : <nl> + fdtd ( t ) <nl> if ( t + 1 ) % vis_interval = = 0 : <nl> img = np . zeros ( shape = ( n_grid , n_grid ) , dtype = np . float32 ) <nl> for i in range ( n_grid ) : <nl> for j in range ( n_grid ) : <nl> - img [ i , j ] = ( p [ t , i , j ] - 0 . 5 ) * amplify + 0 . 5 <nl> + img [ i , j ] = p [ t , i , j ] * amplify + 0 . 5 <nl> img = cv2 . resize ( img , fx = 4 , fy = 4 , dsize = None ) <nl> cv2 . imshow ( ' img ' , img ) <nl> cv2 . waitKey ( 1 ) <nl> - compute_loss ( ) <nl> + loss [ None ] = 0 <nl> + compute_loss ( steps - 1 ) <nl> <nl> - @ ti . kernel <nl> - def apply_grad ( ) : <nl> - # gradient descent <nl> - for i , j in initial . grad : <nl> - initial [ i , j ] - = learning_rate * initial . grad [ i , j ] <nl> <nl> def backward ( ) : <nl> clear_p_grad ( ) <nl> clear_initial_grad ( ) <nl> <nl> - compute_loss . grad ( ) <nl> - for t in reversed ( range ( 2 , max_steps ) ) : <nl> - ftdt . grad ( t ) <nl> + loss . grad [ None ] = 1 <nl> + compute_loss . grad ( steps - 1 ) <nl> + for t in reversed ( range ( 2 , steps ) ) : <nl> + fdtd . grad ( t ) <nl> initialize . grad ( ) <nl> + <nl> apply_grad ( ) <nl> <nl> @ ti . kernel <nl> def clear_initial_grad ( ) : <nl> <nl> def main ( ) : <nl> # initialization <nl> - target_img = cv2 . imread ( ' iclr2020 . png ' ) [ : , : , 0 ] / 255 . 0 - 0 . 5 <nl> + target_img = cv2 . imread ( ' iclr2020 . png ' ) [ : , : , 0 ] / 255 . 0 <nl> + target_img - = target_img . mean ( ) <nl> + cv2 . imshow ( ' target ' , target_img * amplify + 0 . 5 ) <nl> # print ( target_img . min ( ) , target_img . max ( ) ) <nl> for i in range ( n_grid ) : <nl> for j in range ( n_grid ) : <nl> def main ( ) : <nl> <nl> # initial [ n_grid / / 2 , n_grid / / 2 ] = 1 <nl> <nl> - for opt in range ( 100 ) : <nl> + for opt in range ( 1000 ) : <nl> forward ( ) <nl> print ( ' Loss = ' , loss [ None ] ) <nl> - loss . grad [ None ] = 1 <nl> backward ( ) <nl> <nl> if __name__ = = ' __main__ ' : <nl> | iclr appears | taichi-dev/taichi | bb69677fea775e7f894fdc3d3c2fdaca98d1073a | 2019-09-10T23:13:32Z |
mmm a / shell / dbshell . cpp <nl> ppp b / shell / dbshell . cpp <nl> static char * * completionHook ( const char * text , int start , int end ) { <nl> } <nl> <nl> if ( all . size ( ) = = 0 ) { <nl> + # ifdef USE_READLINE <nl> rl_bind_key ( ' \ t ' , rl_abort ) ; <nl> + # endif <nl> return 0 ; <nl> } <nl> <nl> | compile w / out readline shell | mongodb/mongo | e99f90dad0f28c5a67c87dc6d397d0ee807cf945 | 2010-06-07T22:40:37Z |
mmm a / ios / sdk / WeexSDK / Sources / Component / WXListComponent . m <nl> ppp b / ios / sdk / WeexSDK / Sources / Component / WXListComponent . m <nl> - ( void ) setContentOffset : ( CGPoint ) contentOffset <nl> if ( fabs ( contentOffset . y ) < 0 . 5 ) { <nl> contentOffset . y = 0 ; <nl> } <nl> + if ( isnan ( contentOffset . x ) ) { <nl> + contentOffset . x = 0 ; <nl> + } <nl> + if ( isnan ( contentOffset . y ) ) { <nl> + contentOffset . y = 0 ; <nl> + } <nl> <nl> [ super setContentOffset : contentOffset ] ; <nl> } <nl> mmm a / ios / sdk / WeexSDK / Sources / Layout / WXComponent + Layout . m <nl> ppp b / ios / sdk / WeexSDK / Sources / Layout / WXComponent + Layout . m <nl> - ( void ) _calculateFrameWithSuperAbsolutePosition : ( CGPoint ) superAbsolutePosition <nl> _cssNode - > layout . should_update = false ; <nl> _isLayoutDirty = NO ; <nl> <nl> - CGRect newFrame = CGRectMake ( WXRoundPixelValue ( _cssNode - > layout . position [ CSS_LEFT ] ) , <nl> - WXRoundPixelValue ( _cssNode - > layout . position [ CSS_TOP ] ) , <nl> - WXRoundPixelValue ( _cssNode - > layout . dimensions [ CSS_WIDTH ] ) , <nl> - WXRoundPixelValue ( _cssNode - > layout . dimensions [ CSS_HEIGHT ] ) ) ; <nl> + CGRect newFrame = CGRectMake ( isnan ( WXRoundPixelValue ( _cssNode - > layout . position [ CSS_LEFT ] ) ) ? 0 : WXRoundPixelValue ( _cssNode - > layout . position [ CSS_LEFT ] ) , <nl> + isnan ( WXRoundPixelValue ( _cssNode - > layout . position [ CSS_TOP ] ) ) ? 0 : WXRoundPixelValue ( _cssNode - > layout . position [ CSS_TOP ] ) , <nl> + isnan ( WXRoundPixelValue ( _cssNode - > layout . dimensions [ CSS_WIDTH ] ) ) ? 0 : WXRoundPixelValue ( _cssNode - > layout . dimensions [ CSS_WIDTH ] ) , <nl> + isnan ( WXRoundPixelValue ( _cssNode - > layout . dimensions [ CSS_HEIGHT ] ) ) ? 0 : WXRoundPixelValue ( _cssNode - > layout . dimensions [ CSS_HEIGHT ] ) ) ; <nl> <nl> BOOL isFrameChanged = NO ; <nl> if ( ! CGRectEqualToRect ( newFrame , _calculatedFrame ) ) { <nl> | [ WEEX - 105 ] [ iOS ] bug - fix about setting nan frame crash | apache/incubator-weex | 784fd75d324c2034a362a79251a87c295eb9fbea | 2017-11-13T07:08:15Z |
mmm a / tensorflow / core / grappler / optimizers / data / vectorization / BUILD <nl> ppp b / tensorflow / core / grappler / optimizers / data / vectorization / BUILD <nl> VECTORIZER_DEPS = [ <nl> " / / tensorflow / core / grappler / optimizers / data : graph_utils " , <nl> ] + tf_protos_all ( ) <nl> <nl> + cc_library ( <nl> + name = " wrapped_tensor " , <nl> + hdrs = [ " wrapped_tensor . h " ] , <nl> + deps = [ <nl> + " / / tensorflow / core : core_cpu " , <nl> + " / / tensorflow / core : lib " , <nl> + ] , <nl> + ) <nl> + <nl> cc_library ( <nl> name = " vectorizer " , <nl> hdrs = [ " vectorizer . h " ] , <nl> deps = [ <nl> + " : wrapped_tensor " , <nl> " / / tensorflow / core : core_cpu " , <nl> " / / tensorflow / core : lib " , <nl> ] + tf_protos_all ( ) , <nl> mmm a / tensorflow / core / grappler / optimizers / data / vectorization / cast_vectorizer . cc <nl> ppp b / tensorflow / core / grappler / optimizers / data / vectorization / cast_vectorizer . cc <nl> limitations under the License . <nl> <nl> namespace tensorflow { <nl> namespace grappler { <nl> - namespace vectorization_utils { <nl> + namespace { <nl> <nl> class CastVectorizer : public Vectorizer { <nl> public : <nl> Status Vectorize ( const Node & node , Graph * outer_scope , <nl> - std : : vector < Port > * input_ports , <nl> - std : : vector < Port > * output_ports ) override { <nl> + std : : vector < WrappedTensor > & & inputs , <nl> + std : : vector < WrappedTensor > * outputs ) override { <nl> Status s ; <nl> if ( node . num_inputs ( ) ! = 1 ) { <nl> return errors : : Internal ( " Cast op should only have one input . " ) ; <nl> class CastVectorizer : public Vectorizer { <nl> auto new_cast_node = outer_scope - > AddNode ( node . def ( ) , & s ) ; <nl> TF_RETURN_IF_ERROR ( s ) ; <nl> <nl> - / / Add input and output mappings <nl> - input_ports - > push_back ( { new_cast_node , 0 } ) ; <nl> - output_ports - > push_back ( { new_cast_node , 0 } ) ; <nl> + outer_scope - > AddEdge ( inputs [ 0 ] . node , inputs [ 0 ] . output_index , new_cast_node , <nl> + 0 ) ; <nl> + <nl> + / / Add output mappings <nl> + outputs - > push_back ( { new_cast_node , 0 , true } ) ; <nl> return Status : : OK ( ) ; <nl> } <nl> } ; <nl> <nl> REGISTER_VECTORIZER ( " Cast " , CastVectorizer ) ; <nl> <nl> - } / / namespace vectorization_utils <nl> + } / / namespace <nl> } / / namespace grappler <nl> } / / namespace tensorflow <nl> mmm a / tensorflow / core / grappler / optimizers / data / vectorization / unpack_vectorizer . cc <nl> ppp b / tensorflow / core / grappler / optimizers / data / vectorization / unpack_vectorizer . cc <nl> limitations under the License . <nl> <nl> namespace tensorflow { <nl> namespace grappler { <nl> - namespace vectorization_utils { <nl> + namespace { <nl> <nl> class UnpackVectorizer : public Vectorizer { <nl> public : <nl> Status Vectorize ( const Node & node , Graph * outer_scope , <nl> - std : : vector < Port > * input_ports , <nl> - std : : vector < Port > * output_ports ) override { <nl> + std : : vector < WrappedTensor > & & inputs , <nl> + std : : vector < WrappedTensor > * outputs ) override { <nl> Status s ; <nl> - if ( node . num_inputs ( ) ! = 1 ) { <nl> + if ( node . num_inputs ( ) ! = 1 | | inputs . size ( ) ! = 1 ) { <nl> return errors : : Internal ( " Unpack op should only have one input . " ) ; <nl> } <nl> <nl> class UnpackVectorizer : public Vectorizer { <nl> int new_axis = node . def ( ) . attr ( ) . at ( " axis " ) . i ( ) + 1 ; <nl> new_unpack_node - > AddAttr ( " axis " , new_axis ) ; <nl> <nl> - / / Add the input mappings <nl> - input_ports - > push_back ( { new_unpack_node , 0 } ) ; <nl> + outer_scope - > AddEdge ( inputs [ 0 ] . node , inputs [ 0 ] . output_index , <nl> + new_unpack_node , 0 ) ; <nl> <nl> / / Add the output mappings <nl> int num = node . def ( ) . attr ( ) . at ( " num " ) . i ( ) ; <nl> for ( int i = 0 ; i < num ; + + i ) { <nl> - output_ports - > push_back ( { new_unpack_node , i } ) ; <nl> + outputs - > push_back ( { new_unpack_node , i , true } ) ; <nl> } <nl> <nl> return Status : : OK ( ) ; <nl> class UnpackVectorizer : public Vectorizer { <nl> <nl> REGISTER_VECTORIZER ( " Unpack " , UnpackVectorizer ) ; <nl> <nl> - } / / namespace vectorization_utils <nl> + } / / namespace <nl> } / / namespace grappler <nl> } / / namespace tensorflow <nl> mmm a / tensorflow / core / grappler / optimizers / data / vectorization / vectorizer . h <nl> ppp b / tensorflow / core / grappler / optimizers / data / vectorization / vectorizer . h <nl> limitations under the License . <nl> <nl> # include " tensorflow / core / framework / function . pb . h " <nl> # include " tensorflow / core / graph / graph . h " <nl> + # include " tensorflow / core / grappler / optimizers / data / vectorization / wrapped_tensor . h " <nl> # include " tensorflow / core / lib / core / errors . h " <nl> # include " tensorflow / core / lib / core / status . h " <nl> <nl> namespace tensorflow { <nl> namespace grappler { <nl> - namespace vectorization_utils { <nl> - <nl> - / / Describes a tensor with its operation Node and output position <nl> - typedef std : : pair < Node * , int > Port ; <nl> <nl> / / Interface for vectorization of TensorFlow operations . See ` CastVectorizer ` <nl> / / for an example . <nl> class Vectorizer { <nl> <nl> / / Vectorizes an operation , ` node ` , by adding Node ( s ) to ` outer_scope ` <nl> / / that produce the same vector output ( s ) as executing ` node ` ' s op <nl> - / / on elements of the vector inputs . The new Node ( s ) collectively have the <nl> + / / on elements of ` inputs ` . The new Node ( s ) collectively have the <nl> / / same number of input and output ports as the node being converted . <nl> - / / Adds mappings for the new nodes ' input and output ports to ` inputs ` and <nl> - / / ` outputs ` respectively , where the i ' th Port in inputs / outputs <nl> - / / corresponds to the i ' th input / output port of the node to be converted . <nl> + / / Adds edges between the newly created nodes and nodes in ` inputs ` , and adds <nl> + / / mappings to the new nodes ' output ports to ` outputs ` , where the i ' th <nl> + / / value in ` outputs ` corresponds to the i ' th output port of the node <nl> + / / to be converted . <nl> virtual Status Vectorize ( const Node & node , Graph * outer_scope , <nl> - std : : vector < Port > * input_ports , <nl> - std : : vector < Port > * output_ports ) = 0 ; <nl> + std : : vector < WrappedTensor > & & inputs , <nl> + std : : vector < WrappedTensor > * outputs ) = 0 ; <nl> } ; <nl> <nl> - } / / namespace vectorization_utils <nl> } / / namespace grappler <nl> } / / namespace tensorflow <nl> # endif / / TENSORFLOW_CORE_GRAPPLER_OPTIMIZERS_DATA_VECTORIZATION_VECTORIZER_H_ <nl> mmm a / tensorflow / core / grappler / optimizers / data / vectorization / vectorizer_registry . cc <nl> ppp b / tensorflow / core / grappler / optimizers / data / vectorization / vectorizer_registry . cc <nl> limitations under the License . <nl> <nl> namespace tensorflow { <nl> namespace grappler { <nl> - namespace vectorization_utils { <nl> <nl> VectorizerRegistry * VectorizerRegistry : : Global ( ) { <nl> static VectorizerRegistry * registry = new VectorizerRegistry ; <nl> void VectorizerRegistry : : Register ( const string & op_type , <nl> vectorizers_ . insert ( std : : pair < const string & , std : : unique_ptr < Vectorizer > > ( <nl> op_type , std : : move ( vectorizer ) ) ) ; <nl> } <nl> - } / / namespace vectorization_utils <nl> } / / namespace grappler <nl> } / / namespace tensorflow <nl> mmm a / tensorflow / core / grappler / optimizers / data / vectorization / vectorizer_registry . h <nl> ppp b / tensorflow / core / grappler / optimizers / data / vectorization / vectorizer_registry . h <nl> limitations under the License . <nl> <nl> namespace tensorflow { <nl> namespace grappler { <nl> - namespace vectorization_utils { <nl> <nl> / / A global VectorizerRegistry is used to hold all the vectorizers . <nl> class VectorizerRegistry { <nl> class VectorizerRegistration { <nl> # define REGISTER_VECTORIZER_UNIQ_HELPER ( ctr , op_type , vectorizer ) \ <nl> REGISTER_VECTORIZER_UNIQ ( ctr , op_type , vectorizer ) <nl> <nl> - # define REGISTER_VECTORIZER_UNIQ ( ctr , op_type , vectorizer ) \ <nl> - static : : tensorflow : : grappler : : vectorization_utils : : \ <nl> - vectorizer_registration : : VectorizerRegistration \ <nl> - vectorizer_registration_ # # ctr ( \ <nl> - op_type , \ <nl> - : : std : : unique_ptr < \ <nl> - : : tensorflow : : grappler : : vectorization_utils : : Vectorizer > ( \ <nl> - new vectorizer ( ) ) ) <nl> + # define REGISTER_VECTORIZER_UNIQ ( ctr , op_type , vectorizer ) \ <nl> + static : : tensorflow : : grappler : : vectorizer_registration : : \ <nl> + VectorizerRegistration vectorizer_registration_ # # ctr ( \ <nl> + op_type , : : std : : unique_ptr < : : tensorflow : : grappler : : Vectorizer > ( \ <nl> + new vectorizer ( ) ) ) <nl> <nl> - } / / namespace vectorization_utils <nl> } / / namespace grappler <nl> } / / namespace tensorflow <nl> <nl> mmm a / tensorflow / core / grappler / optimizers / data / vectorization / vectorizer_registry_test . cc <nl> ppp b / tensorflow / core / grappler / optimizers / data / vectorization / vectorizer_registry_test . cc <nl> limitations under the License . <nl> <nl> namespace tensorflow { <nl> namespace grappler { <nl> - namespace vectorization_utils { <nl> <nl> class TestVectorizer : public Vectorizer { <nl> public : <nl> Status Vectorize ( const Node & node , Graph * outer_scope , <nl> - std : : vector < Port > * inputs , <nl> - std : : vector < Port > * outputs ) override { <nl> + std : : vector < WrappedTensor > & & inputs , <nl> + std : : vector < WrappedTensor > * outputs ) override { <nl> return Status : : OK ( ) ; <nl> } <nl> } ; <nl> TEST ( TestVectorizer , TestTestVectorizer ) { <nl> NodeDef node_def ; <nl> Status s ; <nl> Node * node = g . AddNode ( node_def , & s ) ; <nl> - std : : vector < Port > inputs , outputs ; <nl> - EXPECT_TRUE ( vectorizer - > Vectorize ( * node , & g , & inputs , & outputs ) . ok ( ) ) ; <nl> + std : : vector < WrappedTensor > inputs , outputs ; <nl> + EXPECT_TRUE ( <nl> + vectorizer - > Vectorize ( * node , & g , std : : move ( inputs ) , & outputs ) . ok ( ) ) ; <nl> } <nl> <nl> - } / / namespace vectorization_utils <nl> } / / namespace grappler <nl> } / / namespace tensorflow <nl> new file mode 100644 <nl> index 0000000000000 . . 4439b4ab4e6eb <nl> mmm / dev / null <nl> ppp b / tensorflow / core / grappler / optimizers / data / vectorization / wrapped_tensor . h <nl> <nl> + / * Copyright 2018 The TensorFlow Authors . All Rights Reserved . <nl> + <nl> + Licensed under the Apache License , Version 2 . 0 ( the " License " ) ; <nl> + you may not use this file except in compliance with the License . <nl> + You may obtain a copy of the License at <nl> + <nl> + http : / / www . apache . org / licenses / LICENSE - 2 . 0 <nl> + <nl> + Unless required by applicable law or agreed to in writing , software <nl> + distributed under the License is distributed on an " AS IS " BASIS , <nl> + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND , either express or implied . <nl> + See the License for the specific language governing permissions and <nl> + limitations under the License . <nl> + = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = * / <nl> + <nl> + # ifndef TENSORFLOW_CORE_GRAPPLER_OPTIMIZERS_DATA_VECTORIZATION_WRAPPED_TENSOR_H_ <nl> + # define TENSORFLOW_CORE_GRAPPLER_OPTIMIZERS_DATA_VECTORIZATION_WRAPPED_TENSOR_H_ <nl> + <nl> + # include " tensorflow / core / graph / graph . h " <nl> + <nl> + namespace tensorflow { <nl> + namespace grappler { <nl> + <nl> + / / Represents a tensor that has been vectorized . <nl> + struct WrappedTensor { <nl> + Node * const node ; <nl> + const int output_index ; <nl> + <nl> + / / Whether the tensor is stacked , i . e . represents the results of applying <nl> + / / the operation on all slices of the input , where each row i of the <nl> + / / tensor corresponds to the op ' s output on slice i of the input . False <nl> + / / if the tensor is not stacked , i . e . represents the result of the op on <nl> + / / a single slice of the input , where the result does not vary between <nl> + / / slices . <nl> + bool stacked ; <nl> + <nl> + WrappedTensor ( Node * node , int output_index , bool stacked ) <nl> + : node ( node ) , output_index ( output_index ) , stacked ( stacked ) { } <nl> + } ; <nl> + <nl> + } / / namespace grappler <nl> + } / / namespace tensorflow <nl> + <nl> + # endif / / TENSORFLOW_CORE_GRAPPLER_OPTIMIZERS_DATA_VECTORIZATION_WRAPPED_TENSOR_H_ <nl> mmm a / tensorflow / core / grappler / optimizers / data / vectorization_utils . cc <nl> ppp b / tensorflow / core / grappler / optimizers / data / vectorization_utils . cc <nl> namespace { <nl> / / Describes a tensor with its operation Node and output position <nl> typedef std : : pair < Node * , int > TensorDesc ; <nl> <nl> - / / Equivalent to python Pfor ' s WrappedTensor struct <nl> - struct WrappedTensor { <nl> - TensorDesc tensor ; <nl> - <nl> - / / Whether the tensor is stacked , i . e . represents the results of applying <nl> - / / the operation on all slices of the input , where each row i of the <nl> - / / tensor corresponds to the op ' s output on slice i of the input . False <nl> - / / if the tensor is not stacked , i . e . represents the result of the op on <nl> - / / a single slice of the input , where the result does not vary between <nl> - / / slices . <nl> - bool stacked ; <nl> - <nl> - WrappedTensor ( TensorDesc & & tensor , bool stacked ) <nl> - : tensor ( std : : move ( tensor ) ) , stacked ( stacked ) { } <nl> - } ; <nl> - <nl> const char * const kRetValOp = " _Retval " ; <nl> <nl> void ReplaceEdgeSources ( const TensorDesc & old_src , const TensorDesc & new_src , <nl> Status Vectorization : : AddConversionMapping ( Node * op_node ) { <nl> return errors : : Unimplemented ( " No vectorizer registered for op : " , <nl> op_node - > type_string ( ) ) ; <nl> } <nl> - std : : vector < Port > input_ports , output_ports ; <nl> - input_ports . reserve ( op_node - > num_inputs ( ) ) ; <nl> - output_ports . reserve ( op_node - > num_outputs ( ) ) ; <nl> - TF_RETURN_IF_ERROR ( vectorizer - > Vectorize ( * op_node , outer_scope_ . get ( ) , <nl> - & input_ports , & output_ports ) ) ; <nl> + std : : vector < WrappedTensor > inputs , outputs ; <nl> + inputs . reserve ( op_node - > num_inputs ( ) ) ; <nl> + outputs . reserve ( op_node - > num_outputs ( ) ) ; <nl> <nl> std : : vector < const Edge * > input_edges ; <nl> TF_RETURN_IF_ERROR ( op_node - > input_edges ( & input_edges ) ) ; <nl> <nl> - if ( op_node - > num_outputs ( ) ! = output_ports . size ( ) | | <nl> - op_node - > num_inputs ( ) ! = input_ports . size ( ) | | <nl> - input_edges . size ( ) ! = input_ports . size ( ) ) { <nl> - return errors : : Internal ( " Vectorizer inputs / outputs don ' t match . " ) ; <nl> - } <nl> - <nl> - / / Promote the inputs of the op to MapDefun outputs and connect the edges <nl> - / / accordingly . <nl> + / / The inputs for the node to be converted may already have been converted <nl> + / / themselves . For those that are not , we promote them to MapDefun outputs . <nl> for ( size_t i = 0 ; i < op_node - > num_inputs ( ) ; + + i ) { <nl> auto edge = input_edges [ i ] ; <nl> - TF_RETURN_IF_ERROR ( AddMapDefunOutput ( map_defun_fn_ . get ( ) , map_defun_node_ , <nl> - { edge - > src ( ) , edge - > src_output ( ) } ) ) ; <nl> - outer_scope_ - > AddEdge ( map_defun_node_ , map_defun_fn_ - > ret_nodes . size ( ) - 1 , <nl> - input_ports [ i ] . first , input_ports [ i ] . second ) ; <nl> + if ( auto found = gtl : : FindOrNull ( conversion_map_ , <nl> + { edge - > src ( ) , edge - > src_output ( ) } ) ) { <nl> + inputs . push_back ( * found ) ; <nl> + } else { <nl> + / / TODO ( rachelim ) : Handle the case where unconverted inputs are unstacked . <nl> + / / We assume that all unconverted inputs will be stacked , since we <nl> + / / converted all unstacked nodes in ` Initialize ` . However , it ' s actually <nl> + / / possible that yet - unconverted nodes may produce unstacked outputs after <nl> + / / they are vectorized . ( For example , see the " Shape " converter in <nl> + / / tensorflow / python / ops / parallel_for / pfor . py ) . If a vectorizer expects <nl> + / / an unstacked input but receives a stacked one , vectorizer - > Vectorize <nl> + / / will return an error . <nl> + TF_RETURN_IF_ERROR ( AddMapDefunOutput ( map_defun_fn_ . get ( ) , map_defun_node_ , <nl> + { edge - > src ( ) , edge - > src_output ( ) } ) ) ; <nl> + int output_index = map_defun_fn_ - > ret_nodes . size ( ) - 1 ; <nl> + inputs . push_back ( { map_defun_node_ , output_index , true } ) ; <nl> + } <nl> + } <nl> + <nl> + TF_RETURN_IF_ERROR ( vectorizer - > Vectorize ( * op_node , outer_scope_ . get ( ) , <nl> + std : : move ( inputs ) , & outputs ) ) ; <nl> + <nl> + if ( op_node - > num_outputs ( ) ! = outputs . size ( ) ) { <nl> + return errors : : Internal ( <nl> + " Number of vectorizer outputs does not match . Expected : " , <nl> + op_node - > num_outputs ( ) , " Actual : " , outputs . size ( ) ) ; <nl> } <nl> <nl> / / Add output mappings . <nl> for ( size_t i = 0 ; i < op_node - > num_outputs ( ) ; + + i ) { <nl> - conversion_map_ . insert ( { { op_node , i } , { std : : move ( output_ports [ i ] ) , true } } ) ; <nl> + conversion_map_ . insert ( { { op_node , i } , outputs [ i ] } ) ; <nl> } <nl> <nl> return Status : : OK ( ) ; <nl> Status Vectorization : : ConvertOutput ( int output_position ) { <nl> <nl> TensorDesc output ( { ret_edge - > src ( ) , ret_edge - > src_output ( ) } ) ; <nl> TensorDesc converted_output ; <nl> - if ( auto found = gtl : : FindOrNull ( conversion_map_ , output ) ) { <nl> - / / It ' s possible the output already has a mapping , if it comes from a node <nl> - / / that has already been converted . <nl> - if ( found - > stacked ) { <nl> - converted_output = found - > tensor ; <nl> - } else { <nl> - / / Some outputs may be unstacked if they don ' t derive from arg nodes <nl> - / / ( for example , if a function returns a constant ) . For these , we <nl> - / / have to add extra nodes to tile it in the 0th dimension . <nl> - TF_RETURN_IF_ERROR ( StackTensor ( found , & converted_output ) ) ; <nl> - } <nl> - } else { <nl> - / / Note : All unstacked nodes are converted ahead of time in ` Initialize ` , <nl> - / / and here we assume that all op vectorizers create only stacked outputs . <nl> - / / This may not hold in the future , as more vectorizers are added that <nl> - / / may actually create unstacked outputs . For example , see the ` Shape ` <nl> - / / converter in third_party / tensorflow / python / ops / parallel_for / pfor . py <nl> + <nl> + / / It ' s possible the output already has a mapping , if it comes from a node <nl> + / / that has already been converted . <nl> + auto found = gtl : : FindOrNull ( conversion_map_ , output ) ; <nl> + if ( ! found ) { <nl> TF_RETURN_IF_ERROR ( AddConversionMapping ( output . first ) ) ; <nl> - converted_output = conversion_map_ . at ( output ) . tensor ; <nl> + found = & conversion_map_ . at ( output ) ; <nl> + } <nl> + <nl> + if ( found - > stacked ) { <nl> + converted_output = { found - > node , found - > output_index } ; <nl> + } else { <nl> + / / Some outputs may be unstacked if they don ' t derive from arg nodes <nl> + / / ( for example , if a function returns a constant ) . For these , we <nl> + / / have to add extra nodes to tile it in the 0th dimension . <nl> + TF_RETURN_IF_ERROR ( StackTensor ( found , & converted_output ) ) ; <nl> } <nl> <nl> ReplaceEdgeSources ( { map_defun_node_ , output_position } , converted_output , <nl> Status Vectorization : : StackTensor ( WrappedTensor * unstacked , <nl> <nl> Node * ones_shape ; <nl> TF_RETURN_IF_ERROR ( node_builder ( " Shape " ) <nl> - . Input ( unstacked - > tensor . first ) / / input <nl> + . Input ( unstacked - > node ) / / input <nl> . Finalize ( g , & ones_shape ) ) ; <nl> <nl> Node * ones ; <nl> Status Vectorization : : StackTensor ( WrappedTensor * unstacked , <nl> <nl> Node * expand_dims ; <nl> TF_RETURN_IF_ERROR ( node_builder ( " ExpandDims " ) <nl> - . Input ( unstacked - > tensor . first ) / / input <nl> - . Input ( const_0 ) / / dim <nl> + . Input ( unstacked - > node ) / / input <nl> + . Input ( const_0 ) / / dim <nl> . Finalize ( g , & expand_dims ) ) ; <nl> <nl> TF_RETURN_IF_ERROR ( node_builder ( " Tile " ) <nl> Status Vectorization : : AddArgNodeMappings ( ) { <nl> TF_RETURN_IF_ERROR ( map_defun_node_ - > input_node ( <nl> arg_node - > attrs ( ) . Find ( " index " ) - > i ( ) , & input_node ) ) ; <nl> <nl> - conversion_map_ . insert ( { { arg_node , 0 } , { { input_node , 0 } , true } } ) ; <nl> + conversion_map_ . insert ( { { arg_node , 0 } , { input_node , 0 , true } } ) ; <nl> <nl> / / Control inputs <nl> conversion_map_ . insert ( { { arg_node , Graph : : kControlSlot } , <nl> - { { input_node , Graph : : kControlSlot } , true } } ) ; <nl> + { input_node , Graph : : kControlSlot , true } } ) ; <nl> } <nl> return Status : : OK ( ) ; <nl> } <nl> bool Vectorization : : AddUnstackedNodeMappingsHelper ( TensorDesc & & tensor , <nl> <nl> if ( auto found = gtl : : FindOrNull ( conversion_map_ , <nl> { edge - > src ( ) , edge - > src_output ( ) } ) ) { <nl> - outer_scope_ - > AddEdge ( found - > tensor . first , found - > tensor . second , node , <nl> + outer_scope_ - > AddEdge ( found - > node , found - > output_index , node , <nl> edge - > dst_input ( ) ) ; <nl> } else { <nl> status - > Update ( errors : : Internal ( <nl> bool Vectorization : : AddUnstackedNodeMappingsHelper ( TensorDesc & & tensor , <nl> <nl> / / Add output mappings <nl> for ( int i = 0 ; i < tensor . first - > num_outputs ( ) ; + + i ) { <nl> - conversion_map_ . insert ( <nl> - { { tensor . first , i } , WrappedTensor ( { node , i } , false ) } ) ; <nl> + conversion_map_ . insert ( { { tensor . first , i } , WrappedTensor ( node , i , false ) } ) ; <nl> } <nl> conversion_map_ . insert ( { { tensor . first , Graph : : kControlSlot } , <nl> - WrappedTensor ( { node , Graph : : kControlSlot } , false ) } ) ; <nl> + WrappedTensor ( node , Graph : : kControlSlot , false ) } ) ; <nl> <nl> return true ; <nl> } <nl> | [ tf . data vectorization ] Feed inputs to vectorizers with notion of stackedness | tensorflow/tensorflow | 15d399cd8590c18dc643d979883fe4201c8ea631 | 2018-10-06T00:08:15Z |
mmm a / imgui . cpp <nl> ppp b / imgui . cpp <nl> bool ImGui : : BeginPopupModal ( const char * name , bool * p_open , ImGuiWindowFlags ext <nl> return is_open ; <nl> } <nl> <nl> + static void NavProcessMoveRequestWrapAround ( ImGuiWindow * window ) <nl> + { <nl> + ImGuiContext & g = * GImGui ; <nl> + if ( g . NavMoveRequest & & g . NavWindow = = window & & g . NavMoveResultId = = 0 ) <nl> + if ( ( g . NavMoveDir = = ImGuiDir_Up | | g . NavMoveDir = = ImGuiDir_Down ) & & g . NavMoveRequestForwardStep = = 0 & & g . NavLayer = = 0 ) <nl> + { <nl> + g . NavMoveRequest = false ; <nl> + g . NavMoveRequestForwardStep = 1 ; <nl> + g . NavWindow - > NavRectRel [ 0 ] . Min . y = g . NavWindow - > NavRectRel [ 0 ] . Max . y = ( g . NavMoveDir = = ImGuiDir_Up ) ? window - > SizeFull . y : 0 . 0f ; <nl> + } <nl> + } <nl> + <nl> void ImGui : : EndPopup ( ) <nl> { <nl> + ImGuiContext & g = * GImGui ; <nl> ImGuiWindow * window = GetCurrentWindow ( ) ; <nl> IM_ASSERT ( window - > Flags & ImGuiWindowFlags_Popup ) ; / / Mismatched BeginPopup ( ) / EndPopup ( ) calls <nl> - IM_ASSERT ( GImGui - > CurrentPopupStack . Size > 0 ) ; <nl> + IM_ASSERT ( g . CurrentPopupStack . Size > 0 ) ; <nl> + <nl> + / / Make all menus and popups wrap around for now , may need to expose that policy . <nl> + NavProcessMoveRequestWrapAround ( window ) ; <nl> + <nl> End ( ) ; <nl> if ( ! ( window - > Flags & ImGuiWindowFlags_Modal ) ) <nl> PopStyleVar ( ) ; <nl> mmm a / imgui_internal . h <nl> ppp b / imgui_internal . h <nl> struct ImGuiContext <nl> bool NavInitDefaultResultExplicit ; / / Whether the result was explicitly requested with SetItemDefaultFocus ( ) <nl> bool NavMoveFromClampedRefRect ; / / Set by manual scrolling , if we scroll to a point where NavId isn ' t visible we reset navigation from visible items <nl> bool NavMoveRequest ; / / Move request for this frame <nl> - int NavMoveRequestForwardStep ; / / 0 : no forward , 1 : forward request , 2 : forward result <nl> - ImGuiDir NavMoveDir ; / / West / East / North / South <nl> - ImGuiDir NavMoveDirLast ; / / <nl> + int NavMoveRequestForwardStep ; / / 0 : no forward , 1 : forward request , 2 : forward result ( this is used to navigate sibling parent menus from a child menu ) <nl> + ImGuiDir NavMoveDir ; / / Direction of the move request ( left / right / up / down ) <nl> + ImGuiDir NavMoveDirLast ; / / Direction of the previous move request <nl> ImGuiID NavMoveResultId ; / / Best move request candidate <nl> ImGuiID NavMoveResultParentId ; / / <nl> float NavMoveResultDistBox ; / / Best move request candidate box distance to current NavId <nl> | Nav : Menus and popups now have move request wrap around vertically ( using the move request forward thing added recently ) . ( ) | ocornut/imgui | f326fac64a7d25898fbd3fc7c2f7ac152bd18a3d | 2017-10-05T17:29:17Z |
mmm a / contrib / devtools / circular - dependencies . py <nl> ppp b / contrib / devtools / circular - dependencies . py <nl> <nl> ' core_write . cpp ' : ' core_io . cpp ' , <nl> } <nl> <nl> + # Directories with header - based modules , where the assumption that . cpp files <nl> + # define functions and variables declared in corresponding . h files is <nl> + # incorrect . <nl> + HEADER_MODULE_PATHS = [ <nl> + ' interfaces / ' <nl> + ] <nl> + <nl> def module_name ( path ) : <nl> if path in MAPPING : <nl> path = MAPPING [ path ] <nl> + if any ( path . startswith ( dirpath ) for dirpath in HEADER_MODULE_PATHS ) : <nl> + return path <nl> if path . endswith ( " . h " ) : <nl> return path [ : - 2 ] <nl> if path . endswith ( " . c " ) : <nl> mmm a / src / Makefile . am <nl> ppp b / src / Makefile . am <nl> bitcoin_wallet_LDADD = \ <nl> $ ( LIBBITCOIN_CONSENSUS ) \ <nl> $ ( LIBBITCOIN_UTIL ) \ <nl> $ ( LIBBITCOIN_CRYPTO ) \ <nl> + $ ( LIBBITCOIN_ZMQ ) \ <nl> $ ( LIBLEVELDB ) \ <nl> $ ( LIBLEVELDB_SSE42 ) \ <nl> $ ( LIBMEMENV ) \ <nl> - $ ( LIBSECP256K1 ) <nl> + $ ( LIBSECP256K1 ) \ <nl> + $ ( LIBUNIVALUE ) <nl> <nl> - bitcoin_wallet_LDADD + = $ ( BOOST_LIBS ) $ ( BDB_LIBS ) $ ( CRYPTO_LIBS ) $ ( MINIUPNPC_LIBS ) <nl> + bitcoin_wallet_LDADD + = $ ( BOOST_LIBS ) $ ( BDB_LIBS ) $ ( CRYPTO_LIBS ) $ ( EVENT_PTHREADS_LIBS ) $ ( EVENT_LIBS ) $ ( MINIUPNPC_LIBS ) $ ( ZMQ_LIBS ) <nl> # <nl> <nl> # bitcoinconsensus library # <nl> mmm a / src / Makefile . bench . include <nl> ppp b / src / Makefile . bench . include <nl> if ENABLE_WALLET <nl> bench_bench_bitcoin_SOURCES + = bench / coin_selection . cpp <nl> endif <nl> <nl> - bench_bench_bitcoin_LDADD + = $ ( BOOST_LIBS ) $ ( BDB_LIBS ) $ ( CRYPTO_LIBS ) $ ( MINIUPNPC_LIBS ) <nl> + bench_bench_bitcoin_LDADD + = $ ( BOOST_LIBS ) $ ( BDB_LIBS ) $ ( CRYPTO_LIBS ) $ ( EVENT_PTHREADS_LIBS ) $ ( EVENT_LIBS ) $ ( MINIUPNPC_LIBS ) <nl> bench_bench_bitcoin_LDFLAGS = $ ( RELDFLAGS ) $ ( AM_LDFLAGS ) $ ( LIBTOOL_APP_LDFLAGS ) <nl> <nl> CLEAN_BITCOIN_BENCH = bench / * . gcda bench / * . gcno $ ( GENERATED_BENCH_FILES ) <nl> mmm a / src / interfaces / chain . cpp <nl> ppp b / src / interfaces / chain . cpp <nl> <nl> <nl> # include < chain . h > <nl> # include < chainparams . h > <nl> + # include < interfaces / wallet . h > <nl> + # include < net . h > <nl> + # include < policy / fees . h > <nl> + # include < policy / policy . h > <nl> + # include < policy / rbf . h > <nl> # include < primitives / block . h > <nl> + # include < primitives / transaction . h > <nl> + # include < protocol . h > <nl> # include < sync . h > <nl> + # include < threadsafety . h > <nl> + # include < timedata . h > <nl> + # include < txmempool . h > <nl> + # include < ui_interface . h > <nl> # include < uint256 . h > <nl> # include < util / system . h > <nl> # include < validation . h > <nl> class LockImpl : public Chain : : Lock <nl> } <nl> return nullopt ; <nl> } <nl> + bool checkFinalTx ( const CTransaction & tx ) override <nl> + { <nl> + LockAnnotation lock ( : : cs_main ) ; <nl> + return CheckFinalTx ( tx ) ; <nl> + } <nl> + bool submitToMemoryPool ( CTransactionRef tx , CAmount absurd_fee , CValidationState & state ) override <nl> + { <nl> + LockAnnotation lock ( : : cs_main ) ; <nl> + return AcceptToMemoryPool ( : : mempool , state , tx , nullptr / * missing inputs * / , nullptr / * txn replaced * / , <nl> + false / * bypass limits * / , absurd_fee ) ; <nl> + } <nl> } ; <nl> <nl> class LockingStateImpl : public LockImpl , public UniqueLock < CCriticalSection > <nl> class ChainImpl : public Chain <nl> LOCK ( cs_main ) ; <nl> return GuessVerificationProgress ( Params ( ) . TxData ( ) , LookupBlockIndex ( block_hash ) ) ; <nl> } <nl> + RBFTransactionState isRBFOptIn ( const CTransaction & tx ) override <nl> + { <nl> + LOCK ( : : mempool . cs ) ; <nl> + return IsRBFOptIn ( tx , : : mempool ) ; <nl> + } <nl> + bool hasDescendantsInMempool ( const uint256 & txid ) override <nl> + { <nl> + LOCK ( : : mempool . cs ) ; <nl> + auto it_mp = : : mempool . mapTx . find ( txid ) ; <nl> + return it_mp ! = : : mempool . mapTx . end ( ) & & it_mp - > GetCountWithDescendants ( ) > 1 ; <nl> + } <nl> + void relayTransaction ( const uint256 & txid ) override <nl> + { <nl> + CInv inv ( MSG_TX , txid ) ; <nl> + g_connman - > ForEachNode ( [ & inv ] ( CNode * node ) { node - > PushInventory ( inv ) ; } ) ; <nl> + } <nl> + void getTransactionAncestry ( const uint256 & txid , size_t & ancestors , size_t & descendants ) override <nl> + { <nl> + : : mempool . GetTransactionAncestry ( txid , ancestors , descendants ) ; <nl> + } <nl> + bool checkChainLimits ( CTransactionRef tx ) override <nl> + { <nl> + LockPoints lp ; <nl> + CTxMemPoolEntry entry ( tx , 0 , 0 , 0 , false , 0 , lp ) ; <nl> + CTxMemPool : : setEntries ancestors ; <nl> + auto limit_ancestor_count = gArgs . GetArg ( " - limitancestorcount " , DEFAULT_ANCESTOR_LIMIT ) ; <nl> + auto limit_ancestor_size = gArgs . GetArg ( " - limitancestorsize " , DEFAULT_ANCESTOR_SIZE_LIMIT ) * 1000 ; <nl> + auto limit_descendant_count = gArgs . GetArg ( " - limitdescendantcount " , DEFAULT_DESCENDANT_LIMIT ) ; <nl> + auto limit_descendant_size = gArgs . GetArg ( " - limitdescendantsize " , DEFAULT_DESCENDANT_SIZE_LIMIT ) * 1000 ; <nl> + std : : string unused_error_string ; <nl> + LOCK ( : : mempool . cs ) ; <nl> + return : : mempool . CalculateMemPoolAncestors ( entry , ancestors , limit_ancestor_count , limit_ancestor_size , <nl> + limit_descendant_count , limit_descendant_size , unused_error_string ) ; <nl> + } <nl> + CFeeRate estimateSmartFee ( int num_blocks , bool conservative , FeeCalculation * calc ) override <nl> + { <nl> + return : : feeEstimator . estimateSmartFee ( num_blocks , calc , conservative ) ; <nl> + } <nl> + unsigned int estimateMaxBlocks ( ) override <nl> + { <nl> + return : : feeEstimator . HighestTargetTracked ( FeeEstimateHorizon : : LONG_HALFLIFE ) ; <nl> + } <nl> + CFeeRate mempoolMinFee ( ) override <nl> + { <nl> + return : : mempool . GetMinFee ( gArgs . GetArg ( " - maxmempool " , DEFAULT_MAX_MEMPOOL_SIZE ) * 1000000 ) ; <nl> + } <nl> + CAmount maxTxFee ( ) override { return : : maxTxFee ; } <nl> + bool getPruneMode ( ) override { return : : fPruneMode ; } <nl> + bool p2pEnabled ( ) override { return g_connman ! = nullptr ; } <nl> + bool isInitialBlockDownload ( ) override { return IsInitialBlockDownload ( ) ; } <nl> + int64_t getAdjustedTime ( ) override { return GetAdjustedTime ( ) ; } <nl> + void initMessage ( const std : : string & message ) override { : : uiInterface . InitMessage ( message ) ; } <nl> + void initWarning ( const std : : string & message ) override { InitWarning ( message ) ; } <nl> + void initError ( const std : : string & message ) override { InitError ( message ) ; } <nl> + void loadWallet ( std : : unique_ptr < Wallet > wallet ) override { : : uiInterface . LoadWallet ( wallet ) ; } <nl> } ; <nl> <nl> } / / namespace <nl> mmm a / src / interfaces / chain . h <nl> ppp b / src / interfaces / chain . h <nl> <nl> # ifndef BITCOIN_INTERFACES_CHAIN_H <nl> # define BITCOIN_INTERFACES_CHAIN_H <nl> <nl> - # include < optional . h > <nl> + # include < optional . h > / / For Optional and nullopt <nl> + # include < policy / rbf . h > / / For RBFTransactionState <nl> + # include < primitives / transaction . h > / / For CTransactionRef <nl> <nl> # include < memory > <nl> + # include < stddef . h > <nl> # include < stdint . h > <nl> # include < string > <nl> # include < vector > <nl> <nl> class CBlock ; <nl> class CScheduler ; <nl> + class CValidationState ; <nl> class uint256 ; <nl> struct CBlockLocator ; <nl> + struct FeeCalculation ; <nl> <nl> namespace interfaces { <nl> <nl> + class Wallet ; <nl> + <nl> / / ! Interface for giving wallet processes access to blockchain state . <nl> class Chain <nl> { <nl> class Chain <nl> / / ! is guaranteed to be an ancestor of the block used to create the <nl> / / ! locator . <nl> virtual Optional < int > findLocatorFork ( const CBlockLocator & locator ) = 0 ; <nl> + <nl> + / / ! Check if transaction will be final given chain height current time . <nl> + virtual bool checkFinalTx ( const CTransaction & tx ) = 0 ; <nl> + <nl> + / / ! Add transaction to memory pool if the transaction fee is below the <nl> + / / ! amount specified by absurd_fee ( as a safeguard ) . * / <nl> + virtual bool submitToMemoryPool ( CTransactionRef tx , CAmount absurd_fee , CValidationState & state ) = 0 ; <nl> } ; <nl> <nl> / / ! Return Lock interface . Chain is locked when this is called , and <nl> class Chain <nl> / / ! Estimate fraction of total transactions verified if blocks up to <nl> / / ! the specified block hash are verified . <nl> virtual double guessVerificationProgress ( const uint256 & block_hash ) = 0 ; <nl> + <nl> + / / ! Check if transaction is RBF opt in . <nl> + virtual RBFTransactionState isRBFOptIn ( const CTransaction & tx ) = 0 ; <nl> + <nl> + / / ! Check if transaction has descendants in mempool . <nl> + virtual bool hasDescendantsInMempool ( const uint256 & txid ) = 0 ; <nl> + <nl> + / / ! Relay transaction . <nl> + virtual void relayTransaction ( const uint256 & txid ) = 0 ; <nl> + <nl> + / / ! Calculate mempool ancestor and descendant counts for the given transaction . <nl> + virtual void getTransactionAncestry ( const uint256 & txid , size_t & ancestors , size_t & descendants ) = 0 ; <nl> + <nl> + / / ! Check chain limits . <nl> + virtual bool checkChainLimits ( CTransactionRef tx ) = 0 ; <nl> + <nl> + / / ! Estimate smart fee . <nl> + virtual CFeeRate estimateSmartFee ( int num_blocks , bool conservative , FeeCalculation * calc = nullptr ) = 0 ; <nl> + <nl> + / / ! Fee estimator max target . <nl> + virtual unsigned int estimateMaxBlocks ( ) = 0 ; <nl> + <nl> + / / ! Pool min fee . <nl> + virtual CFeeRate mempoolMinFee ( ) = 0 ; <nl> + <nl> + / / ! Get node max tx fee setting ( - maxtxfee ) . <nl> + / / ! This could be replaced by a per - wallet max fee , as proposed at <nl> + / / ! https : / / github . com / bitcoin / bitcoin / issues / 15355 <nl> + / / ! But for the time being , wallets call this to access the node setting . <nl> + virtual CAmount maxTxFee ( ) = 0 ; <nl> + <nl> + / / ! Check if pruning is enabled . <nl> + virtual bool getPruneMode ( ) = 0 ; <nl> + <nl> + / / ! Check if p2p enabled . <nl> + virtual bool p2pEnabled ( ) = 0 ; <nl> + <nl> + / / Check if in IBD . <nl> + virtual bool isInitialBlockDownload ( ) = 0 ; <nl> + <nl> + / / ! Get adjusted time . <nl> + virtual int64_t getAdjustedTime ( ) = 0 ; <nl> + <nl> + / / ! Send init message . <nl> + virtual void initMessage ( const std : : string & message ) = 0 ; <nl> + <nl> + / / ! Send init warning . <nl> + virtual void initWarning ( const std : : string & message ) = 0 ; <nl> + <nl> + / / ! Send init error . <nl> + virtual void initError ( const std : : string & message ) = 0 ; <nl> + <nl> + / / ! Send wallet load notification to the GUI . <nl> + virtual void loadWallet ( std : : unique_ptr < Wallet > wallet ) = 0 ; <nl> } ; <nl> <nl> / / ! Interface to let node manage chain clients ( wallets , or maybe tools for <nl> mmm a / src / interfaces / node . cpp <nl> ppp b / src / interfaces / node . cpp <nl> class NodeImpl : public Node <nl> } <nl> std : : unique_ptr < Handler > handleLoadWallet ( LoadWalletFn fn ) override <nl> { <nl> - return MakeHandler ( : : uiInterface . LoadWallet_connect ( [ fn ] ( std : : shared_ptr < CWallet > wallet ) { fn ( MakeWallet ( wallet ) ) ; } ) ) ; <nl> + return MakeHandler ( : : uiInterface . LoadWallet_connect ( [ fn ] ( std : : unique_ptr < Wallet > & wallet ) { fn ( std : : move ( wallet ) ) ; } ) ) ; <nl> } <nl> std : : unique_ptr < Handler > handleNotifyNumConnectionsChanged ( NotifyNumConnectionsChangedFn fn ) override <nl> { <nl> mmm a / src / interfaces / wallet . cpp <nl> ppp b / src / interfaces / wallet . cpp <nl> class PendingWalletTxImpl : public PendingWalletTx <nl> auto locked_chain = m_wallet . chain ( ) . lock ( ) ; <nl> LOCK ( m_wallet . cs_wallet ) ; <nl> CValidationState state ; <nl> - if ( ! m_wallet . CommitTransaction ( m_tx , std : : move ( value_map ) , std : : move ( order_form ) , m_key , g_connman . get ( ) , state ) ) { <nl> + if ( ! m_wallet . CommitTransaction ( m_tx , std : : move ( value_map ) , std : : move ( order_form ) , m_key , state ) ) { <nl> reject_reason = state . GetRejectReason ( ) ; <nl> return false ; <nl> } <nl> WalletTx MakeWalletTx ( interfaces : : Chain : : Lock & locked_chain , CWallet & wallet , co <nl> / / ! Construct wallet tx status struct . <nl> WalletTxStatus MakeWalletTxStatus ( interfaces : : Chain : : Lock & locked_chain , const CWalletTx & wtx ) <nl> { <nl> - LockAnnotation lock ( : : cs_main ) ; / / Temporary , for CheckFinalTx below . Removed in upcoming commit . <nl> + LockAnnotation lock ( : : cs_main ) ; / / Temporary , for mapBlockIndex below . Removed in upcoming commit . <nl> <nl> WalletTxStatus result ; <nl> auto mi = : : mapBlockIndex . find ( wtx . hashBlock ) ; <nl> WalletTxStatus MakeWalletTxStatus ( interfaces : : Chain : : Lock & locked_chain , const C <nl> result . depth_in_main_chain = wtx . GetDepthInMainChain ( locked_chain ) ; <nl> result . time_received = wtx . nTimeReceived ; <nl> result . lock_time = wtx . tx - > nLockTime ; <nl> - result . is_final = CheckFinalTx ( * wtx . tx ) ; <nl> + result . is_final = locked_chain . checkFinalTx ( * wtx . tx ) ; <nl> result . is_trusted = wtx . IsTrusted ( locked_chain ) ; <nl> result . is_abandoned = wtx . isAbandoned ( ) ; <nl> result . is_coinbase = wtx . IsCoinBase ( ) ; <nl> class WalletImpl : public Wallet <nl> { <nl> FeeCalculation fee_calc ; <nl> CAmount result ; <nl> - result = GetMinimumFee ( * m_wallet , tx_bytes , coin_control , : : mempool , : : feeEstimator , & fee_calc ) ; <nl> + result = GetMinimumFee ( * m_wallet , tx_bytes , coin_control , & fee_calc ) ; <nl> if ( returned_target ) * returned_target = fee_calc . returnedTarget ; <nl> if ( reason ) * reason = fee_calc . reason ; <nl> return result ; <nl> mmm a / src / rpc / mining . cpp <nl> ppp b / src / rpc / mining . cpp <nl> static UniValue estimatesmartfee ( const JSONRPCRequest & request ) <nl> <nl> RPCTypeCheck ( request . params , { UniValue : : VNUM , UniValue : : VSTR } ) ; <nl> RPCTypeCheckArgument ( request . params [ 0 ] , UniValue : : VNUM ) ; <nl> - unsigned int conf_target = ParseConfirmTarget ( request . params [ 0 ] ) ; <nl> + unsigned int max_target = : : feeEstimator . HighestTargetTracked ( FeeEstimateHorizon : : LONG_HALFLIFE ) ; <nl> + unsigned int conf_target = ParseConfirmTarget ( request . params [ 0 ] , max_target ) ; <nl> bool conservative = true ; <nl> if ( ! request . params [ 1 ] . isNull ( ) ) { <nl> FeeEstimateMode fee_mode ; <nl> static UniValue estimaterawfee ( const JSONRPCRequest & request ) <nl> <nl> RPCTypeCheck ( request . params , { UniValue : : VNUM , UniValue : : VNUM } , true ) ; <nl> RPCTypeCheckArgument ( request . params [ 0 ] , UniValue : : VNUM ) ; <nl> - unsigned int conf_target = ParseConfirmTarget ( request . params [ 0 ] ) ; <nl> + unsigned int max_target = : : feeEstimator . HighestTargetTracked ( FeeEstimateHorizon : : LONG_HALFLIFE ) ; <nl> + unsigned int conf_target = ParseConfirmTarget ( request . params [ 0 ] , max_target ) ; <nl> double threshold = 0 . 95 ; <nl> if ( ! request . params [ 1 ] . isNull ( ) ) { <nl> threshold = request . params [ 1 ] . get_real ( ) ; <nl> mmm a / src / rpc / util . cpp <nl> ppp b / src / rpc / util . cpp <nl> <nl> <nl> # include < key_io . h > <nl> # include < keystore . h > <nl> - # include < policy / fees . h > <nl> # include < rpc / util . h > <nl> # include < tinyformat . h > <nl> # include < util / strencodings . h > <nl> - # include < validation . h > <nl> <nl> InitInterfaces * g_rpc_interfaces = nullptr ; <nl> <nl> UniValue DescribeAddress ( const CTxDestination & dest ) <nl> return boost : : apply_visitor ( DescribeAddressVisitor ( ) , dest ) ; <nl> } <nl> <nl> - unsigned int ParseConfirmTarget ( const UniValue & value ) <nl> + unsigned int ParseConfirmTarget ( const UniValue & value , unsigned int max_target ) <nl> { <nl> int target = value . get_int ( ) ; <nl> - unsigned int max_target = : : feeEstimator . HighestTargetTracked ( FeeEstimateHorizon : : LONG_HALFLIFE ) ; <nl> if ( target < 1 | | ( unsigned int ) target > max_target ) { <nl> throw JSONRPCError ( RPC_INVALID_PARAMETER , strprintf ( " Invalid conf_target , must be between % u - % u " , 1 , max_target ) ) ; <nl> } <nl> mmm a / src / rpc / util . h <nl> ppp b / src / rpc / util . h <nl> CScript CreateMultisigRedeemscript ( const int required , const std : : vector < CPubKey <nl> UniValue DescribeAddress ( const CTxDestination & dest ) ; <nl> <nl> / / ! Parse a confirm target option and raise an RPC error if it is invalid . <nl> - unsigned int ParseConfirmTarget ( const UniValue & value ) ; <nl> + unsigned int ParseConfirmTarget ( const UniValue & value , unsigned int max_target ) ; <nl> <nl> RPCErrorCode RPCErrorFromTransactionError ( TransactionError terr ) ; <nl> UniValue JSONRPCTransactionError ( TransactionError terr , const std : : string & err_string = " " ) ; <nl> mmm a / src / ui_interface . cpp <nl> ppp b / src / ui_interface . cpp <nl> void CClientUIInterface : : InitMessage ( const std : : string & message ) { return g_ui_s <nl> void CClientUIInterface : : NotifyNumConnectionsChanged ( int newNumConnections ) { return g_ui_signals . NotifyNumConnectionsChanged ( newNumConnections ) ; } <nl> void CClientUIInterface : : NotifyNetworkActiveChanged ( bool networkActive ) { return g_ui_signals . NotifyNetworkActiveChanged ( networkActive ) ; } <nl> void CClientUIInterface : : NotifyAlertChanged ( ) { return g_ui_signals . NotifyAlertChanged ( ) ; } <nl> - void CClientUIInterface : : LoadWallet ( std : : shared_ptr < CWallet > wallet ) { return g_ui_signals . LoadWallet ( wallet ) ; } <nl> + void CClientUIInterface : : LoadWallet ( std : : unique_ptr < interfaces : : Wallet > & wallet ) { return g_ui_signals . LoadWallet ( wallet ) ; } <nl> void CClientUIInterface : : ShowProgress ( const std : : string & title , int nProgress , bool resume_possible ) { return g_ui_signals . ShowProgress ( title , nProgress , resume_possible ) ; } <nl> void CClientUIInterface : : NotifyBlockTip ( bool b , const CBlockIndex * i ) { return g_ui_signals . NotifyBlockTip ( b , i ) ; } <nl> void CClientUIInterface : : NotifyHeaderTip ( bool b , const CBlockIndex * i ) { return g_ui_signals . NotifyHeaderTip ( b , i ) ; } <nl> mmm a / src / ui_interface . h <nl> ppp b / src / ui_interface . h <nl> <nl> # include < stdint . h > <nl> # include < string > <nl> <nl> - class CWallet ; <nl> class CBlockIndex ; <nl> namespace boost { <nl> namespace signals2 { <nl> class connection ; <nl> } <nl> } / / namespace boost <nl> <nl> + namespace interfaces { <nl> + class Wallet ; <nl> + } / / namespace interfaces <nl> + <nl> / * * General change type ( added , updated , removed ) . * / <nl> enum ChangeType <nl> { <nl> class CClientUIInterface <nl> ADD_SIGNALS_DECL_WRAPPER ( NotifyAlertChanged , void , ) ; <nl> <nl> / * * A wallet has been loaded . * / <nl> - ADD_SIGNALS_DECL_WRAPPER ( LoadWallet , void , std : : shared_ptr < CWallet > wallet ) ; <nl> + ADD_SIGNALS_DECL_WRAPPER ( LoadWallet , void , std : : unique_ptr < interfaces : : Wallet > & wallet ) ; <nl> <nl> / * * <nl> * Show progress e . g . for verifychain . <nl> mmm a / src / wallet / feebumper . cpp <nl> ppp b / src / wallet / feebumper . cpp <nl> static feebumper : : Result PreconditionChecks ( interfaces : : Chain : : Lock & locked_chai <nl> } <nl> <nl> { <nl> - LOCK ( mempool . cs ) ; <nl> - auto it_mp = mempool . mapTx . find ( wtx . GetHash ( ) ) ; <nl> - if ( it_mp ! = mempool . mapTx . end ( ) & & it_mp - > GetCountWithDescendants ( ) > 1 ) { <nl> + if ( wallet - > chain ( ) . hasDescendantsInMempool ( wtx . GetHash ( ) ) ) { <nl> errors . push_back ( " Transaction has descendants in the mempool " ) ; <nl> return feebumper : : Result : : INVALID_PARAMETER ; <nl> } <nl> Result CreateTransaction ( const CWallet * wallet , const uint256 & txid , const CCoin <nl> new_fee = total_fee ; <nl> nNewFeeRate = CFeeRate ( total_fee , maxNewTxSize ) ; <nl> } else { <nl> - new_fee = GetMinimumFee ( * wallet , maxNewTxSize , coin_control , mempool , : : feeEstimator , nullptr / * FeeCalculation * / ) ; <nl> + new_fee = GetMinimumFee ( * wallet , maxNewTxSize , coin_control , nullptr / * FeeCalculation * / ) ; <nl> nNewFeeRate = CFeeRate ( new_fee , maxNewTxSize ) ; <nl> <nl> / / New fee rate must be at least old rate + minimum incremental relay rate <nl> Result CreateTransaction ( const CWallet * wallet , const uint256 & txid , const CCoin <nl> <nl> / / If the output would become dust , discard it ( converting the dust to fee ) <nl> poutput - > nValue - = nDelta ; <nl> - if ( poutput - > nValue < = GetDustThreshold ( * poutput , GetDiscardRate ( * wallet , : : feeEstimator ) ) ) { <nl> + if ( poutput - > nValue < = GetDustThreshold ( * poutput , GetDiscardRate ( * wallet ) ) ) { <nl> wallet - > WalletLogPrintf ( " Bumping fee and discarding dust output \ n " ) ; <nl> new_fee + = poutput - > nValue ; <nl> mtx . vout . erase ( mtx . vout . begin ( ) + nOutput ) ; <nl> Result CommitTransaction ( CWallet * wallet , const uint256 & txid , CMutableTransacti <nl> <nl> CReserveKey reservekey ( wallet ) ; <nl> CValidationState state ; <nl> - if ( ! wallet - > CommitTransaction ( tx , std : : move ( mapValue ) , oldWtx . vOrderForm , reservekey , g_connman . get ( ) , state ) ) { <nl> + if ( ! wallet - > CommitTransaction ( tx , std : : move ( mapValue ) , oldWtx . vOrderForm , reservekey , state ) ) { <nl> / / NOTE : CommitTransaction never returns false , so this should never happen . <nl> errors . push_back ( strprintf ( " The transaction was rejected : % s " , FormatStateMessage ( state ) ) ) ; <nl> return Result : : WALLET_ERROR ; <nl> mmm a / src / wallet / fees . cpp <nl> ppp b / src / wallet / fees . cpp <nl> <nl> # include < wallet / fees . h > <nl> <nl> # include < policy / policy . h > <nl> - # include < txmempool . h > <nl> # include < util / system . h > <nl> # include < validation . h > <nl> # include < wallet / coincontrol . h > <nl> CAmount GetRequiredFee ( const CWallet & wallet , unsigned int nTxBytes ) <nl> } <nl> <nl> <nl> - CAmount GetMinimumFee ( const CWallet & wallet , unsigned int nTxBytes , const CCoinControl & coin_control , const CTxMemPool & pool , const CBlockPolicyEstimator & estimator , FeeCalculation * feeCalc ) <nl> + CAmount GetMinimumFee ( const CWallet & wallet , unsigned int nTxBytes , const CCoinControl & coin_control , FeeCalculation * feeCalc ) <nl> { <nl> - CAmount fee_needed = GetMinimumFeeRate ( wallet , coin_control , pool , estimator , feeCalc ) . GetFee ( nTxBytes ) ; <nl> + CAmount fee_needed = GetMinimumFeeRate ( wallet , coin_control , feeCalc ) . GetFee ( nTxBytes ) ; <nl> / / Always obey the maximum <nl> if ( fee_needed > maxTxFee ) { <nl> fee_needed = maxTxFee ; <nl> CFeeRate GetRequiredFeeRate ( const CWallet & wallet ) <nl> return std : : max ( wallet . m_min_fee , : : minRelayTxFee ) ; <nl> } <nl> <nl> - CFeeRate GetMinimumFeeRate ( const CWallet & wallet , const CCoinControl & coin_control , const CTxMemPool & pool , const CBlockPolicyEstimator & estimator , FeeCalculation * feeCalc ) <nl> + CFeeRate GetMinimumFeeRate ( const CWallet & wallet , const CCoinControl & coin_control , FeeCalculation * feeCalc ) <nl> { <nl> / * User control of how to calculate fee uses the following parameter precedence : <nl> 1 . coin_control . m_feerate <nl> CFeeRate GetMinimumFeeRate ( const CWallet & wallet , const CCoinControl & coin_contr <nl> if ( coin_control . m_fee_mode = = FeeEstimateMode : : CONSERVATIVE ) conservative_estimate = true ; <nl> else if ( coin_control . m_fee_mode = = FeeEstimateMode : : ECONOMICAL ) conservative_estimate = false ; <nl> <nl> - feerate_needed = estimator . estimateSmartFee ( target , feeCalc , conservative_estimate ) ; <nl> + feerate_needed = wallet . chain ( ) . estimateSmartFee ( target , conservative_estimate , feeCalc ) ; <nl> if ( feerate_needed = = CFeeRate ( 0 ) ) { <nl> / / if we don ' t have enough data for estimateSmartFee , then use fallback fee <nl> feerate_needed = wallet . m_fallback_fee ; <nl> CFeeRate GetMinimumFeeRate ( const CWallet & wallet , const CCoinControl & coin_contr <nl> if ( wallet . m_fallback_fee = = CFeeRate ( 0 ) ) return feerate_needed ; <nl> } <nl> / / Obey mempool min fee when using smart fee estimation <nl> - CFeeRate min_mempool_feerate = pool . GetMinFee ( gArgs . GetArg ( " - maxmempool " , DEFAULT_MAX_MEMPOOL_SIZE ) * 1000000 ) ; <nl> + CFeeRate min_mempool_feerate = wallet . chain ( ) . mempoolMinFee ( ) ; <nl> if ( feerate_needed < min_mempool_feerate ) { <nl> feerate_needed = min_mempool_feerate ; <nl> if ( feeCalc ) feeCalc - > reason = FeeReason : : MEMPOOL_MIN ; <nl> CFeeRate GetMinimumFeeRate ( const CWallet & wallet , const CCoinControl & coin_contr <nl> return feerate_needed ; <nl> } <nl> <nl> - CFeeRate GetDiscardRate ( const CWallet & wallet , const CBlockPolicyEstimator & estimator ) <nl> + CFeeRate GetDiscardRate ( const CWallet & wallet ) <nl> { <nl> - unsigned int highest_target = estimator . HighestTargetTracked ( FeeEstimateHorizon : : LONG_HALFLIFE ) ; <nl> - CFeeRate discard_rate = estimator . estimateSmartFee ( highest_target , nullptr / * FeeCalculation * / , false / * conservative * / ) ; <nl> + unsigned int highest_target = wallet . chain ( ) . estimateMaxBlocks ( ) ; <nl> + CFeeRate discard_rate = wallet . chain ( ) . estimateSmartFee ( highest_target , false / * conservative * / ) ; <nl> / / Don ' t let discard_rate be greater than longest possible fee estimate if we get a valid fee estimate <nl> discard_rate = ( discard_rate = = CFeeRate ( 0 ) ) ? wallet . m_discard_rate : std : : min ( discard_rate , wallet . m_discard_rate ) ; <nl> / / Discard rate must be at least dustRelayFee <nl> mmm a / src / wallet / fees . h <nl> ppp b / src / wallet / fees . h <nl> <nl> <nl> # include < amount . h > <nl> <nl> - class CBlockPolicyEstimator ; <nl> class CCoinControl ; <nl> class CFeeRate ; <nl> - class CTxMemPool ; <nl> class CWallet ; <nl> struct FeeCalculation ; <nl> <nl> CAmount GetRequiredFee ( const CWallet & wallet , unsigned int nTxBytes ) ; <nl> * Estimate the minimum fee considering user set parameters <nl> * and the required fee <nl> * / <nl> - CAmount GetMinimumFee ( const CWallet & wallet , unsigned int nTxBytes , const CCoinControl & coin_control , const CTxMemPool & pool , const CBlockPolicyEstimator & estimator , FeeCalculation * feeCalc ) ; <nl> + CAmount GetMinimumFee ( const CWallet & wallet , unsigned int nTxBytes , const CCoinControl & coin_control , FeeCalculation * feeCalc ) ; <nl> <nl> / * * <nl> * Return the minimum required feerate taking into account the <nl> CFeeRate GetRequiredFeeRate ( const CWallet & wallet ) ; <nl> * Estimate the minimum fee rate considering user set parameters <nl> * and the required fee <nl> * / <nl> - CFeeRate GetMinimumFeeRate ( const CWallet & wallet , const CCoinControl & coin_control , const CTxMemPool & pool , const CBlockPolicyEstimator & estimator , FeeCalculation * feeCalc ) ; <nl> + CFeeRate GetMinimumFeeRate ( const CWallet & wallet , const CCoinControl & coin_control , FeeCalculation * feeCalc ) ; <nl> <nl> / * * <nl> * Return the maximum feerate for discarding change . <nl> * / <nl> - CFeeRate GetDiscardRate ( const CWallet & wallet , const CBlockPolicyEstimator & estimator ) ; <nl> + CFeeRate GetDiscardRate ( const CWallet & wallet ) ; <nl> <nl> # endif / / BITCOIN_WALLET_FEES_H <nl> mmm a / src / wallet / init . cpp <nl> ppp b / src / wallet / init . cpp <nl> bool VerifyWallets ( interfaces : : Chain & chain , const std : : vector < std : : string > & wal <nl> / / The canonical path cleans the path , preventing > 1 Berkeley environment instances for the same directory <nl> fs : : path canonical_wallet_dir = fs : : canonical ( wallet_dir , error ) ; <nl> if ( error | | ! fs : : exists ( wallet_dir ) ) { <nl> - return InitError ( strprintf ( _ ( " Specified - walletdir \ " % s \ " does not exist " ) , wallet_dir . string ( ) ) ) ; <nl> + chain . initError ( strprintf ( _ ( " Specified - walletdir \ " % s \ " does not exist " ) , wallet_dir . string ( ) ) ) ; <nl> + return false ; <nl> } else if ( ! fs : : is_directory ( wallet_dir ) ) { <nl> - return InitError ( strprintf ( _ ( " Specified - walletdir \ " % s \ " is not a directory " ) , wallet_dir . string ( ) ) ) ; <nl> + chain . initError ( strprintf ( _ ( " Specified - walletdir \ " % s \ " is not a directory " ) , wallet_dir . string ( ) ) ) ; <nl> + return false ; <nl> / / The canonical path transforms relative paths into absolute ones , so we check the non - canonical version <nl> } else if ( ! wallet_dir . is_absolute ( ) ) { <nl> - return InitError ( strprintf ( _ ( " Specified - walletdir \ " % s \ " is a relative path " ) , wallet_dir . string ( ) ) ) ; <nl> + chain . initError ( strprintf ( _ ( " Specified - walletdir \ " % s \ " is a relative path " ) , wallet_dir . string ( ) ) ) ; <nl> + return false ; <nl> } <nl> gArgs . ForceSetArg ( " - walletdir " , canonical_wallet_dir . string ( ) ) ; <nl> } <nl> bool VerifyWallets ( interfaces : : Chain & chain , const std : : vector < std : : string > & wal <nl> WalletLocation location ( wallet_file ) ; <nl> <nl> if ( ! wallet_paths . insert ( location . GetPath ( ) ) . second ) { <nl> - return InitError ( strprintf ( _ ( " Error loading wallet % s . Duplicate - wallet filename specified . " ) , wallet_file ) ) ; <nl> + chain . initError ( strprintf ( _ ( " Error loading wallet % s . Duplicate - wallet filename specified . " ) , wallet_file ) ) ; <nl> + return false ; <nl> } <nl> <nl> std : : string error_string ; <nl> std : : string warning_string ; <nl> bool verify_success = CWallet : : Verify ( chain , location , salvage_wallet , error_string , warning_string ) ; <nl> - if ( ! error_string . empty ( ) ) InitError ( error_string ) ; <nl> - if ( ! warning_string . empty ( ) ) InitWarning ( warning_string ) ; <nl> + if ( ! error_string . empty ( ) ) chain . initError ( error_string ) ; <nl> + if ( ! warning_string . empty ( ) ) chain . initWarning ( warning_string ) ; <nl> if ( ! verify_success ) return false ; <nl> } <nl> <nl> mmm a / src / wallet / rpcdump . cpp <nl> ppp b / src / wallet / rpcdump . cpp <nl> UniValue importprivkey ( const JSONRPCRequest & request ) <nl> if ( ! request . params [ 2 ] . isNull ( ) ) <nl> fRescan = request . params [ 2 ] . get_bool ( ) ; <nl> <nl> - if ( fRescan & & fPruneMode ) <nl> + if ( fRescan & & pwallet - > chain ( ) . getPruneMode ( ) ) { <nl> throw JSONRPCError ( RPC_WALLET_ERROR , " Rescan is disabled in pruned mode " ) ; <nl> + } <nl> <nl> if ( fRescan & & ! reserver . reserve ( ) ) { <nl> throw JSONRPCError ( RPC_WALLET_ERROR , " Wallet is currently rescanning . Abort existing rescan or wait . " ) ; <nl> UniValue importaddress ( const JSONRPCRequest & request ) <nl> if ( ! request . params [ 2 ] . isNull ( ) ) <nl> fRescan = request . params [ 2 ] . get_bool ( ) ; <nl> <nl> - if ( fRescan & & fPruneMode ) <nl> + if ( fRescan & & pwallet - > chain ( ) . getPruneMode ( ) ) { <nl> throw JSONRPCError ( RPC_WALLET_ERROR , " Rescan is disabled in pruned mode " ) ; <nl> + } <nl> <nl> WalletRescanReserver reserver ( pwallet ) ; <nl> if ( fRescan & & ! reserver . reserve ( ) ) { <nl> UniValue importpubkey ( const JSONRPCRequest & request ) <nl> if ( ! request . params [ 2 ] . isNull ( ) ) <nl> fRescan = request . params [ 2 ] . get_bool ( ) ; <nl> <nl> - if ( fRescan & & fPruneMode ) <nl> + if ( fRescan & & pwallet - > chain ( ) . getPruneMode ( ) ) { <nl> throw JSONRPCError ( RPC_WALLET_ERROR , " Rescan is disabled in pruned mode " ) ; <nl> + } <nl> <nl> WalletRescanReserver reserver ( pwallet ) ; <nl> if ( fRescan & & ! reserver . reserve ( ) ) { <nl> UniValue importwallet ( const JSONRPCRequest & request ) <nl> } , <nl> } . ToString ( ) ) ; <nl> <nl> - if ( fPruneMode ) <nl> + if ( pwallet - > chain ( ) . getPruneMode ( ) ) { <nl> throw JSONRPCError ( RPC_WALLET_ERROR , " Importing wallets is disabled in pruned mode " ) ; <nl> + } <nl> <nl> WalletRescanReserver reserver ( pwallet ) ; <nl> if ( ! reserver . reserve ( ) ) { <nl> mmm a / src / wallet / rpcwallet . cpp <nl> ppp b / src / wallet / rpcwallet . cpp <nl> static void WalletTxToJSON ( interfaces : : Chain & chain , interfaces : : Chain : : Lock & lo <nl> / / Add opt - in RBF status <nl> std : : string rbfStatus = " no " ; <nl> if ( confirms < = 0 ) { <nl> - LOCK ( mempool . cs ) ; <nl> - RBFTransactionState rbfState = IsRBFOptIn ( * wtx . tx , mempool ) ; <nl> + RBFTransactionState rbfState = chain . isRBFOptIn ( * wtx . tx ) ; <nl> if ( rbfState = = RBFTransactionState : : UNKNOWN ) <nl> rbfStatus = " unknown " ; <nl> else if ( rbfState = = RBFTransactionState : : REPLACEABLE_BIP125 ) <nl> static CTransactionRef SendMoney ( interfaces : : Chain : : Lock & locked_chain , CWallet <nl> if ( nValue > curBalance ) <nl> throw JSONRPCError ( RPC_WALLET_INSUFFICIENT_FUNDS , " Insufficient funds " ) ; <nl> <nl> - if ( pwallet - > GetBroadcastTransactions ( ) & & ! g_connman ) { <nl> + if ( pwallet - > GetBroadcastTransactions ( ) & & ! pwallet - > chain ( ) . p2pEnabled ( ) ) { <nl> throw JSONRPCError ( RPC_CLIENT_P2P_DISABLED , " Error : Peer - to - peer functionality missing or disabled " ) ; <nl> } <nl> <nl> static CTransactionRef SendMoney ( interfaces : : Chain : : Lock & locked_chain , CWallet <nl> throw JSONRPCError ( RPC_WALLET_ERROR , strError ) ; <nl> } <nl> CValidationState state ; <nl> - if ( ! pwallet - > CommitTransaction ( tx , std : : move ( mapValue ) , { } / * orderForm * / , reservekey , g_connman . get ( ) , state ) ) { <nl> + if ( ! pwallet - > CommitTransaction ( tx , std : : move ( mapValue ) , { } / * orderForm * / , reservekey , state ) ) { <nl> strError = strprintf ( " Error : The transaction was rejected ! Reason given : % s " , FormatStateMessage ( state ) ) ; <nl> throw JSONRPCError ( RPC_WALLET_ERROR , strError ) ; <nl> } <nl> static UniValue sendtoaddress ( const JSONRPCRequest & request ) <nl> } <nl> <nl> if ( ! request . params [ 6 ] . isNull ( ) ) { <nl> - coin_control . m_confirm_target = ParseConfirmTarget ( request . params [ 6 ] ) ; <nl> + coin_control . m_confirm_target = ParseConfirmTarget ( request . params [ 6 ] , pwallet - > chain ( ) . estimateMaxBlocks ( ) ) ; <nl> } <nl> <nl> if ( ! request . params [ 7 ] . isNull ( ) ) { <nl> static UniValue getreceivedbyaddress ( const JSONRPCRequest & request ) <nl> / / the user could have gotten from another RPC command prior to now <nl> pwallet - > BlockUntilSyncedToCurrentChain ( ) ; <nl> <nl> - LockAnnotation lock ( : : cs_main ) ; / / Temporary , for CheckFinalTx below . Removed in upcoming commit . <nl> auto locked_chain = pwallet - > chain ( ) . lock ( ) ; <nl> LOCK ( pwallet - > cs_wallet ) ; <nl> <nl> static UniValue getreceivedbyaddress ( const JSONRPCRequest & request ) <nl> CAmount nAmount = 0 ; <nl> for ( const std : : pair < const uint256 , CWalletTx > & pairWtx : pwallet - > mapWallet ) { <nl> const CWalletTx & wtx = pairWtx . second ; <nl> - if ( wtx . IsCoinBase ( ) | | ! CheckFinalTx ( * wtx . tx ) ) <nl> + if ( wtx . IsCoinBase ( ) | | ! locked_chain - > checkFinalTx ( * wtx . tx ) ) { <nl> continue ; <nl> + } <nl> <nl> for ( const CTxOut & txout : wtx . tx - > vout ) <nl> if ( txout . scriptPubKey = = scriptPubKey ) <nl> static UniValue getreceivedbylabel ( const JSONRPCRequest & request ) <nl> / / the user could have gotten from another RPC command prior to now <nl> pwallet - > BlockUntilSyncedToCurrentChain ( ) ; <nl> <nl> - LockAnnotation lock ( : : cs_main ) ; / / Temporary , for CheckFinalTx below . Removed in upcoming commit . <nl> auto locked_chain = pwallet - > chain ( ) . lock ( ) ; <nl> LOCK ( pwallet - > cs_wallet ) ; <nl> <nl> static UniValue getreceivedbylabel ( const JSONRPCRequest & request ) <nl> CAmount nAmount = 0 ; <nl> for ( const std : : pair < const uint256 , CWalletTx > & pairWtx : pwallet - > mapWallet ) { <nl> const CWalletTx & wtx = pairWtx . second ; <nl> - if ( wtx . IsCoinBase ( ) | | ! CheckFinalTx ( * wtx . tx ) ) <nl> + if ( wtx . IsCoinBase ( ) | | ! locked_chain - > checkFinalTx ( * wtx . tx ) ) { <nl> continue ; <nl> + } <nl> <nl> for ( const CTxOut & txout : wtx . tx - > vout ) <nl> { <nl> static UniValue sendmany ( const JSONRPCRequest & request ) <nl> auto locked_chain = pwallet - > chain ( ) . lock ( ) ; <nl> LOCK ( pwallet - > cs_wallet ) ; <nl> <nl> - if ( pwallet - > GetBroadcastTransactions ( ) & & ! g_connman ) { <nl> + if ( pwallet - > GetBroadcastTransactions ( ) & & ! pwallet - > chain ( ) . p2pEnabled ( ) ) { <nl> throw JSONRPCError ( RPC_CLIENT_P2P_DISABLED , " Error : Peer - to - peer functionality missing or disabled " ) ; <nl> } <nl> <nl> static UniValue sendmany ( const JSONRPCRequest & request ) <nl> } <nl> <nl> if ( ! request . params [ 6 ] . isNull ( ) ) { <nl> - coin_control . m_confirm_target = ParseConfirmTarget ( request . params [ 6 ] ) ; <nl> + coin_control . m_confirm_target = ParseConfirmTarget ( request . params [ 6 ] , pwallet - > chain ( ) . estimateMaxBlocks ( ) ) ; <nl> } <nl> <nl> if ( ! request . params [ 7 ] . isNull ( ) ) { <nl> static UniValue sendmany ( const JSONRPCRequest & request ) <nl> if ( ! fCreated ) <nl> throw JSONRPCError ( RPC_WALLET_INSUFFICIENT_FUNDS , strFailReason ) ; <nl> CValidationState state ; <nl> - if ( ! pwallet - > CommitTransaction ( tx , std : : move ( mapValue ) , { } / * orderForm * / , keyChange , g_connman . get ( ) , state ) ) { <nl> + if ( ! pwallet - > CommitTransaction ( tx , std : : move ( mapValue ) , { } / * orderForm * / , keyChange , state ) ) { <nl> strFailReason = strprintf ( " Transaction commit failed : : % s " , FormatStateMessage ( state ) ) ; <nl> throw JSONRPCError ( RPC_WALLET_ERROR , strFailReason ) ; <nl> } <nl> struct tallyitem <nl> <nl> static UniValue ListReceived ( interfaces : : Chain : : Lock & locked_chain , CWallet * const pwallet , const UniValue & params , bool by_label ) EXCLUSIVE_LOCKS_REQUIRED ( pwallet - > cs_wallet ) <nl> { <nl> - LockAnnotation lock ( : : cs_main ) ; / / Temporary , for CheckFinalTx below . Removed in upcoming commit . <nl> - <nl> / / Minimum confirmations <nl> int nMinDepth = 1 ; <nl> if ( ! params [ 0 ] . isNull ( ) ) <nl> static UniValue ListReceived ( interfaces : : Chain : : Lock & locked_chain , CWallet * co <nl> for ( const std : : pair < const uint256 , CWalletTx > & pairWtx : pwallet - > mapWallet ) { <nl> const CWalletTx & wtx = pairWtx . second ; <nl> <nl> - if ( wtx . IsCoinBase ( ) | | ! CheckFinalTx ( * wtx . tx ) ) <nl> + if ( wtx . IsCoinBase ( ) | | ! locked_chain . checkFinalTx ( * wtx . tx ) ) { <nl> continue ; <nl> + } <nl> <nl> int nDepth = wtx . GetDepthInMainChain ( locked_chain ) ; <nl> if ( nDepth < nMinDepth ) <nl> static UniValue resendwallettransactions ( const JSONRPCRequest & request ) <nl> } . ToString ( ) <nl> ) ; <nl> <nl> - if ( ! g_connman ) <nl> + if ( ! pwallet - > chain ( ) . p2pEnabled ( ) ) { <nl> throw JSONRPCError ( RPC_CLIENT_P2P_DISABLED , " Error : Peer - to - peer functionality missing or disabled " ) ; <nl> + } <nl> <nl> auto locked_chain = pwallet - > chain ( ) . lock ( ) ; <nl> LOCK ( pwallet - > cs_wallet ) ; <nl> static UniValue resendwallettransactions ( const JSONRPCRequest & request ) <nl> throw JSONRPCError ( RPC_WALLET_ERROR , " Error : Wallet transaction broadcasting is disabled with - walletbroadcast " ) ; <nl> } <nl> <nl> - std : : vector < uint256 > txids = pwallet - > ResendWalletTransactionsBefore ( * locked_chain , GetTime ( ) , g_connman . get ( ) ) ; <nl> + std : : vector < uint256 > txids = pwallet - > ResendWalletTransactionsBefore ( * locked_chain , GetTime ( ) ) ; <nl> UniValue result ( UniValue : : VARR ) ; <nl> for ( const uint256 & txid : txids ) <nl> { <nl> void FundTransaction ( CWallet * const pwallet , CMutableTransaction & tx , CAmount & f <nl> if ( options . exists ( " feeRate " ) ) { <nl> throw JSONRPCError ( RPC_INVALID_PARAMETER , " Cannot specify both conf_target and feeRate " ) ; <nl> } <nl> - coinControl . m_confirm_target = ParseConfirmTarget ( options [ " conf_target " ] ) ; <nl> + coinControl . m_confirm_target = ParseConfirmTarget ( options [ " conf_target " ] , pwallet - > chain ( ) . estimateMaxBlocks ( ) ) ; <nl> } <nl> if ( options . exists ( " estimate_mode " ) ) { <nl> if ( options . exists ( " feeRate " ) ) { <nl> static UniValue bumpfee ( const JSONRPCRequest & request ) <nl> if ( options . exists ( " confTarget " ) & & options . exists ( " totalFee " ) ) { <nl> throw JSONRPCError ( RPC_INVALID_PARAMETER , " confTarget and totalFee options should not both be set . Please provide either a confirmation target for fee estimation or an explicit total fee for the transaction . " ) ; <nl> } else if ( options . exists ( " confTarget " ) ) { / / TODO : alias this to conf_target <nl> - coin_control . m_confirm_target = ParseConfirmTarget ( options [ " confTarget " ] ) ; <nl> + coin_control . m_confirm_target = ParseConfirmTarget ( options [ " confTarget " ] , pwallet - > chain ( ) . estimateMaxBlocks ( ) ) ; <nl> } else if ( options . exists ( " totalFee " ) ) { <nl> totalFee = options [ " totalFee " ] . get_int64 ( ) ; <nl> if ( totalFee < = 0 ) { <nl> UniValue sethdseed ( const JSONRPCRequest & request ) <nl> } . ToString ( ) ) ; <nl> } <nl> <nl> - if ( IsInitialBlockDownload ( ) ) { <nl> + if ( pwallet - > chain ( ) . isInitialBlockDownload ( ) ) { <nl> throw JSONRPCError ( RPC_CLIENT_IN_INITIAL_DOWNLOAD , " Cannot set a new HD seed while still in Initial Block Download " ) ; <nl> } <nl> <nl> mmm a / src / wallet / test / wallet_tests . cpp <nl> ppp b / src / wallet / test / wallet_tests . cpp <nl> class ListCoinsTestingSetup : public TestChain100Setup <nl> CCoinControl dummy ; <nl> BOOST_CHECK ( wallet - > CreateTransaction ( * m_locked_chain , { recipient } , tx , reservekey , fee , changePos , error , dummy ) ) ; <nl> CValidationState state ; <nl> - BOOST_CHECK ( wallet - > CommitTransaction ( tx , { } , { } , reservekey , nullptr , state ) ) ; <nl> + BOOST_CHECK ( wallet - > CommitTransaction ( tx , { } , { } , reservekey , state ) ) ; <nl> CMutableTransaction blocktx ; <nl> { <nl> LOCK ( wallet - > cs_wallet ) ; <nl> mmm a / src / wallet / wallet . cpp <nl> ppp b / src / wallet / wallet . cpp <nl> <nl> # include < consensus / validation . h > <nl> # include < fs . h > <nl> # include < interfaces / chain . h > <nl> + # include < interfaces / wallet . h > <nl> # include < key . h > <nl> # include < key_io . h > <nl> # include < keystore . h > <nl> bool CWallet : : AddToWallet ( const CWalletTx & wtxIn , bool fFlushOnClose ) <nl> wtx . BindWallet ( this ) ; <nl> bool fInsertedNew = ret . second ; <nl> if ( fInsertedNew ) { <nl> - wtx . nTimeReceived = GetAdjustedTime ( ) ; <nl> + wtx . nTimeReceived = chain ( ) . getAdjustedTime ( ) ; <nl> wtx . nOrderPos = IncOrderPosNext ( & batch ) ; <nl> wtx . m_it_wtxOrdered = wtxOrdered . insert ( std : : make_pair ( wtx . nOrderPos , & wtx ) ) ; <nl> wtx . nTimeSmart = ComputeTimeSmart ( wtx ) ; <nl> void CWallet : : ReacceptWalletTransactions ( ) <nl> for ( const std : : pair < const int64_t , CWalletTx * > & item : mapSorted ) { <nl> CWalletTx & wtx = * ( item . second ) ; <nl> CValidationState state ; <nl> - wtx . AcceptToMemoryPool ( * locked_chain , maxTxFee , state ) ; <nl> + wtx . AcceptToMemoryPool ( * locked_chain , state ) ; <nl> } <nl> } <nl> <nl> - bool CWalletTx : : RelayWalletTransaction ( interfaces : : Chain : : Lock & locked_chain , CConnman * connman ) <nl> + bool CWalletTx : : RelayWalletTransaction ( interfaces : : Chain : : Lock & locked_chain ) <nl> { <nl> assert ( pwallet - > GetBroadcastTransactions ( ) ) ; <nl> if ( ! IsCoinBase ( ) & & ! isAbandoned ( ) & & GetDepthInMainChain ( locked_chain ) = = 0 ) <nl> { <nl> CValidationState state ; <nl> / * GetDepthInMainChain already catches known conflicts . * / <nl> - if ( InMempool ( ) | | AcceptToMemoryPool ( locked_chain , maxTxFee , state ) ) { <nl> + if ( InMempool ( ) | | AcceptToMemoryPool ( locked_chain , state ) ) { <nl> pwallet - > WalletLogPrintf ( " Relaying wtx % s \ n " , GetHash ( ) . ToString ( ) ) ; <nl> - if ( connman ) { <nl> - CInv inv ( MSG_TX , GetHash ( ) ) ; <nl> - connman - > ForEachNode ( [ & inv ] ( CNode * pnode ) <nl> - { <nl> - pnode - > PushInventory ( inv ) ; <nl> - } ) ; <nl> + if ( pwallet - > chain ( ) . p2pEnabled ( ) ) { <nl> + pwallet - > chain ( ) . relayTransaction ( GetHash ( ) ) ; <nl> return true ; <nl> } <nl> } <nl> bool CWalletTx : : InMempool ( ) const <nl> <nl> bool CWalletTx : : IsTrusted ( interfaces : : Chain : : Lock & locked_chain ) const <nl> { <nl> - LockAnnotation lock ( : : cs_main ) ; / / Temporary , for CheckFinalTx below . Removed in upcoming commit . <nl> - <nl> / / Quick answer in most cases <nl> - if ( ! CheckFinalTx ( * tx ) ) <nl> + if ( ! locked_chain . checkFinalTx ( * tx ) ) { <nl> return false ; <nl> + } <nl> int nDepth = GetDepthInMainChain ( locked_chain ) ; <nl> if ( nDepth > = 1 ) <nl> return true ; <nl> bool CWalletTx : : IsEquivalentTo ( const CWalletTx & _tx ) const <nl> return CTransaction ( tx1 ) = = CTransaction ( tx2 ) ; <nl> } <nl> <nl> - std : : vector < uint256 > CWallet : : ResendWalletTransactionsBefore ( interfaces : : Chain : : Lock & locked_chain , int64_t nTime , CConnman * connman ) <nl> + std : : vector < uint256 > CWallet : : ResendWalletTransactionsBefore ( interfaces : : Chain : : Lock & locked_chain , int64_t nTime ) <nl> { <nl> std : : vector < uint256 > result ; <nl> <nl> std : : vector < uint256 > CWallet : : ResendWalletTransactionsBefore ( interfaces : : Chain : : <nl> for ( const std : : pair < const unsigned int , CWalletTx * > & item : mapSorted ) <nl> { <nl> CWalletTx & wtx = * item . second ; <nl> - if ( wtx . RelayWalletTransaction ( locked_chain , connman ) ) <nl> + if ( wtx . RelayWalletTransaction ( locked_chain ) ) { <nl> result . push_back ( wtx . GetHash ( ) ) ; <nl> + } <nl> } <nl> return result ; <nl> } <nl> void CWallet : : ResendWalletTransactions ( int64_t nBestBlockTime , CConnman * connman <nl> / / Rebroadcast unconfirmed txes older than 5 minutes before the last <nl> / / block was found : <nl> auto locked_chain = chain ( ) . assumeLocked ( ) ; / / Temporary . Removed in upcoming lock cleanup <nl> - std : : vector < uint256 > relayed = ResendWalletTransactionsBefore ( * locked_chain , nBestBlockTime - 5 * 60 , connman ) ; <nl> + std : : vector < uint256 > relayed = ResendWalletTransactionsBefore ( * locked_chain , nBestBlockTime - 5 * 60 ) ; <nl> if ( ! relayed . empty ( ) ) <nl> WalletLogPrintf ( " % s : rebroadcast % u unconfirmed transactions \ n " , __func__ , relayed . size ( ) ) ; <nl> } <nl> CAmount CWallet : : GetImmatureWatchOnlyBalance ( ) const <nl> / / trusted . <nl> CAmount CWallet : : GetLegacyBalance ( const isminefilter & filter , int minDepth ) const <nl> { <nl> - LockAnnotation lock ( : : cs_main ) ; / / Temporary , for CheckFinalTx below . Removed in upcoming commit . <nl> auto locked_chain = chain ( ) . lock ( ) ; <nl> LOCK ( cs_wallet ) ; <nl> <nl> CAmount CWallet : : GetLegacyBalance ( const isminefilter & filter , int minDepth ) cons <nl> for ( const auto & entry : mapWallet ) { <nl> const CWalletTx & wtx = entry . second ; <nl> const int depth = wtx . GetDepthInMainChain ( * locked_chain ) ; <nl> - if ( depth < 0 | | ! CheckFinalTx ( * wtx . tx ) | | wtx . IsImmatureCoinBase ( * locked_chain ) ) { <nl> + if ( depth < 0 | | ! locked_chain - > checkFinalTx ( * wtx . tx ) | | wtx . IsImmatureCoinBase ( * locked_chain ) ) { <nl> continue ; <nl> } <nl> <nl> void CWallet : : AvailableCoins ( interfaces : : Chain : : Lock & locked_chain , std : : vector < <nl> const uint256 & wtxid = entry . first ; <nl> const CWalletTx * pcoin = & entry . second ; <nl> <nl> - if ( ! CheckFinalTx ( * pcoin - > tx ) ) <nl> + if ( ! locked_chain . checkFinalTx ( * pcoin - > tx ) ) { <nl> continue ; <nl> + } <nl> <nl> if ( pcoin - > IsImmatureCoinBase ( locked_chain ) ) <nl> continue ; <nl> bool CWallet : : SelectCoinsMinConf ( const CAmount & nTargetValue , const CoinEligibil <nl> FeeCalculation feeCalc ; <nl> CCoinControl temp ; <nl> temp . m_confirm_target = 1008 ; <nl> - CFeeRate long_term_feerate = GetMinimumFeeRate ( * this , temp , : : mempool , : : feeEstimator , & feeCalc ) ; <nl> + CFeeRate long_term_feerate = GetMinimumFeeRate ( * this , temp , & feeCalc ) ; <nl> <nl> / / Calculate cost of change <nl> - CAmount cost_of_change = GetDiscardRate ( * this , : : feeEstimator ) . GetFee ( coin_selection_params . change_spend_size ) + coin_selection_params . effective_fee . GetFee ( coin_selection_params . change_output_size ) ; <nl> + CAmount cost_of_change = GetDiscardRate ( * this ) . GetFee ( coin_selection_params . change_spend_size ) + coin_selection_params . effective_fee . GetFee ( coin_selection_params . change_output_size ) ; <nl> <nl> / / Filter by the min conf specs and add to utxo_pool and calculate effective value <nl> for ( OutputGroup & group : groups ) { <nl> bool CWallet : : CreateTransaction ( interfaces : : Chain : : Lock & locked_chain , const std <nl> CTxOut change_prototype_txout ( 0 , scriptChange ) ; <nl> coin_selection_params . change_output_size = GetSerializeSize ( change_prototype_txout ) ; <nl> <nl> - CFeeRate discard_rate = GetDiscardRate ( * this , : : feeEstimator ) ; <nl> + CFeeRate discard_rate = GetDiscardRate ( * this ) ; <nl> <nl> / / Get the fee rate to use effective values in coin selection <nl> - CFeeRate nFeeRateNeeded = GetMinimumFeeRate ( * this , coin_control , : : mempool , : : feeEstimator , & feeCalc ) ; <nl> + CFeeRate nFeeRateNeeded = GetMinimumFeeRate ( * this , coin_control , & feeCalc ) ; <nl> <nl> nFeeRet = 0 ; <nl> bool pick_new_inputs = true ; <nl> bool CWallet : : CreateTransaction ( interfaces : : Chain : : Lock & locked_chain , const std <nl> return false ; <nl> } <nl> <nl> - nFeeNeeded = GetMinimumFee ( * this , nBytes , coin_control , : : mempool , : : feeEstimator , & feeCalc ) ; <nl> + nFeeNeeded = GetMinimumFee ( * this , nBytes , coin_control , & feeCalc ) ; <nl> if ( feeCalc . reason = = FeeReason : : FALLBACK & & ! m_allow_fallback_fee ) { <nl> / / eventually allow a fallback fee <nl> strFailReason = _ ( " Fee estimation failed . Fallbackfee is disabled . Wait a few blocks or enable - fallbackfee . " ) ; <nl> bool CWallet : : CreateTransaction ( interfaces : : Chain : : Lock & locked_chain , const std <nl> / / change output . Only try this once . <nl> if ( nChangePosInOut = = - 1 & & nSubtractFeeFromAmount = = 0 & & pick_new_inputs ) { <nl> unsigned int tx_size_with_change = nBytes + coin_selection_params . change_output_size + 2 ; / / Add 2 as a buffer in case increasing # of outputs changes compact size <nl> - CAmount fee_needed_with_change = GetMinimumFee ( * this , tx_size_with_change , coin_control , : : mempool , : : feeEstimator , nullptr ) ; <nl> + CAmount fee_needed_with_change = GetMinimumFee ( * this , tx_size_with_change , coin_control , nullptr ) ; <nl> CAmount minimum_value_for_change = GetDustThreshold ( change_prototype_txout , discard_rate ) ; <nl> if ( nFeeRet > = fee_needed_with_change + minimum_value_for_change ) { <nl> pick_new_inputs = false ; <nl> bool CWallet : : CreateTransaction ( interfaces : : Chain : : Lock & locked_chain , const std <nl> <nl> if ( gArgs . GetBoolArg ( " - walletrejectlongchains " , DEFAULT_WALLET_REJECT_LONG_CHAINS ) ) { <nl> / / Lastly , ensure this tx will pass the mempool ' s chain limits <nl> - LockPoints lp ; <nl> - CTxMemPoolEntry entry ( tx , 0 , 0 , 0 , false , 0 , lp ) ; <nl> - CTxMemPool : : setEntries setAncestors ; <nl> - size_t nLimitAncestors = gArgs . GetArg ( " - limitancestorcount " , DEFAULT_ANCESTOR_LIMIT ) ; <nl> - size_t nLimitAncestorSize = gArgs . GetArg ( " - limitancestorsize " , DEFAULT_ANCESTOR_SIZE_LIMIT ) * 1000 ; <nl> - size_t nLimitDescendants = gArgs . GetArg ( " - limitdescendantcount " , DEFAULT_DESCENDANT_LIMIT ) ; <nl> - size_t nLimitDescendantSize = gArgs . GetArg ( " - limitdescendantsize " , DEFAULT_DESCENDANT_SIZE_LIMIT ) * 1000 ; <nl> - std : : string errString ; <nl> - LOCK ( : : mempool . cs ) ; <nl> - if ( ! : : mempool . CalculateMemPoolAncestors ( entry , setAncestors , nLimitAncestors , nLimitAncestorSize , nLimitDescendants , nLimitDescendantSize , errString ) ) { <nl> + if ( ! chain ( ) . checkChainLimits ( tx ) ) { <nl> strFailReason = _ ( " Transaction has too long of a mempool chain " ) ; <nl> return false ; <nl> } <nl> bool CWallet : : CreateTransaction ( interfaces : : Chain : : Lock & locked_chain , const std <nl> / * * <nl> * Call after CreateTransaction unless you want to abort <nl> * / <nl> - bool CWallet : : CommitTransaction ( CTransactionRef tx , mapValue_t mapValue , std : : vector < std : : pair < std : : string , std : : string > > orderForm , CReserveKey & reservekey , CConnman * connman , CValidationState & state ) <nl> + bool CWallet : : CommitTransaction ( CTransactionRef tx , mapValue_t mapValue , std : : vector < std : : pair < std : : string , std : : string > > orderForm , CReserveKey & reservekey , CValidationState & state ) <nl> { <nl> { <nl> auto locked_chain = chain ( ) . lock ( ) ; <nl> bool CWallet : : CommitTransaction ( CTransactionRef tx , mapValue_t mapValue , std : : ve <nl> if ( fBroadcastTransactions ) <nl> { <nl> / / Broadcast <nl> - if ( ! wtx . AcceptToMemoryPool ( * locked_chain , maxTxFee , state ) ) { <nl> + if ( ! wtx . AcceptToMemoryPool ( * locked_chain , state ) ) { <nl> WalletLogPrintf ( " CommitTransaction ( ) : Transaction cannot be broadcast immediately , % s \ n " , FormatStateMessage ( state ) ) ; <nl> / / TODO : if we expect the failure to be long term or permanent , instead delete wtx from the wallet and return failure . <nl> } else { <nl> - wtx . RelayWalletTransaction ( * locked_chain , connman ) ; <nl> + wtx . RelayWalletTransaction ( * locked_chain ) ; <nl> } <nl> } <nl> } <nl> std : : shared_ptr < CWallet > CWallet : : CreateWalletFromFile ( interfaces : : Chain & chain , <nl> std : : vector < CWalletTx > vWtx ; <nl> <nl> if ( gArgs . GetBoolArg ( " - zapwallettxes " , false ) ) { <nl> - uiInterface . InitMessage ( _ ( " Zapping all transactions from wallet . . . " ) ) ; <nl> + chain . initMessage ( _ ( " Zapping all transactions from wallet . . . " ) ) ; <nl> <nl> std : : unique_ptr < CWallet > tempWallet = MakeUnique < CWallet > ( chain , location , WalletDatabase : : Create ( location . GetPath ( ) ) ) ; <nl> DBErrors nZapWalletRet = tempWallet - > ZapWalletTx ( vWtx ) ; <nl> if ( nZapWalletRet ! = DBErrors : : LOAD_OK ) { <nl> - InitError ( strprintf ( _ ( " Error loading % s : Wallet corrupted " ) , walletFile ) ) ; <nl> + chain . initError ( strprintf ( _ ( " Error loading % s : Wallet corrupted " ) , walletFile ) ) ; <nl> return nullptr ; <nl> } <nl> } <nl> <nl> - uiInterface . InitMessage ( _ ( " Loading wallet . . . " ) ) ; <nl> + chain . initMessage ( _ ( " Loading wallet . . . " ) ) ; <nl> <nl> int64_t nStart = GetTimeMillis ( ) ; <nl> bool fFirstRun = true ; <nl> std : : shared_ptr < CWallet > CWallet : : CreateWalletFromFile ( interfaces : : Chain & chain , <nl> if ( nLoadWalletRet ! = DBErrors : : LOAD_OK ) <nl> { <nl> if ( nLoadWalletRet = = DBErrors : : CORRUPT ) { <nl> - InitError ( strprintf ( _ ( " Error loading % s : Wallet corrupted " ) , walletFile ) ) ; <nl> + chain . initError ( strprintf ( _ ( " Error loading % s : Wallet corrupted " ) , walletFile ) ) ; <nl> return nullptr ; <nl> } <nl> else if ( nLoadWalletRet = = DBErrors : : NONCRITICAL_ERROR ) <nl> { <nl> - InitWarning ( strprintf ( _ ( " Error reading % s ! All keys read correctly , but transaction data " <nl> - " or address book entries might be missing or incorrect . " ) , <nl> + chain . initWarning ( strprintf ( _ ( " Error reading % s ! All keys read correctly , but transaction data " <nl> + " or address book entries might be missing or incorrect . " ) , <nl> walletFile ) ) ; <nl> } <nl> else if ( nLoadWalletRet = = DBErrors : : TOO_NEW ) { <nl> - InitError ( strprintf ( _ ( " Error loading % s : Wallet requires newer version of % s " ) , walletFile , _ ( PACKAGE_NAME ) ) ) ; <nl> + chain . initError ( strprintf ( _ ( " Error loading % s : Wallet requires newer version of % s " ) , walletFile , _ ( PACKAGE_NAME ) ) ) ; <nl> return nullptr ; <nl> } <nl> else if ( nLoadWalletRet = = DBErrors : : NEED_REWRITE ) <nl> { <nl> - InitError ( strprintf ( _ ( " Wallet needed to be rewritten : restart % s to complete " ) , _ ( PACKAGE_NAME ) ) ) ; <nl> + chain . initError ( strprintf ( _ ( " Wallet needed to be rewritten : restart % s to complete " ) , _ ( PACKAGE_NAME ) ) ) ; <nl> return nullptr ; <nl> } <nl> else { <nl> - InitError ( strprintf ( _ ( " Error loading % s " ) , walletFile ) ) ; <nl> + chain . initError ( strprintf ( _ ( " Error loading % s " ) , walletFile ) ) ; <nl> return nullptr ; <nl> } <nl> } <nl> std : : shared_ptr < CWallet > CWallet : : CreateWalletFromFile ( interfaces : : Chain & chain , <nl> walletInstance - > WalletLogPrintf ( " Allowing wallet upgrade up to % i \ n " , nMaxVersion ) ; <nl> if ( nMaxVersion < walletInstance - > GetVersion ( ) ) <nl> { <nl> - InitError ( _ ( " Cannot downgrade wallet " ) ) ; <nl> + chain . initError ( _ ( " Cannot downgrade wallet " ) ) ; <nl> return nullptr ; <nl> } <nl> walletInstance - > SetMaxVersion ( nMaxVersion ) ; <nl> std : : shared_ptr < CWallet > CWallet : : CreateWalletFromFile ( interfaces : : Chain & chain , <nl> / / Do not upgrade versions to any version between HD_SPLIT and FEATURE_PRE_SPLIT_KEYPOOL unless already supporting HD_SPLIT <nl> int max_version = walletInstance - > nWalletVersion ; <nl> if ( ! walletInstance - > CanSupportFeature ( FEATURE_HD_SPLIT ) & & max_version > = FEATURE_HD_SPLIT & & max_version < FEATURE_PRE_SPLIT_KEYPOOL ) { <nl> - InitError ( _ ( " Cannot upgrade a non HD split wallet without upgrading to support pre split keypool . Please use - upgradewallet = 169900 or - upgradewallet with no version specified . " ) ) ; <nl> + chain . initError ( _ ( " Cannot upgrade a non HD split wallet without upgrading to support pre split keypool . Please use - upgradewallet = 169900 or - upgradewallet with no version specified . " ) ) ; <nl> return nullptr ; <nl> } <nl> <nl> std : : shared_ptr < CWallet > CWallet : : CreateWalletFromFile ( interfaces : : Chain & chain , <nl> / / Regenerate the keypool if upgraded to HD <nl> if ( hd_upgrade ) { <nl> if ( ! walletInstance - > TopUpKeyPool ( ) ) { <nl> - InitError ( _ ( " Unable to generate keys " ) ) ; <nl> + chain . initError ( _ ( " Unable to generate keys " ) ) ; <nl> return nullptr ; <nl> } <nl> } <nl> std : : shared_ptr < CWallet > CWallet : : CreateWalletFromFile ( interfaces : : Chain & chain , <nl> <nl> / / Top up the keypool <nl> if ( walletInstance - > CanGenerateKeys ( ) & & ! walletInstance - > TopUpKeyPool ( ) ) { <nl> - InitError ( _ ( " Unable to generate initial keys " ) ) ; <nl> + chain . initError ( _ ( " Unable to generate initial keys " ) ) ; <nl> return nullptr ; <nl> } <nl> <nl> std : : shared_ptr < CWallet > CWallet : : CreateWalletFromFile ( interfaces : : Chain & chain , <nl> walletInstance - > ChainStateFlushed ( locked_chain - > getTipLocator ( ) ) ; <nl> } else if ( wallet_creation_flags & WALLET_FLAG_DISABLE_PRIVATE_KEYS ) { <nl> / / Make it impossible to disable private keys after creation <nl> - InitError ( strprintf ( _ ( " Error loading % s : Private keys can only be disabled during creation " ) , walletFile ) ) ; <nl> + chain . initError ( strprintf ( _ ( " Error loading % s : Private keys can only be disabled during creation " ) , walletFile ) ) ; <nl> return NULL ; <nl> } else if ( walletInstance - > IsWalletFlagSet ( WALLET_FLAG_DISABLE_PRIVATE_KEYS ) ) { <nl> LOCK ( walletInstance - > cs_KeyStore ) ; <nl> if ( ! walletInstance - > mapKeys . empty ( ) | | ! walletInstance - > mapCryptedKeys . empty ( ) ) { <nl> - InitWarning ( strprintf ( _ ( " Warning : Private keys detected in wallet { % s } with disabled private keys " ) , walletFile ) ) ; <nl> + chain . initWarning ( strprintf ( _ ( " Warning : Private keys detected in wallet { % s } with disabled private keys " ) , walletFile ) ) ; <nl> } <nl> } <nl> <nl> if ( ! gArgs . GetArg ( " - addresstype " , " " ) . empty ( ) & & ! ParseOutputType ( gArgs . GetArg ( " - addresstype " , " " ) , walletInstance - > m_default_address_type ) ) { <nl> - InitError ( strprintf ( " Unknown address type ' % s ' " , gArgs . GetArg ( " - addresstype " , " " ) ) ) ; <nl> + chain . initError ( strprintf ( " Unknown address type ' % s ' " , gArgs . GetArg ( " - addresstype " , " " ) ) ) ; <nl> return nullptr ; <nl> } <nl> <nl> if ( ! gArgs . GetArg ( " - changetype " , " " ) . empty ( ) & & ! ParseOutputType ( gArgs . GetArg ( " - changetype " , " " ) , walletInstance - > m_default_change_type ) ) { <nl> - InitError ( strprintf ( " Unknown change type ' % s ' " , gArgs . GetArg ( " - changetype " , " " ) ) ) ; <nl> + chain . initError ( strprintf ( " Unknown change type ' % s ' " , gArgs . GetArg ( " - changetype " , " " ) ) ) ; <nl> return nullptr ; <nl> } <nl> <nl> if ( gArgs . IsArgSet ( " - mintxfee " ) ) { <nl> CAmount n = 0 ; <nl> if ( ! ParseMoney ( gArgs . GetArg ( " - mintxfee " , " " ) , n ) | | 0 = = n ) { <nl> - InitError ( AmountErrMsg ( " mintxfee " , gArgs . GetArg ( " - mintxfee " , " " ) ) ) ; <nl> + chain . initError ( AmountErrMsg ( " mintxfee " , gArgs . GetArg ( " - mintxfee " , " " ) ) ) ; <nl> return nullptr ; <nl> } <nl> if ( n > HIGH_TX_FEE_PER_KB ) { <nl> - InitWarning ( AmountHighWarn ( " - mintxfee " ) + " " + <nl> - _ ( " This is the minimum transaction fee you pay on every transaction . " ) ) ; <nl> + chain . initWarning ( AmountHighWarn ( " - mintxfee " ) + " " + <nl> + _ ( " This is the minimum transaction fee you pay on every transaction . " ) ) ; <nl> } <nl> walletInstance - > m_min_fee = CFeeRate ( n ) ; <nl> } <nl> std : : shared_ptr < CWallet > CWallet : : CreateWalletFromFile ( interfaces : : Chain & chain , <nl> if ( gArgs . IsArgSet ( " - fallbackfee " ) ) { <nl> CAmount nFeePerK = 0 ; <nl> if ( ! ParseMoney ( gArgs . GetArg ( " - fallbackfee " , " " ) , nFeePerK ) ) { <nl> - InitError ( strprintf ( _ ( " Invalid amount for - fallbackfee = < amount > : ' % s ' " ) , gArgs . GetArg ( " - fallbackfee " , " " ) ) ) ; <nl> + chain . initError ( strprintf ( _ ( " Invalid amount for - fallbackfee = < amount > : ' % s ' " ) , gArgs . GetArg ( " - fallbackfee " , " " ) ) ) ; <nl> return nullptr ; <nl> } <nl> if ( nFeePerK > HIGH_TX_FEE_PER_KB ) { <nl> - InitWarning ( AmountHighWarn ( " - fallbackfee " ) + " " + <nl> - _ ( " This is the transaction fee you may pay when fee estimates are not available . " ) ) ; <nl> + chain . initWarning ( AmountHighWarn ( " - fallbackfee " ) + " " + <nl> + _ ( " This is the transaction fee you may pay when fee estimates are not available . " ) ) ; <nl> } <nl> walletInstance - > m_fallback_fee = CFeeRate ( nFeePerK ) ; <nl> walletInstance - > m_allow_fallback_fee = nFeePerK ! = 0 ; / / disable fallback fee in case value was set to 0 , enable if non - null value <nl> std : : shared_ptr < CWallet > CWallet : : CreateWalletFromFile ( interfaces : : Chain & chain , <nl> if ( gArgs . IsArgSet ( " - discardfee " ) ) { <nl> CAmount nFeePerK = 0 ; <nl> if ( ! ParseMoney ( gArgs . GetArg ( " - discardfee " , " " ) , nFeePerK ) ) { <nl> - InitError ( strprintf ( _ ( " Invalid amount for - discardfee = < amount > : ' % s ' " ) , gArgs . GetArg ( " - discardfee " , " " ) ) ) ; <nl> + chain . initError ( strprintf ( _ ( " Invalid amount for - discardfee = < amount > : ' % s ' " ) , gArgs . GetArg ( " - discardfee " , " " ) ) ) ; <nl> return nullptr ; <nl> } <nl> if ( nFeePerK > HIGH_TX_FEE_PER_KB ) { <nl> - InitWarning ( AmountHighWarn ( " - discardfee " ) + " " + <nl> - _ ( " This is the transaction fee you may discard if change is smaller than dust at this level " ) ) ; <nl> + chain . initWarning ( AmountHighWarn ( " - discardfee " ) + " " + <nl> + _ ( " This is the transaction fee you may discard if change is smaller than dust at this level " ) ) ; <nl> } <nl> walletInstance - > m_discard_rate = CFeeRate ( nFeePerK ) ; <nl> } <nl> if ( gArgs . IsArgSet ( " - paytxfee " ) ) { <nl> CAmount nFeePerK = 0 ; <nl> if ( ! ParseMoney ( gArgs . GetArg ( " - paytxfee " , " " ) , nFeePerK ) ) { <nl> - InitError ( AmountErrMsg ( " paytxfee " , gArgs . GetArg ( " - paytxfee " , " " ) ) ) ; <nl> + chain . initError ( AmountErrMsg ( " paytxfee " , gArgs . GetArg ( " - paytxfee " , " " ) ) ) ; <nl> return nullptr ; <nl> } <nl> if ( nFeePerK > HIGH_TX_FEE_PER_KB ) { <nl> - InitWarning ( AmountHighWarn ( " - paytxfee " ) + " " + <nl> - _ ( " This is the transaction fee you will pay if you send a transaction . " ) ) ; <nl> + chain . initWarning ( AmountHighWarn ( " - paytxfee " ) + " " + <nl> + _ ( " This is the transaction fee you will pay if you send a transaction . " ) ) ; <nl> } <nl> walletInstance - > m_pay_tx_fee = CFeeRate ( nFeePerK , 1000 ) ; <nl> if ( walletInstance - > m_pay_tx_fee < : : minRelayTxFee ) { <nl> - InitError ( strprintf ( _ ( " Invalid amount for - paytxfee = < amount > : ' % s ' ( must be at least % s ) " ) , <nl> + chain . initError ( strprintf ( _ ( " Invalid amount for - paytxfee = < amount > : ' % s ' ( must be at least % s ) " ) , <nl> gArgs . GetArg ( " - paytxfee " , " " ) , : : minRelayTxFee . ToString ( ) ) ) ; <nl> return nullptr ; <nl> } <nl> std : : shared_ptr < CWallet > CWallet : : CreateWalletFromFile ( interfaces : : Chain & chain , <nl> / / We can ' t rescan beyond non - pruned blocks , stop and throw an error <nl> / / this might happen if a user uses an old wallet within a pruned node <nl> / / or if he ran - disablewallet for a longer time , then decided to re - enable <nl> - if ( fPruneMode ) <nl> - { <nl> + if ( chain . getPruneMode ( ) ) { <nl> int block_height = * tip_height ; <nl> while ( block_height > 0 & & locked_chain - > haveBlockOnDisk ( block_height - 1 ) & & rescan_height ! = block_height ) { <nl> - - block_height ; <nl> } <nl> <nl> if ( rescan_height ! = block_height ) { <nl> - InitError ( _ ( " Prune : last wallet synchronisation goes beyond pruned data . You need to - reindex ( download the whole blockchain again in case of pruned node ) " ) ) ; <nl> + chain . initError ( _ ( " Prune : last wallet synchronisation goes beyond pruned data . You need to - reindex ( download the whole blockchain again in case of pruned node ) " ) ) ; <nl> return nullptr ; <nl> } <nl> } <nl> <nl> - uiInterface . InitMessage ( _ ( " Rescanning . . . " ) ) ; <nl> + chain . initMessage ( _ ( " Rescanning . . . " ) ) ; <nl> walletInstance - > WalletLogPrintf ( " Rescanning last % i blocks ( from block % i ) . . . \ n " , * tip_height - rescan_height , rescan_height ) ; <nl> <nl> / / No need to read and scan block if block was created before <nl> std : : shared_ptr < CWallet > CWallet : : CreateWalletFromFile ( interfaces : : Chain & chain , <nl> { <nl> WalletRescanReserver reserver ( walletInstance . get ( ) ) ; <nl> if ( ! reserver . reserve ( ) | | ( ScanResult : : SUCCESS ! = walletInstance - > ScanForWalletTransactions ( locked_chain - > getBlockHash ( rescan_height ) , { } / * stop block * / , reserver , true / * update * / ) . status ) ) { <nl> - InitError ( _ ( " Failed to rescan the wallet during initialization " ) ) ; <nl> + chain . initError ( _ ( " Failed to rescan the wallet during initialization " ) ) ; <nl> return nullptr ; <nl> } <nl> } <nl> std : : shared_ptr < CWallet > CWallet : : CreateWalletFromFile ( interfaces : : Chain & chain , <nl> } <nl> } <nl> <nl> - uiInterface . LoadWallet ( walletInstance ) ; <nl> + chain . loadWallet ( interfaces : : MakeWallet ( walletInstance ) ) ; <nl> <nl> / / Register with the validation interface . It ' s ok to do this after rescan since we ' re still holding cs_main . <nl> RegisterValidationInterface ( walletInstance . get ( ) ) ; <nl> bool CMerkleTx : : IsImmatureCoinBase ( interfaces : : Chain : : Lock & locked_chain ) const <nl> return GetBlocksToMaturity ( locked_chain ) > 0 ; <nl> } <nl> <nl> - bool CWalletTx : : AcceptToMemoryPool ( interfaces : : Chain : : Lock & locked_chain , const CAmount & nAbsurdFee , CValidationState & state ) <nl> + bool CWalletTx : : AcceptToMemoryPool ( interfaces : : Chain : : Lock & locked_chain , CValidationState & state ) <nl> { <nl> - LockAnnotation lock ( : : cs_main ) ; / / Temporary , for AcceptToMemoryPool below . Removed in upcoming commit . <nl> - <nl> / / We must set fInMempool here - while it will be re - set to true by the <nl> / / entered - mempool callback , if we did not there would be a race where a <nl> / / user could call sendmoney in a loop and hit spurious out of funds errors <nl> / / because we think that this newly generated transaction ' s change is <nl> / / unavailable as we ' re not yet aware that it is in the mempool . <nl> - bool ret = : : AcceptToMemoryPool ( mempool , state , tx , nullptr / * pfMissingInputs * / , <nl> - nullptr / * plTxnReplaced * / , false / * bypass_limits * / , nAbsurdFee ) ; <nl> + bool ret = locked_chain . submitToMemoryPool ( tx , pwallet - > chain ( ) . maxTxFee ( ) , state ) ; <nl> fInMempool | = ret ; <nl> return ret ; <nl> } <nl> std : : vector < OutputGroup > CWallet : : GroupOutputs ( const std : : vector < COutput > & outpu <nl> CInputCoin input_coin = output . GetInputCoin ( ) ; <nl> <nl> size_t ancestors , descendants ; <nl> - mempool . GetTransactionAncestry ( output . tx - > GetHash ( ) , ancestors , descendants ) ; <nl> + chain ( ) . getTransactionAncestry ( output . tx - > GetHash ( ) , ancestors , descendants ) ; <nl> if ( ! single_coin & & ExtractDestination ( output . tx - > tx - > vout [ output . i ] . scriptPubKey , dst ) ) { <nl> / / Limit output groups to no more than 10 entries , to protect <nl> / / against inadvertently creating a too - large transaction <nl> mmm a / src / wallet / wallet . h <nl> ppp b / src / wallet / wallet . h <nl> class CCoinControl ; <nl> class COutput ; <nl> class CReserveKey ; <nl> class CScript ; <nl> - class CTxMemPool ; <nl> - class CBlockPolicyEstimator ; <nl> class CWalletTx ; <nl> struct FeeCalculation ; <nl> enum class FeeEstimateMode ; <nl> class CWalletTx : public CMerkleTx <nl> int64_t GetTxTime ( ) const ; <nl> <nl> / / RelayWalletTransaction may only be called if fBroadcastTransactions ! <nl> - bool RelayWalletTransaction ( interfaces : : Chain : : Lock & locked_chain , CConnman * connman ) ; <nl> + bool RelayWalletTransaction ( interfaces : : Chain : : Lock & locked_chain ) ; <nl> <nl> / * * Pass this transaction to the mempool . Fails if absolute fee exceeds absurd fee . * / <nl> - bool AcceptToMemoryPool ( interfaces : : Chain : : Lock & locked_chain , const CAmount & nAbsurdFee , CValidationState & state ) ; <nl> + bool AcceptToMemoryPool ( interfaces : : Chain : : Lock & locked_chain , CValidationState & state ) ; <nl> <nl> / / TODO : Remove " NO_THREAD_SAFETY_ANALYSIS " and replace it with the correct <nl> / / annotation " EXCLUSIVE_LOCKS_REQUIRED ( pwallet - > cs_wallet ) " . The annotation <nl> class CWallet final : public CCryptoKeyStore , public CValidationInterface <nl> void ReacceptWalletTransactions ( ) ; <nl> void ResendWalletTransactions ( int64_t nBestBlockTime , CConnman * connman ) override EXCLUSIVE_LOCKS_REQUIRED ( cs_main ) ; <nl> / / ResendWalletTransactionsBefore may only be called if fBroadcastTransactions ! <nl> - std : : vector < uint256 > ResendWalletTransactionsBefore ( interfaces : : Chain : : Lock & locked_chain , int64_t nTime , CConnman * connman ) ; <nl> + std : : vector < uint256 > ResendWalletTransactionsBefore ( interfaces : : Chain : : Lock & locked_chain , int64_t nTime ) ; <nl> CAmount GetBalance ( const isminefilter & filter = ISMINE_SPENDABLE , const int min_depth = 0 ) const ; <nl> CAmount GetUnconfirmedBalance ( ) const ; <nl> CAmount GetImmatureBalance ( ) const ; <nl> class CWallet final : public CCryptoKeyStore , public CValidationInterface <nl> * / <nl> bool CreateTransaction ( interfaces : : Chain : : Lock & locked_chain , const std : : vector < CRecipient > & vecSend , CTransactionRef & tx , CReserveKey & reservekey , CAmount & nFeeRet , int & nChangePosInOut , <nl> std : : string & strFailReason , const CCoinControl & coin_control , bool sign = true ) ; <nl> - bool CommitTransaction ( CTransactionRef tx , mapValue_t mapValue , std : : vector < std : : pair < std : : string , std : : string > > orderForm , CReserveKey & reservekey , CConnman * connman , CValidationState & state ) ; <nl> + bool CommitTransaction ( CTransactionRef tx , mapValue_t mapValue , std : : vector < std : : pair < std : : string , std : : string > > orderForm , CReserveKey & reservekey , CValidationState & state ) ; <nl> <nl> bool DummySignTx ( CMutableTransaction & txNew , const std : : set < CTxOut > & txouts , bool use_max_sig = false ) const <nl> { <nl> | Merge : Remove wallet - > node global function calls | bitcoin/bitcoin | 45f434f44d0b55d137eaebb8c0486f9cebabc869 | 2019-03-04T18:13:36Z |
mmm a / src / bootstrapper . cc <nl> ppp b / src / bootstrapper . cc <nl> void Genesis : : InitializeGlobal_harmony_simd ( ) { <nl> } <nl> <nl> <nl> + void Genesis : : InitializeGlobal_harmony_object_values_entries ( ) { <nl> + if ( ! FLAG_harmony_object_values_entries ) return ; <nl> + <nl> + Handle < JSGlobalObject > global ( <nl> + JSGlobalObject : : cast ( native_context ( ) - > global_object ( ) ) ) ; <nl> + Isolate * isolate = global - > GetIsolate ( ) ; <nl> + Factory * factory = isolate - > factory ( ) ; <nl> + <nl> + Handle < JSFunction > object_function = isolate - > object_function ( ) ; <nl> + SimpleInstallFunction ( object_function , factory - > entries_string ( ) , <nl> + Builtins : : kObjectEntries , 1 , false ) ; <nl> + SimpleInstallFunction ( object_function , factory - > values_string ( ) , <nl> + Builtins : : kObjectValues , 1 , false ) ; <nl> + } <nl> + <nl> + <nl> void Genesis : : InstallJSProxyMaps ( ) { <nl> / / Allocate the different maps for all Proxy types . <nl> / / Next to the default proxy , we need maps indicating callable and <nl> bool Genesis : : InstallExperimentalNatives ( ) { <nl> static const char * harmony_function_name_natives [ ] = { nullptr } ; <nl> static const char * promise_extra_natives [ ] = { " native promise - extra . js " , <nl> nullptr } ; <nl> + static const char * harmony_object_values_entries_natives [ ] = { nullptr } ; <nl> <nl> for ( int i = ExperimentalNatives : : GetDebuggerCount ( ) ; <nl> i < ExperimentalNatives : : GetBuiltinsCount ( ) ; i + + ) { <nl> mmm a / src / builtins . cc <nl> ppp b / src / builtins . cc <nl> BUILTIN ( ObjectKeys ) { <nl> } <nl> <nl> <nl> + BUILTIN ( ObjectValues ) { <nl> + HandleScope scope ( isolate ) ; <nl> + Handle < Object > object = args . atOrUndefined ( isolate , 1 ) ; <nl> + Handle < JSReceiver > receiver ; <nl> + ASSIGN_RETURN_FAILURE_ON_EXCEPTION ( isolate , receiver , <nl> + Object : : ToObject ( isolate , object ) ) ; <nl> + Handle < FixedArray > keys ; <nl> + ASSIGN_RETURN_FAILURE_ON_EXCEPTION ( <nl> + isolate , keys , <nl> + JSReceiver : : GetKeys ( receiver , JSReceiver : : OWN_ONLY , ENUMERABLE_STRINGS , <nl> + CONVERT_TO_STRING ) ) ; <nl> + <nl> + for ( int i = 0 ; i < keys - > length ( ) ; + + i ) { <nl> + auto key = Handle < Name > : : cast ( FixedArray : : get ( keys , i ) ) ; <nl> + Handle < Object > value ; <nl> + <nl> + ASSIGN_RETURN_FAILURE_ON_EXCEPTION ( <nl> + isolate , value , Object : : GetPropertyOrElement ( receiver , key , STRICT ) ) ; <nl> + <nl> + keys - > set ( i , * value ) ; <nl> + } <nl> + <nl> + return * isolate - > factory ( ) - > NewJSArrayWithElements ( keys ) ; <nl> + } <nl> + <nl> + <nl> + BUILTIN ( ObjectEntries ) { <nl> + HandleScope scope ( isolate ) ; <nl> + Handle < Object > object = args . atOrUndefined ( isolate , 1 ) ; <nl> + Handle < JSReceiver > receiver ; <nl> + ASSIGN_RETURN_FAILURE_ON_EXCEPTION ( isolate , receiver , <nl> + Object : : ToObject ( isolate , object ) ) ; <nl> + Handle < FixedArray > keys ; <nl> + ASSIGN_RETURN_FAILURE_ON_EXCEPTION ( <nl> + isolate , keys , <nl> + JSReceiver : : GetKeys ( receiver , JSReceiver : : OWN_ONLY , ENUMERABLE_STRINGS , <nl> + CONVERT_TO_STRING ) ) ; <nl> + <nl> + for ( int i = 0 ; i < keys - > length ( ) ; + + i ) { <nl> + auto key = Handle < Name > : : cast ( FixedArray : : get ( keys , i ) ) ; <nl> + Handle < Object > value ; <nl> + <nl> + ASSIGN_RETURN_FAILURE_ON_EXCEPTION ( <nl> + isolate , value , Object : : GetPropertyOrElement ( receiver , key , STRICT ) ) ; <nl> + <nl> + auto entry_storage = isolate - > factory ( ) - > NewUninitializedFixedArray ( 2 ) ; <nl> + entry_storage - > set ( 0 , * key ) ; <nl> + entry_storage - > set ( 1 , * value ) ; <nl> + auto entry = isolate - > factory ( ) - > NewJSArrayWithElements ( entry_storage ) ; <nl> + keys - > set ( i , * entry ) ; <nl> + } <nl> + <nl> + return * isolate - > factory ( ) - > NewJSArrayWithElements ( keys ) ; <nl> + } <nl> + <nl> + <nl> / / ES6 section 19 . 1 . 2 . 15 Object . preventExtensions ( O ) <nl> BUILTIN ( ObjectPreventExtensions ) { <nl> HandleScope scope ( isolate ) ; <nl> mmm a / src / builtins . h <nl> ppp b / src / builtins . h <nl> inline bool operator & ( BuiltinExtraArguments lhs , BuiltinExtraArguments rhs ) { <nl> V ( ObjectIsFrozen , kNone ) \ <nl> V ( ObjectIsSealed , kNone ) \ <nl> V ( ObjectKeys , kNone ) \ <nl> + V ( ObjectValues , kNone ) \ <nl> + V ( ObjectEntries , kNone ) \ <nl> V ( ObjectPreventExtensions , kNone ) \ <nl> V ( ObjectSeal , kNone ) \ <nl> V ( ObjectProtoToString , kNone ) \ <nl> mmm a / src / flag - definitions . h <nl> ppp b / src / flag - definitions . h <nl> DEFINE_IMPLICATION ( es_staging , move_object_start ) <nl> V ( harmony_simd , " harmony simd " ) \ <nl> V ( harmony_do_expressions , " harmony do - expressions " ) \ <nl> V ( harmony_regexp_subclass , " harmony regexp subclassing " ) \ <nl> - V ( harmony_species , " harmony Symbol . species " ) <nl> + V ( harmony_species , " harmony Symbol . species " ) \ <nl> + V ( harmony_object_values_entries , " harmony Object . values / Object . entries " ) <nl> <nl> / / Features that are complete ( but still behind - - harmony / es - staging flag ) . <nl> # define HARMONY_STAGED ( V ) \ <nl> mmm a / src / heap / heap . h <nl> ppp b / src / heap / heap . h <nl> namespace internal { <nl> V ( done_string , " done " ) \ <nl> V ( dot_result_string , " . result " ) \ <nl> V ( dot_string , " . " ) \ <nl> + V ( entries_string , " entries " ) \ <nl> V ( enumerable_string , " enumerable " ) \ <nl> V ( enumerate_string , " enumerate " ) \ <nl> V ( Error_string , " Error " ) \ <nl> namespace internal { <nl> V ( undefined_string , " undefined " ) \ <nl> V ( undefined_to_string , " [ object Undefined ] " ) \ <nl> V ( valueOf_string , " valueOf " ) \ <nl> + V ( values_string , " values " ) \ <nl> V ( value_string , " value " ) \ <nl> V ( WeakMap_string , " WeakMap " ) \ <nl> V ( WeakSet_string , " WeakSet " ) \ <nl> new file mode 100644 <nl> index 00000000000 . . 47fedd1980b <nl> mmm / dev / null <nl> ppp b / test / mjsunit / harmony / object - entries . js <nl> <nl> + / / Copyright 2016 the V8 project authors . All rights reserved . <nl> + / / Use of this source code is governed by a BSD - style license that can be <nl> + / / found in the LICENSE file . <nl> + <nl> + / / Flags : - - harmony - object - values - entries - - harmony - proxies - - harmony - reflect <nl> + <nl> + function TestMeta ( ) { <nl> + assertEquals ( 1 , Object . entries . length ) ; <nl> + assertEquals ( Function . prototype , Object . getPrototypeOf ( Object . entries ) ) ; <nl> + } <nl> + TestMeta ( ) ; <nl> + <nl> + <nl> + function TestBasic ( ) { <nl> + var x = 16 ; <nl> + var O = { <nl> + d : 1 , <nl> + c : 3 , <nl> + [ Symbol . iterator ] : void 0 , <nl> + 0 : 123 , <nl> + 1000 : 456 , <nl> + [ x * x ] : " ducks " , <nl> + [ ` 0x $ { ( x * x ) . toString ( 16 ) } ` ] : " quack " <nl> + } ; <nl> + O . a = 2 ; <nl> + O . b = 4 ; <nl> + Object . defineProperty ( O , " HIDDEN " , { enumerable : false , value : NaN } ) ; <nl> + assertEquals ( [ <nl> + [ " 0 " , 123 ] , <nl> + [ " 256 " , " ducks " ] , <nl> + [ " 1000 " , 456 ] , <nl> + [ " d " , 1 ] , <nl> + [ " c " , 3 ] , <nl> + [ " 0x100 " , " quack " ] , <nl> + [ " a " , 2 ] , <nl> + [ " b " , 4 ] <nl> + ] , Object . entries ( O ) ) ; <nl> + assertEquals ( Object . entries ( O ) , Object . keys ( O ) . map ( key = > [ key , O [ key ] ] ) ) ; <nl> + } <nl> + TestBasic ( ) ; <nl> + <nl> + <nl> + function TestOrder ( ) { <nl> + var O = { <nl> + a : 1 , <nl> + [ Symbol . iterator ] : null <nl> + } ; <nl> + O [ 456 ] = 123 ; <nl> + Object . defineProperty ( O , " HIDDEN " , { enumerable : false , value : NaN } ) ; <nl> + <nl> + var log = [ ] ; <nl> + var P = new Proxy ( O , { <nl> + ownKeys ( target ) { <nl> + log . push ( " [ [ OwnPropertyKeys ] ] " ) ; <nl> + return Reflect . ownKeys ( target ) ; <nl> + } , <nl> + get ( target , name ) { <nl> + log . push ( ` [ [ Get ] ] ( $ { JSON . stringify ( name ) } ) ` ) ; <nl> + return Reflect . get ( target , name ) ; <nl> + } , <nl> + set ( target , name , value ) { <nl> + assertUnreachable ( ) ; <nl> + } <nl> + } ) ; <nl> + <nl> + assertEquals ( [ [ " 456 " , 123 ] , [ " a " , 1 ] ] , Object . entries ( P ) ) ; <nl> + assertEquals ( [ <nl> + " [ [ OwnPropertyKeys ] ] " , <nl> + " [ [ Get ] ] ( \ " 456 \ " ) " , <nl> + " [ [ Get ] ] ( \ " a \ " ) " <nl> + ] , log ) ; <nl> + } <nl> + TestOrder ( ) ; <nl> new file mode 100644 <nl> index 00000000000 . . e312889f854 <nl> mmm / dev / null <nl> ppp b / test / mjsunit / harmony / object - values . js <nl> <nl> + / / Copyright 2016 the V8 project authors . All rights reserved . <nl> + / / Use of this source code is governed by a BSD - style license that can be <nl> + / / found in the LICENSE file . <nl> + <nl> + / / Flags : - - harmony - object - values - entries - - harmony - proxies - - harmony - reflect <nl> + <nl> + function TestMeta ( ) { <nl> + assertEquals ( 1 , Object . values . length ) ; <nl> + assertEquals ( Function . prototype , Object . getPrototypeOf ( Object . values ) ) ; <nl> + } <nl> + TestMeta ( ) ; <nl> + <nl> + <nl> + function TestBasic ( ) { <nl> + var x = 16 ; <nl> + var O = { <nl> + d : 1 , <nl> + c : 3 , <nl> + [ Symbol . iterator ] : void 0 , <nl> + 0 : 123 , <nl> + 1000 : 456 , <nl> + [ x * x ] : " ducks " , <nl> + [ ` 0x $ { ( x * x ) . toString ( 16 ) } ` ] : " quack " <nl> + } ; <nl> + O . a = 2 ; <nl> + O . b = 4 ; <nl> + Object . defineProperty ( O , " HIDDEN " , { enumerable : false , value : NaN } ) ; <nl> + assertEquals ( [ 123 , " ducks " , 456 , 1 , 3 , " quack " , 2 , 4 ] , Object . values ( O ) ) ; <nl> + assertEquals ( Object . values ( O ) , Object . keys ( O ) . map ( key = > O [ key ] ) ) ; <nl> + } <nl> + TestBasic ( ) ; <nl> + <nl> + <nl> + function TestOrder ( ) { <nl> + var O = { <nl> + a : 1 , <nl> + [ Symbol . iterator ] : null <nl> + } ; <nl> + O [ 456 ] = 123 ; <nl> + Object . defineProperty ( O , " HIDDEN " , { enumerable : false , value : NaN } ) ; <nl> + <nl> + var log = [ ] ; <nl> + var P = new Proxy ( O , { <nl> + ownKeys ( target ) { <nl> + log . push ( " [ [ OwnPropertyKeys ] ] " ) ; <nl> + return Reflect . ownKeys ( target ) ; <nl> + } , <nl> + get ( target , name ) { <nl> + log . push ( ` [ [ Get ] ] ( $ { JSON . stringify ( name ) } ) ` ) ; <nl> + return Reflect . get ( target , name ) ; <nl> + } , <nl> + set ( target , name , value ) { <nl> + assertUnreachable ( ) ; <nl> + } <nl> + } ) ; <nl> + <nl> + assertEquals ( [ 123 , 1 ] , Object . values ( P ) ) ; <nl> + assertEquals ( [ <nl> + " [ [ OwnPropertyKeys ] ] " , <nl> + " [ [ Get ] ] ( \ " 456 \ " ) " , <nl> + " [ [ Get ] ] ( \ " a \ " ) " <nl> + ] , log ) ; <nl> + } <nl> + TestOrder ( ) ; <nl> | [ es7 ] implement Object . values ( ) / Object . entries ( ) proposal | v8/v8 | 677be73e767f93741204f07061f0216485086f99 | 2016-01-22T03:12:56Z |
mmm a / SConstruct <nl> ppp b / SConstruct <nl> if GetOption ( " full " ) : <nl> # mmmmmm SOURCE FILE SETUP mmmmmmmmm - - <nl> <nl> commonFiles = Split ( " pch . cpp buildinfo . cpp db / common . cpp db / jsobj . cpp db / json . cpp db / lasterror . cpp db / nonce . cpp db / queryutil . cpp shell / mongo . cpp " ) <nl> - commonFiles + = [ " util / background . cpp " , " util / mmap . cpp " , " util / ramstore . cpp " , " util / sock . cpp " , " util / util . cpp " , " util / message . cpp " , <nl> + commonFiles + = [ " util / background . cpp " , " util / ramstore . cpp " , " util / sock . cpp " , " util / util . cpp " , " util / message . cpp " , <nl> " util / assert_util . cpp " , " util / log . cpp " , " util / httpclient . cpp " , " util / md5main . cpp " , " util / base64 . cpp " , " util / concurrency / vars . cpp " , " util / concurrency / task . cpp " , " util / debug_util . cpp " , <nl> " util / concurrency / thread_pool . cpp " , " util / password . cpp " , " util / version . cpp " , <nl> " util / histogram . cpp " , " util / concurrency / spin_lock . cpp " , " util / text . cpp " , " util / stringutils . cpp " , " util / processinfo . cpp " ] <nl> commonFiles + = Glob ( " util / * . c " ) <nl> commonFiles + = Split ( " client / connpool . cpp client / dbclient . cpp client / dbclientcursor . cpp client / model . cpp client / syncclusterconnection . cpp client / distlock . cpp s / shardconnection . cpp " ) <nl> <nl> - # mmap stuff <nl> - <nl> - if GetOption ( " mm " ) ! = None : <nl> - commonFiles + = [ " util / mmap_mm . cpp " ] <nl> - elif os . sys . platform = = " win32 " : <nl> - commonFiles + = [ " util / mmap_win . cpp " ] <nl> - else : <nl> - commonFiles + = [ " util / mmap_posix . cpp " ] <nl> - <nl> if os . path . exists ( " util / processinfo_ " + os . sys . platform + " . cpp " ) : <nl> commonFiles + = [ " util / processinfo_ " + os . sys . platform + " . cpp " ] <nl> else : <nl> if GetOption ( " asio " ) ! = None : <nl> <nl> serverOnlyFiles = Split ( " db / query . cpp db / update . cpp db / introspect . cpp db / btree . cpp db / clientcursor . cpp db / tests . cpp db / repl . cpp db / repl / rs . cpp db / repl / consensus . cpp db / repl / rs_initiate . cpp db / repl / replset_commands . cpp db / repl / manager . cpp db / repl / health . cpp db / repl / heartbeat . cpp db / repl / rs_config . cpp db / repl / rs_rollback . cpp db / repl / rs_sync . cpp db / repl / rs_initialsync . cpp db / oplog . cpp db / repl_block . cpp db / btreecursor . cpp db / cloner . cpp db / namespace . cpp db / cap . cpp db / matcher_covered . cpp db / dbeval . cpp db / restapi . cpp db / dbhelpers . cpp db / instance . cpp db / client . cpp db / database . cpp db / pdfile . cpp db / cursor . cpp db / security_commands . cpp db / security . cpp db / storage . cpp db / queryoptimizer . cpp db / extsort . cpp db / mr . cpp s / d_util . cpp db / cmdline . cpp " ) <nl> <nl> + # mmap stuff <nl> + serverOnlyFiles + = [ " util / mmap . cpp " ] <nl> + if GetOption ( " mm " ) ! = None : <nl> + serverOnlyFiles + = [ " util / mmap_mm . cpp " ] <nl> + elif os . sys . platform = = " win32 " : <nl> + serverOnlyFiles + = [ " util / mmap_win . cpp " ] <nl> + else : <nl> + serverOnlyFiles + = [ " util / mmap_posix . cpp " ] <nl> + <nl> serverOnlyFiles + = [ " db / index . cpp " ] + Glob ( " db / geo / * . cpp " ) <nl> <nl> serverOnlyFiles + = [ " db / dbcommands . cpp " , " db / dbcommands_admin . cpp " ] <nl> | get mmap stuff out of commonFiles | mongodb/mongo | 5d307a6bba596e28f40a55d0ddcdafa1c24d7597 | 2010-08-06T14:40:17Z |
mmm a / tensorflow / contrib / learn / python / __init__ . py <nl> ppp b / tensorflow / contrib / learn / python / __init__ . py <nl> <nl> # limitations under the License . <nl> # = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> <nl> + " " " tf . learn API . " " " <nl> + <nl> from __future__ import absolute_import <nl> from __future__ import division <nl> from __future__ import print_function <nl> <nl> + # pylint : disable = wildcard - import <nl> from tensorflow . contrib . learn . python . learn import * <nl> mmm a / tensorflow / contrib / learn / python / learn / __init__ . py <nl> ppp b / tensorflow / contrib / learn / python / learn / __init__ . py <nl> <nl> <nl> import numpy as np <nl> <nl> - from tensorflow . contrib . learn . python . learn . io import * <nl> - from tensorflow . contrib . learn . python . learn . estimators import * <nl> from tensorflow . contrib . learn . python . learn import datasets <nl> - from tensorflow . contrib . learn . python . learn import ops <nl> - from tensorflow . contrib . learn . python . learn import preprocessing <nl> from tensorflow . contrib . learn . python . learn import models <nl> from tensorflow . contrib . learn . python . learn import monitors <nl> + from tensorflow . contrib . learn . python . learn import ops <nl> + from tensorflow . contrib . learn . python . learn import preprocessing <nl> from tensorflow . contrib . learn . python . learn import utils <nl> - <nl> + # pylint : disable = wildcard - import <nl> + from tensorflow . contrib . learn . python . learn . estimators import * <nl> from tensorflow . contrib . learn . python . learn . graph_actions import evaluate <nl> from tensorflow . contrib . learn . python . learn . graph_actions import infer <nl> from tensorflow . contrib . learn . python . learn . graph_actions import NanLossDuringTrainingError <nl> - from tensorflow . contrib . learn . python . learn . graph_actions import run_n <nl> from tensorflow . contrib . learn . python . learn . graph_actions import run_feeds <nl> - from tensorflow . contrib . learn . python . learn . graph_actions import SupervisorParams <nl> + from tensorflow . contrib . learn . python . learn . graph_actions import run_n <nl> from tensorflow . contrib . learn . python . learn . graph_actions import train <nl> + from tensorflow . contrib . learn . python . learn . io import * <nl> + # pylint : enable = wildcard - import <nl> mmm a / tensorflow / contrib / learn / python / learn / graph_actions . py <nl> ppp b / tensorflow / contrib / learn / python / learn / graph_actions . py <nl> <nl> # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND , either express or implied . <nl> # See the License for the specific language governing permissions and <nl> # limitations under the License . <nl> + <nl> " " " High level operations on graphs . " " " <nl> <nl> from __future__ import absolute_import <nl> from __future__ import division <nl> from __future__ import print_function <nl> <nl> - import collections as py_collections <nl> import itertools <nl> import sys <nl> import time <nl> def _run_dict ( session , run_dict , feed_dict = None ) : <nl> return dict ( zip ( keys , values ) ) <nl> <nl> <nl> - class SupervisorParams ( py_collections . namedtuple ( <nl> - ' SupervisorParams ' , <nl> - [ ' is_chief ' , ' master ' , ' save_model_secs ' , ' save_summaries_secs ' ] ) ) : <nl> - " " " Parameters required to configure supervisor for training . <nl> - <nl> - Fields : <nl> - is_chief : Whether the current process is the chief supervisor in charge of <nl> - restoring the model and running standard services . <nl> - master : The master string to use when preparing the session . <nl> - save_model_secs : Save a checkpoint every ` save_model_secs ` seconds when <nl> - training . <nl> - save_summaries_secs : Save summaries every ` save_summaries_secs ` seconds when <nl> - training . <nl> - " " " <nl> - SupervisorParams . __new__ . __defaults__ = ( True , ' ' , 600 , 10 ) <nl> - <nl> - <nl> def _prepare_session ( graph , <nl> output_dir , <nl> start_services , <nl> mmm a / tensorflow / contrib / learn / python / learn / trainer . py <nl> ppp b / tensorflow / contrib / learn / python / learn / trainer . py <nl> <nl> <nl> from six . moves import xrange # pylint : disable = redefined - builtin <nl> <nl> - from tensorflow . python . framework import ops <nl> - from tensorflow . python . ops import init_ops <nl> - from tensorflow . python . ops import clip_ops <nl> - from tensorflow . python . ops import control_flow_ops <nl> - from tensorflow . python . ops import gradients <nl> - from tensorflow . python . ops import variables <nl> - from tensorflow . python . ops import variable_scope as vs <nl> - from tensorflow . contrib . layers import optimizers <nl> - <nl> <nl> def train ( session , <nl> train_op , <nl> def train ( session , <nl> <nl> Args : <nl> session : Session object . <nl> - train : Tensor , trains model . <nl> + train_op : Tensor , trains model . <nl> loss : Tensor , loss value . <nl> global_step : Tensor , global step of the model . <nl> feed_dict_fn : Function that will return a feed dictionary . <nl> - summary_writer : SummaryWriter object to use for writing summaries . <nl> steps : Number of steps to run . <nl> monitor : Monitor object to track training progress and induce early <nl> stopping <nl> + summary_writer : SummaryWriter object to use for writing summaries . <nl> summaries : Joined object of all summaries that should be ran . <nl> + feed_params_fn : Feed params function . <nl> " " " <nl> for step in xrange ( steps ) : <nl> feed_dict = feed_dict_fn ( ) <nl> mmm a / tensorflow / g3doc / api_docs / python / contrib . learn . md <nl> ppp b / tensorflow / g3doc / api_docs / python / contrib . learn . md <nl> Attributes : <nl> <nl> <nl> <nl> - - - - <nl> - <nl> - # # # ` class tf . contrib . learn . SupervisorParams ` { # SupervisorParams } <nl> - <nl> - Parameters required to configure supervisor for training . <nl> - <nl> - Fields : <nl> - is_chief : Whether the current process is the chief supervisor in charge of <nl> - restoring the model and running standard services . <nl> - master : The master string to use when preparing the session . <nl> - save_model_secs : Save a checkpoint every ` save_model_secs ` seconds when <nl> - training . <nl> - save_summaries_secs : Save summaries every ` save_summaries_secs ` seconds when <nl> - training . <nl> - - - - <nl> - <nl> - # # # # ` tf . contrib . learn . SupervisorParams . is_chief ` { # SupervisorParams . is_chief } <nl> - <nl> - Alias for field number 0 <nl> - <nl> - <nl> - - - - <nl> - <nl> - # # # # ` tf . contrib . learn . SupervisorParams . master ` { # SupervisorParams . master } <nl> - <nl> - Alias for field number 1 <nl> - <nl> - <nl> - - - - <nl> - <nl> - # # # # ` tf . contrib . learn . SupervisorParams . save_model_secs ` { # SupervisorParams . save_model_secs } <nl> - <nl> - Alias for field number 2 <nl> - <nl> - <nl> - - - - <nl> - <nl> - # # # # ` tf . contrib . learn . SupervisorParams . save_summaries_secs ` { # SupervisorParams . save_summaries_secs } <nl> - <nl> - Alias for field number 3 <nl> - <nl> - <nl> - <nl> - - - <nl> <nl> # # # ` class tf . contrib . learn . TensorFlowClassifier ` { # TensorFlowClassifier } <nl> mmm a / tensorflow / g3doc / api_docs / python / index . md <nl> ppp b / tensorflow / g3doc / api_docs / python / index . md <nl> <nl> * [ ` run_feeds ` ] ( . . / . . / api_docs / python / contrib . learn . md # run_feeds ) <nl> * [ ` run_n ` ] ( . . / . . / api_docs / python / contrib . learn . md # run_n ) <nl> * [ ` RunConfig ` ] ( . . / . . / api_docs / python / contrib . learn . md # RunConfig ) <nl> - * [ ` SupervisorParams ` ] ( . . / . . / api_docs / python / contrib . learn . md # SupervisorParams ) <nl> * [ ` TensorFlowClassifier ` ] ( . . / . . / api_docs / python / contrib . learn . md # TensorFlowClassifier ) <nl> * [ ` TensorFlowDNNClassifier ` ] ( . . / . . / api_docs / python / contrib . learn . md # TensorFlowDNNClassifier ) <nl> * [ ` TensorFlowDNNRegressor ` ] ( . . / . . / api_docs / python / contrib . learn . md # TensorFlowDNNRegressor ) <nl> | Remove unused SupervisorParams . | tensorflow/tensorflow | d11bcebb3072149451872c5c779ac7c67612dc4f | 2016-05-17T23:33:58Z |
mmm a / aten / src / ATen / core / boxing / KernelFunction . h <nl> ppp b / aten / src / ATen / core / boxing / KernelFunction . h <nl> class CAFFE2_API KernelFunction final { <nl> * > Tensor unboxed_func ( Tensor a , Tensor b ) { . . . } <nl> * > KernelFunction func = KernelFunction : : makeFromUnboxedFunction < decltype ( unboxed_func ) , & unboxed_func > ( ) ; <nl> * / <nl> - template < class FuncType , FuncType * func , bool AllowLegacyTypes = false > <nl> - static KernelFunction makeFromUnboxedFunction ( ) ; <nl> + template < class FuncPtr , bool AllowLegacyTypes = false > <nl> + static KernelFunction makeFromUnboxedFunction ( FuncPtr ) ; <nl> <nl> / * * <nl> * Create a KernelFunction from an unboxed function and prevent creation of an <nl> class CAFFE2_API KernelFunction final { <nl> * > Tensor unboxed_func ( Tensor a , Tensor b ) { . . . } <nl> * > KernelFunction func = KernelFunction : : makeFromUnboxedOnlyFunction < decltype ( unboxed_func ) , & unboxed_func > ( ) ; <nl> * / <nl> - template < class FuncType , FuncType * func > <nl> - static KernelFunction makeFromUnboxedOnlyFunction ( ) ; <nl> + template < class FuncPtr > <nl> + static KernelFunction makeFromUnboxedOnlyFunction ( FuncPtr ) ; <nl> <nl> / * * <nl> * Create a KernelFunction from an unboxed function . <nl> mmm a / aten / src / ATen / core / boxing / KernelFunction_impl . h <nl> ppp b / aten / src / ATen / core / boxing / KernelFunction_impl . h <nl> inline KernelFunction KernelFunction : : makeFromUnboxedOnlyFunctor ( std : : unique_ptr <nl> ) ; <nl> } <nl> <nl> - template < class FuncType , FuncType * func , bool AllowLegacyTypes > <nl> - inline KernelFunction KernelFunction : : makeFromUnboxedFunction ( ) { <nl> - static_assert ( guts : : is_function_type < FuncType > : : value , " Tried to call KernelFunction : : makeFromUnboxedFunction with invalid template parameters . They must be < FuncType , * func_ptr > . " ) ; <nl> - static_assert ( ! std : : is_same < FuncType , BoxedKernelFunction > : : value , " Tried to call KernelFunction : : makeFromUnboxedFunction with a boxed function pointer . Please use KernelFunction : : makeFromBoxedFunction instead . " ) ; <nl> - static_assert ( func ! = nullptr , " Kernel function cannot be nullptr " ) ; <nl> - <nl> - return makeFromUnboxedFunctor < AllowLegacyTypes , typename impl : : WrapFunctionIntoFunctor < FuncType , func > : : type > ( <nl> - guts : : make_unique_base < OperatorKernel , typename impl : : WrapFunctionIntoFunctor < FuncType , func > : : type > ( ) <nl> + template < class FuncPtr , bool AllowLegacyTypes > <nl> + inline KernelFunction KernelFunction : : makeFromUnboxedFunction ( FuncPtr ) { <nl> + static_assert ( is_compile_time_function_pointer < FuncPtr > : : value , " Tried to call KernelFunction : : makeFromUnboxedFunction with an invalid parameter . It must be a function pointer created with TORCH_FN . " ) ; <nl> + static_assert ( ! std : : is_same < typename FuncPtr : : FuncType , BoxedKernelFunction > : : value , " Tried to call KernelFunction : : makeFromUnboxedFunction with a boxed function pointer . Please use KernelFunction : : makeFromBoxedFunction instead . " ) ; <nl> + static_assert ( FuncPtr : : func_ptr ( ) ! = nullptr , " Kernel function cannot be nullptr " ) ; <nl> + <nl> + return makeFromUnboxedFunctor < AllowLegacyTypes , typename impl : : WrapFunctionIntoFunctor < FuncPtr > : : type > ( <nl> + guts : : make_unique_base < OperatorKernel , typename impl : : WrapFunctionIntoFunctor < FuncPtr > : : type > ( ) <nl> ) ; <nl> } <nl> <nl> - template < class FuncType , FuncType * func > <nl> - inline KernelFunction KernelFunction : : makeFromUnboxedOnlyFunction ( ) { <nl> + template < class FuncPtr > <nl> + inline KernelFunction KernelFunction : : makeFromUnboxedOnlyFunction ( FuncPtr ) { <nl> / / TODO We want to get rid of kernels that have only an unboxed function pointer . <nl> / / All kernels should have a boxed pointer . <nl> + static_assert ( is_compile_time_function_pointer < FuncPtr > : : value , " Tried to call KernelFunction : : makeFromUnboxedOnlyFunction with an invalid parameter . It must be a function pointer created with TORCH_FN . " ) ; <nl> + static_assert ( ! std : : is_same < typename FuncPtr : : FuncType , BoxedKernelFunction > : : value , " Tried to call KernelFunction : : makeFromUnboxedOnlyFunction with a boxed function pointer . Please use KernelFunction : : makeFromBoxedFunction instead . " ) ; <nl> + static_assert ( FuncPtr : : func_ptr ( ) ! = nullptr , " Kernel function cannot be nullptr " ) ; <nl> <nl> - static_assert ( guts : : is_function_type < FuncType > : : value , " Tried to call KernelFunction : : makeFromUnboxedOnlyFunction with invalid template parameters . They must be < FuncType , * func_ptr > . " ) ; <nl> - static_assert ( ! std : : is_same < FuncType , BoxedKernelFunction > : : value , " Tried to call KernelFunction : : makeFromUnboxedOnlyFunction with a boxed function pointer . Please use KernelFunction : : makeFromBoxedFunction instead . " ) ; <nl> - static_assert ( func ! = nullptr , " Kernel function cannot be nullptr " ) ; <nl> - <nl> - return makeFromUnboxedOnlyFunctor < typename impl : : WrapFunctionIntoFunctor < FuncType , func > : : type > ( <nl> - guts : : make_unique_base < OperatorKernel , typename impl : : WrapFunctionIntoFunctor < FuncType , func > : : type > ( ) <nl> + return makeFromUnboxedOnlyFunctor < typename impl : : WrapFunctionIntoFunctor < FuncPtr > : : type > ( <nl> + guts : : make_unique_base < OperatorKernel , typename impl : : WrapFunctionIntoFunctor < FuncPtr > : : type > ( ) <nl> ) ; <nl> } <nl> <nl> mmm a / aten / src / ATen / core / boxing / KernelFunction_test . cpp <nl> ppp b / aten / src / ATen / core / boxing / KernelFunction_test . cpp <nl> TEST ( KernelFunctionTest , givenUnboxedOnlyFunctor_withoutReturn_whenCallingUnboxe <nl> } <nl> <nl> TEST ( KernelFunctionTest , givenUnboxedFunction_withReturn_whenCallingBoxed_thenWorks ) { <nl> - KernelFunction func = KernelFunction : : makeFromUnboxedFunction < decltype ( kernels : : unboxed_function_with_return ) , & kernels : : unboxed_function_with_return > ( ) ; <nl> + KernelFunction func = KernelFunction : : makeFromUnboxedFunction ( TORCH_FN ( kernels : : unboxed_function_with_return ) ) ; <nl> kernels : : expectBoxedCallingWithReturnWorks ( func ) ; <nl> } <nl> <nl> TEST ( KernelFunctionTest , givenUnboxedFunction_withoutReturn_whenCallingBoxed_thenWorks ) { <nl> - KernelFunction func = KernelFunction : : makeFromUnboxedFunction < decltype ( kernels : : unboxed_function_without_return ) , & kernels : : unboxed_function_without_return > ( ) ; <nl> + KernelFunction func = KernelFunction : : makeFromUnboxedFunction ( TORCH_FN ( kernels : : unboxed_function_without_return ) ) ; <nl> kernels : : expectBoxedCallingWithoutReturnWorks ( func ) ; <nl> } <nl> <nl> TEST ( KernelFunctionTest , givenUnboxedFunction_withReturn_whenCallingUnboxed_thenWorks ) { <nl> - KernelFunction func = KernelFunction : : makeFromUnboxedFunction < decltype ( kernels : : unboxed_function_with_return ) , & kernels : : unboxed_function_with_return > ( ) ; <nl> + KernelFunction func = KernelFunction : : makeFromUnboxedFunction ( TORCH_FN ( kernels : : unboxed_function_with_return ) ) ; <nl> kernels : : expectUnboxedCallingWithReturnWorks ( func ) ; <nl> } <nl> <nl> TEST ( KernelFunctionTest , givenUnboxedFunction_withoutReturn_whenCallingUnboxed_thenWorks ) { <nl> - KernelFunction func = KernelFunction : : makeFromUnboxedFunction < decltype ( kernels : : unboxed_function_without_return ) , & kernels : : unboxed_function_without_return > ( ) ; <nl> + KernelFunction func = KernelFunction : : makeFromUnboxedFunction ( TORCH_FN ( kernels : : unboxed_function_without_return ) ) ; <nl> kernels : : expectUnboxedCallingWithoutReturnWorks ( func ) ; <nl> } <nl> <nl> TEST ( KernelFunctionTest , givenUnboxedOnlyFunction_withReturn_whenCallingBoxed_thenFails ) { <nl> - KernelFunction func = KernelFunction : : makeFromUnboxedOnlyFunction < decltype ( kernels : : unboxed_function_with_return ) , & kernels : : unboxed_function_with_return > ( ) ; <nl> + KernelFunction func = KernelFunction : : makeFromUnboxedOnlyFunction ( TORCH_FN ( kernels : : unboxed_function_with_return ) ) ; <nl> kernels : : expectBoxedCallingFailsWith ( func , " Tried to call KernelFunction : : callBoxed ( ) on a KernelFunction that can only be called with KernelFunction : : call ( ) " ) ; <nl> } <nl> <nl> TEST ( KernelFunctionTest , givenUnboxedOnlyFunction_withoutReturn_whenCallingBoxed_thenFails ) { <nl> - KernelFunction func = KernelFunction : : makeFromUnboxedOnlyFunction < decltype ( kernels : : unboxed_function_without_return ) , & kernels : : unboxed_function_without_return > ( ) ; <nl> + KernelFunction func = KernelFunction : : makeFromUnboxedOnlyFunction ( TORCH_FN ( kernels : : unboxed_function_without_return ) ) ; <nl> kernels : : expectBoxedCallingFailsWith ( func , " Tried to call KernelFunction : : callBoxed ( ) on a KernelFunction that can only be called with KernelFunction : : call ( ) " ) ; <nl> } <nl> <nl> TEST ( KernelFunctionTest , givenUnboxedOnlyFunction_withReturn_whenCallingUnboxed_thenWorks ) { <nl> - KernelFunction func = KernelFunction : : makeFromUnboxedOnlyFunction < decltype ( kernels : : unboxed_function_with_return ) , & kernels : : unboxed_function_with_return > ( ) ; <nl> + KernelFunction func = KernelFunction : : makeFromUnboxedOnlyFunction ( TORCH_FN ( kernels : : unboxed_function_with_return ) ) ; <nl> kernels : : expectUnboxedCallingWithReturnWorks ( func ) ; <nl> } <nl> <nl> TEST ( KernelFunctionTest , givenUnboxedOnlyFunction_withoutReturn_whenCallingUnboxed_thenWorks ) { <nl> - KernelFunction func = KernelFunction : : makeFromUnboxedOnlyFunction < decltype ( kernels : : unboxed_function_without_return ) , & kernels : : unboxed_function_without_return > ( ) ; <nl> + KernelFunction func = KernelFunction : : makeFromUnboxedOnlyFunction ( TORCH_FN ( kernels : : unboxed_function_without_return ) ) ; <nl> kernels : : expectUnboxedCallingWithoutReturnWorks ( func ) ; <nl> } <nl> <nl> mmm a / aten / src / ATen / core / boxing / impl / WrapFunctionIntoFunctor . h <nl> ppp b / aten / src / ATen / core / boxing / impl / WrapFunctionIntoFunctor . h <nl> <nl> # pragma once <nl> <nl> + # include < c10 / core / CompileTimeFunctionPointer . h > <nl> + <nl> namespace c10 { <nl> namespace impl { <nl> namespace detail { <nl> - template < class FuncType , FuncType * kernel_func , class ReturnType , class ParameterList > class WrapFunctionIntoFunctor_ { } ; <nl> - template < class FuncType , FuncType * kernel_func , class ReturnType , class . . . Parameters > <nl> - class WrapFunctionIntoFunctor_ < FuncType , kernel_func , ReturnType , guts : : typelist : : typelist < Parameters . . . > > final : public c10 : : OperatorKernel { <nl> + template < class FuncPtr , class ReturnType , class ParameterList > class WrapFunctionIntoFunctor_ { } ; <nl> + template < class FuncPtr , class ReturnType , class . . . Parameters > <nl> + class WrapFunctionIntoFunctor_ < FuncPtr , ReturnType , guts : : typelist : : typelist < Parameters . . . > > final : public c10 : : OperatorKernel { <nl> public : <nl> decltype ( auto ) operator ( ) ( Parameters . . . args ) { <nl> - return ( * kernel_func ) ( std : : forward < Parameters > ( args ) . . . ) ; <nl> + return ( * FuncPtr : : func_ptr ( ) ) ( std : : forward < Parameters > ( args ) . . . ) ; <nl> } <nl> } ; <nl> } <nl> namespace impl { <nl> / / WrapFunctionIntoFunctor : Wraps a compile time function pointer into a kernel functor . <nl> / / Since it is a compile time function pointer , many compilers can inline it <nl> / / into the wrapper and you don ' t get any performance overhead for wrapping . <nl> - template < class FuncType , FuncType * kernel_func , class Enable = std : : enable_if_t < guts : : is_function_type < FuncType > : : value > > <nl> + template < class FuncPtr > <nl> struct WrapFunctionIntoFunctor final { <nl> + static_assert ( c10 : : is_compile_time_function_pointer < FuncPtr > : : value , " WrapFunctionIntoFunctor can only wrap functions created with TORCH_FN . " ) ; <nl> using type = detail : : WrapFunctionIntoFunctor_ < <nl> - FuncType , <nl> - kernel_func , <nl> - typename guts : : function_traits < FuncType > : : return_type , <nl> - typename guts : : function_traits < FuncType > : : parameter_types <nl> + FuncPtr , <nl> + typename guts : : function_traits < typename FuncPtr : : FuncType > : : return_type , <nl> + typename guts : : function_traits < typename FuncPtr : : FuncType > : : parameter_types <nl> > ; <nl> } ; <nl> } <nl> mmm a / aten / src / ATen / core / boxing / impl / kernel_function_test . cpp <nl> ppp b / aten / src / ATen / core / boxing / impl / kernel_function_test . cpp <nl> <nl> # include < ATen / core / op_registration / op_registration . h > <nl> # include < ATen / core / Tensor . h > <nl> # include < torch / csrc / jit / frontend / function_schema_parser . h > <nl> + # include < torch / library . h > <nl> <nl> # include < ATen / core / LegacyTypeDispatch . h > <nl> <nl> TEST ( OperatorRegistrationTest_FunctionBasedKernel , givenKernel_whenRegistered_th <nl> expectCallsIncrement ( DispatchKey : : CPU ) ; <nl> } <nl> <nl> + TEST ( OperatorRegistrationTest_FunctionBasedKernel , givenKernel_whenRegisteredWithTorchLibraryAndTorchFn_thenCanBeCalled ) { <nl> + auto m = MAKE_TORCH_LIBRARY ( _test ) ; <nl> + m . def ( " my_op ( Tensor dummy , int input ) - > int " ) ; <nl> + m . impl ( " my_op " , DispatchKey : : CPU , TORCH_FN ( incrementKernel ) ) ; <nl> + expectCallsIncrement ( DispatchKey : : CPU ) ; <nl> + } <nl> + <nl> + TEST ( OperatorRegistrationTest_FunctionBasedKernel , givenCatchAllKernel_whenRegisteredWithTorchLibraryAndTorchFn_thenCanBeCalled ) { <nl> + auto m = MAKE_TORCH_LIBRARY ( _test ) ; <nl> + m . def ( " my_op ( Tensor dummy , int input ) - > int " , TORCH_FN ( incrementKernel ) ) ; <nl> + expectCallsIncrement ( DispatchKey : : CPU ) ; <nl> + } <nl> + <nl> TEST ( OperatorRegistrationTest_FunctionBasedKernel , givenMultipleOperatorsAndKernels_whenRegisteredInOneRegistrar_thenCallsRightKernel ) { <nl> auto registrar = RegisterOperators ( ) <nl> . op ( " _test : : my_op ( Tensor dummy , int input ) - > int " , RegisterOperators : : options ( ) . kernel < decltype ( incrementKernel ) , & incrementKernel > ( DispatchKey : : CPU ) ) <nl> mmm a / aten / src / ATen / core / op_registration / op_registration . h <nl> ppp b / aten / src / ATen / core / op_registration / op_registration . h <nl> <nl> * / <nl> <nl> # include < c10 / core / DispatchKey . h > <nl> + # include < c10 / core / CompileTimeFunctionPointer . h > <nl> # include < ATen / core / dispatch / Dispatcher . h > <nl> # include < ATen / core / op_registration / infer_schema . h > <nl> # if defined ( EXPOSE_C2_OPS ) | | ! defined ( CAFFE2_IS_XPLAT_BUILD ) <nl> class CAFFE2_API RegisterOperators final { <nl> <nl> return std : : move ( * this ) . kernel ( <nl> std : : move ( dispatch_key ) , <nl> - KernelFunction : : makeFromUnboxedFunction < FuncType , kernel_func > ( ) , <nl> + KernelFunction : : makeFromUnboxedFunction ( CompileTimeFunctionPointer < FuncType , kernel_func > ( ) ) , <nl> / / TODO Do schema inference without relying on WrapFunctionIntoFunctor <nl> - detail : : inferFunctionSchemaFromFunctor < typename impl : : WrapFunctionIntoFunctor < FuncType , kernel_func > : : type > ( ) <nl> + detail : : inferFunctionSchemaFromFunctor < typename impl : : WrapFunctionIntoFunctor < CompileTimeFunctionPointer < FuncType , kernel_func > > : : type > ( ) <nl> ) ; <nl> } <nl> <nl> class CAFFE2_API RegisterOperators final { <nl> <nl> return std : : move ( * this ) . kernel ( <nl> c10 : : nullopt , <nl> - KernelFunction : : makeFromUnboxedFunction < FuncType , kernel_func > ( ) , <nl> + KernelFunction : : makeFromUnboxedFunction ( TORCH_FN ( kernel_func ) ) , <nl> / / TODO Do schema inference without relying on WrapFunctionIntoFunctor <nl> - detail : : inferFunctionSchemaFromFunctor < typename impl : : WrapFunctionIntoFunctor < FuncType , kernel_func > : : type > ( ) <nl> + detail : : inferFunctionSchemaFromFunctor < typename impl : : WrapFunctionIntoFunctor < CompileTimeFunctionPointer < FuncType , kernel_func > > : : type > ( ) <nl> ) ; <nl> } <nl> <nl> mmm a / aten / src / ATen / function_wrapper . py <nl> ppp b / aten / src / ATen / function_wrapper . py <nl> def TypedDict ( name , attrs , total = True ) : # type : ignore <nl> # TORCH_LIBRARY macro invocation <nl> DEFAULT_UNBOXEDONLY_FUNCTION_REGISTRATION = CodeTemplate ( " " " \ <nl> m . impl ( " $ { unqual_operator_name_with_overload } " , <nl> - torch : : CppFunction : : makeUnboxedOnly ( TypeDefault : : $ { type_wrapper_name } ) ) ; <nl> + torch : : CppFunction : : makeUnboxedOnly ( & TypeDefault : : $ { type_wrapper_name } ) ) ; <nl> " " " ) <nl> <nl> DEFAULT_FUNCTION_REGISTRATION = CodeTemplate ( " " " \ <nl> - m . impl ( " $ { unqual_operator_name_with_overload } " , & TypeDefault : : $ { type_wrapper_name } ) ; <nl> + m . impl ( " $ { unqual_operator_name_with_overload } " , TORCH_FN ( TypeDefault : : $ { type_wrapper_name } ) ) ; <nl> " " " ) <nl> <nl> # NB : In the ordinary , TypeDerived code generation work flow , specification <nl> def TypedDict ( name , attrs , total = True ) : # type : ignore <nl> BACKEND_UNBOXEDONLY_FUNCTION_REGISTRATION = CodeTemplate ( " " " \ <nl> m . impl ( " $ { unqual_operator_name_with_overload } " , <nl> torch : : dispatch ( DispatchKey : : $ { Backend } , <nl> - torch : : CppFunction : : makeUnboxedOnly ( $ { Type } : : $ { type_wrapper_name } ) ) <nl> + torch : : CppFunction : : makeUnboxedOnly ( & $ { Type } : : $ { type_wrapper_name } ) ) <nl> ) ; <nl> " " " ) <nl> <nl> BACKEND_FUNCTION_REGISTRATION = CodeTemplate ( " " " \ <nl> m . impl ( " $ { unqual_operator_name_with_overload } " , <nl> torch : : dispatch ( DispatchKey : : $ { Backend } , <nl> - & $ { Type } : : $ { type_wrapper_name } ) <nl> + TORCH_FN ( $ { Type } : : $ { type_wrapper_name } ) ) <nl> ) ; <nl> " " " ) <nl> <nl> mmm a / aten / src / ATen / gen_backend_select_register . py <nl> ppp b / aten / src / ATen / gen_backend_select_register . py <nl> <nl> " @ " + " generated from $ { filename } " ) <nl> <nl> FUNCTION_REGISTRATION = CodeTemplate ( " " " \ <nl> - . op ( torch : : RegisterOperators : : options ( ) <nl> - . schema ( " $ { schema_string } " ) <nl> - . impl_unboxedOnlyKernel < decltype ( $ { function_name } ) , & $ { function_name } > ( DispatchKey : : BackendSelect ) <nl> - . aliasAnalysis ( AliasAnalysisKind : : FROM_SCHEMA ) ) <nl> + m . impl_UNBOXED ( " aten : : $ { op_name_with_overload_name } " , $ { function_name } ) ; <nl> " " " ) <nl> <nl> FUNCTION_DEFINITION = CodeTemplate ( " " " \ <nl> def register_backend_select_methods ( declarations , template_path , file_manager ) : <nl> assert option [ ' use_c10_dispatcher ' ] = = ' with_codegenerated_unboxing_wrapper ' <nl> <nl> name = option [ ' name ' ] <nl> + op_name_with_overload_name = option [ ' name ' ] <nl> if option . get ( ' overload_name ' , ' ' ) ! = ' ' : <nl> name = " { 0 } _ { 1 } " . format ( name , option [ ' overload_name ' ] ) <nl> + op_name_with_overload_name = " { 0 } . { 1 } " . format ( op_name_with_overload_name , option [ ' overload_name ' ] ) <nl> <nl> func_reg = FUNCTION_REGISTRATION . substitute ( schema_string = option [ ' schema_string ' ] , <nl> + op_name_with_overload_name = op_name_with_overload_name , <nl> function_name = name ) <nl> <nl> dispatch_key_init = gen_dispatch_key_init ( ' _dk ' , option [ ' formals_list ' ] ) <nl> mmm a / aten / src / ATen / native / TensorProperties . cpp <nl> ppp b / aten / src / ATen / native / TensorProperties . cpp <nl> Tensor & detach_ ( Tensor & self ) { <nl> } <nl> <nl> TORCH_LIBRARY_IMPL ( aten , CatchAll , m ) { <nl> - m . impl ( " detach " , detach ) ; <nl> + m . impl ( " detach " , TORCH_FN ( detach ) ) ; <nl> m . impl_UNBOXED ( " detach_ " , detach_ ) ; <nl> } <nl> <nl> mmm a / aten / src / ATen / native / quantized / README . md <nl> ppp b / aten / src / ATen / native / quantized / README . md <nl> The registration is done using ` TORCH_LIBRARY_IMPL ` . <nl> <nl> ` ` ` c + + <nl> TORCH_LIBRARY_IMPL ( quantized , QuantizedCPU , m ) { <nl> - m . impl ( " xand " , quantized_xand ) ; <nl> + m . impl ( " xand " , TORCH_FN ( quantized_xand ) ) ; <nl> } <nl> ` ` ` <nl> <nl> namespace at { <nl> } <nl> <nl> TORCH_LIBRARY_IMPL ( quantized , QuantizedCPU , m ) { <nl> - m . impl ( " xand " , quantized_xand ) ; <nl> + m . impl ( " xand " , TORCH_FN ( quantized_xand ) ) ; <nl> } <nl> } } / / namespace at : : native <nl> ` ` ` <nl> mmm a / aten / src / ATen / native / quantized / cpu / qadd . cpp <nl> ppp b / aten / src / ATen / native / quantized / cpu / qadd . cpp <nl> Tensor qadd_scalar_tensor_out ( Tensor qa , Tensor b , Tensor out ) { <nl> } <nl> <nl> TORCH_LIBRARY_IMPL ( quantized , QuantizedCPU , m ) { <nl> - m . impl ( " add " , qadd < / * ReLUFused = * / false > ) ; <nl> - m . impl ( " add_relu " , qadd < / * ReLUFused = * / true > ) ; <nl> - m . impl ( " add_out " , qadd_out < / * ReLUFused = * / false > ) ; <nl> - m . impl ( " add_relu_out " , qadd_out < / * ReLUFused = * / true > ) ; <nl> - m . impl ( " add_scalar " , qadd_scalar < / * ReLUFused = * / false > ) ; <nl> - m . impl ( " add_scalar_relu " , qadd_scalar < / * ReLUFused = * / true > ) ; <nl> - m . impl ( " add_scalar_out " , qadd_scalar_out < / * ReLUFused = * / false > ) ; <nl> - m . impl ( " add_scalar_relu_out " , qadd_scalar_out < / * ReLUFused = * / true > ) ; <nl> - m . impl ( " add_scalar . Tensor " , qadd_scalar_tensor < / * ReLUFused = * / false > ) ; <nl> - m . impl ( " add_scalar_relu . Tensor " , qadd_scalar_tensor < / * ReLUFused = * / true > ) ; <nl> - m . impl ( " add_scalar_out . Tensor " , qadd_scalar_tensor_out < / * ReLUFused = * / false > ) ; <nl> - m . impl ( " add_scalar_relu_out . Tensor " , qadd_scalar_tensor_out < / * ReLUFused = * / true > ) ; <nl> + m . impl ( " add " , TORCH_FN ( qadd < / * ReLUFused = * / false > ) ) ; <nl> + m . impl ( " add_relu " , TORCH_FN ( qadd < / * ReLUFused = * / true > ) ) ; <nl> + m . impl ( " add_out " , TORCH_FN ( qadd_out < / * ReLUFused = * / false > ) ) ; <nl> + m . impl ( " add_relu_out " , TORCH_FN ( qadd_out < / * ReLUFused = * / true > ) ) ; <nl> + m . impl ( " add_scalar " , TORCH_FN ( qadd_scalar < / * ReLUFused = * / false > ) ) ; <nl> + m . impl ( " add_scalar_relu " , TORCH_FN ( qadd_scalar < / * ReLUFused = * / true > ) ) ; <nl> + m . impl ( " add_scalar_out " , TORCH_FN ( qadd_scalar_out < / * ReLUFused = * / false > ) ) ; <nl> + m . impl ( " add_scalar_relu_out " , TORCH_FN ( qadd_scalar_out < / * ReLUFused = * / true > ) ) ; <nl> + m . impl ( " add_scalar . Tensor " , TORCH_FN ( qadd_scalar_tensor < / * ReLUFused = * / false > ) ) ; <nl> + m . impl ( " add_scalar_relu . Tensor " , TORCH_FN ( qadd_scalar_tensor < / * ReLUFused = * / true > ) ) ; <nl> + m . impl ( " add_scalar_out . Tensor " , TORCH_FN ( qadd_scalar_tensor_out < / * ReLUFused = * / false > ) ) ; <nl> + m . impl ( " add_scalar_relu_out . Tensor " , TORCH_FN ( qadd_scalar_tensor_out < / * ReLUFused = * / true > ) ) ; <nl> } <nl> <nl> TORCH_LIBRARY_IMPL ( _quantized , QuantizedCPU , m ) { <nl> - m . impl ( " add " , qadd < / * ReLUFused = * / false > ) ; <nl> + m . impl ( " add " , TORCH_FN ( qadd < / * ReLUFused = * / false > ) ) ; <nl> } <nl> <nl> } / / namespace <nl> mmm a / aten / src / ATen / native / quantized / cpu / qbatch_norm . cpp <nl> ppp b / aten / src / ATen / native / quantized / cpu / qbatch_norm . cpp <nl> Tensor quantized_batch_norm ( <nl> } <nl> <nl> TORCH_LIBRARY_IMPL ( quantized , QuantizedCPU , m ) { <nl> - m . impl ( " batch_norm " , q_batch_norm_impl < false > ) ; <nl> - m . impl ( " batch_norm_relu " , q_batch_norm_impl < true > ) ; <nl> - m . impl ( " batch_norm2d " , q_batch_norm2d_impl < false > ) ; <nl> - m . impl ( " batch_norm2d_relu " , q_batch_norm2d_impl < true > ) ; <nl> - m . impl ( " batch_norm3d " , q_batch_norm3d_impl < false > ) ; <nl> - m . impl ( " batch_norm3d_relu " , q_batch_norm3d_impl < true > ) ; <nl> + m . impl ( " batch_norm " , TORCH_FN ( q_batch_norm_impl < false > ) ) ; <nl> + m . impl ( " batch_norm_relu " , TORCH_FN ( q_batch_norm_impl < true > ) ) ; <nl> + m . impl ( " batch_norm2d " , TORCH_FN ( q_batch_norm2d_impl < false > ) ) ; <nl> + m . impl ( " batch_norm2d_relu " , TORCH_FN ( q_batch_norm2d_impl < true > ) ) ; <nl> + m . impl ( " batch_norm3d " , TORCH_FN ( q_batch_norm3d_impl < false > ) ) ; <nl> + m . impl ( " batch_norm3d_relu " , TORCH_FN ( q_batch_norm3d_impl < true > ) ) ; <nl> } <nl> <nl> } / / namespace native <nl> mmm a / aten / src / ATen / native / quantized / cpu / qclamp . cpp <nl> ppp b / aten / src / ATen / native / quantized / cpu / qclamp . cpp <nl> Tensor & quantized_hardtanh_ ( <nl> } <nl> <nl> TORCH_LIBRARY_IMPL ( quantized , QuantizedCPU , m ) { <nl> - m . impl ( " clamp " , quantized_clamp ) ; <nl> + m . impl ( " clamp " , TORCH_FN ( quantized_clamp ) ) ; <nl> } <nl> <nl> } / / namespace native <nl> mmm a / aten / src / ATen / native / quantized / cpu / qconcat . cpp <nl> ppp b / aten / src / ATen / native / quantized / cpu / qconcat . cpp <nl> Tensor qcat_out ( const c10 : : List < Tensor > & qxs , int64_t dim , Tensor out ) { <nl> } / / namespace <nl> <nl> TORCH_LIBRARY_IMPL ( quantized , QuantizedCPU , m ) { <nl> - m . impl ( " cat " , qcat < false > ) ; <nl> - m . impl ( " cat_relu " , qcat < true > ) ; <nl> - m . impl ( " cat_out " , qcat_out < false > ) ; <nl> - m . impl ( " cat_relu_out " , qcat_out < true > ) ; <nl> + m . impl ( " cat " , TORCH_FN ( qcat < false > ) ) ; <nl> + m . impl ( " cat_relu " , TORCH_FN ( qcat < true > ) ) ; <nl> + m . impl ( " cat_out " , TORCH_FN ( qcat_out < false > ) ) ; <nl> + m . impl ( " cat_relu_out " , TORCH_FN ( qcat_out < true > ) ) ; <nl> } <nl> <nl> Tensor quantized_cat ( TensorList qxs , int64_t dim ) { <nl> mmm a / aten / src / ATen / native / quantized / cpu / qconv_prepack . cpp <nl> ppp b / aten / src / ATen / native / quantized / cpu / qconv_prepack . cpp <nl> class QConv1dPackWeightInt8 final { <nl> <nl> TORCH_LIBRARY_IMPL ( quantized , QuantizedCPU , m ) { <nl> / / conv_prepack is deprecated , please use conv2d_prepack for 2D conv . <nl> - m . impl ( " conv_prepack " , QConvPackWeightInt8 < 2 > : : run ) ; <nl> - m . impl ( " conv1d_prepack " , QConv1dPackWeightInt8 : : run ) ; <nl> - m . impl ( " conv2d_prepack " , QConvPackWeightInt8 < 2 > : : run ) ; <nl> - m . impl ( " conv3d_prepack " , QConvPackWeightInt8 < 3 > : : run ) ; <nl> + m . impl ( " conv_prepack " , TORCH_FN ( QConvPackWeightInt8 < 2 > : : run ) ) ; <nl> + m . impl ( " conv1d_prepack " , TORCH_FN ( QConv1dPackWeightInt8 : : run ) ) ; <nl> + m . impl ( " conv2d_prepack " , TORCH_FN ( QConvPackWeightInt8 < 2 > : : run ) ) ; <nl> + m . impl ( " conv3d_prepack " , TORCH_FN ( QConvPackWeightInt8 < 3 > : : run ) ) ; <nl> } <nl> <nl> TORCH_LIBRARY_IMPL ( _quantized , QuantizedCPU , m ) { <nl> - m . impl ( " conv2d_prepack " , QConvPackWeightInt8 < 2 > : : run ) ; <nl> + m . impl ( " conv2d_prepack " , TORCH_FN ( QConvPackWeightInt8 < 2 > : : run ) ) ; <nl> } <nl> <nl> } / / namespace <nl> mmm a / aten / src / ATen / native / quantized / cpu / qconv_unpack . cpp <nl> ppp b / aten / src / ATen / native / quantized / cpu / qconv_unpack . cpp <nl> class QConvGroups final { <nl> <nl> TORCH_LIBRARY_IMPL ( quantized , CatchAll , m ) { <nl> / / conv_unpack is deprecated , please use conv2d_unpack for 2D conv . <nl> - m . impl ( " conv_unpack " , QConvUnpackWeightsInt8 < 2 > : : run ) ; <nl> + m . impl ( " conv_unpack " , TORCH_FN ( QConvUnpackWeightsInt8 < 2 > : : run ) ) ; <nl> / / We use conv2d_unpack to be consistent with conv3d_unpack <nl> - m . impl ( " conv1d_unpack " , QConv1dUnpackWeightsInt8 : : run ) ; <nl> - m . impl ( " conv2d_unpack " , QConvUnpackWeightsInt8 < 2 > : : run ) ; <nl> - m . impl ( " conv3d_unpack " , QConvUnpackWeightsInt8 < 3 > : : run ) ; <nl> - m . impl ( " conv2d_stride " , QConvStride < 2 > : : run ) ; <nl> - m . impl ( " conv2d_padding " , QConvPadding < 2 > : : run ) ; <nl> - m . impl ( " conv2d_dilation " , QConvDilation < 2 > : : run ) ; <nl> - m . impl ( " conv2d_groups " , QConvGroups < 2 > : : run ) ; <nl> - m . impl ( " conv3d_stride " , QConvStride < 3 > : : run ) ; <nl> - m . impl ( " conv3d_padding " , QConvPadding < 3 > : : run ) ; <nl> - m . impl ( " conv3d_dilation " , QConvDilation < 3 > : : run ) ; <nl> - m . impl ( " conv3d_groups " , QConvGroups < 3 > : : run ) ; <nl> + m . impl ( " conv1d_unpack " , TORCH_FN ( QConv1dUnpackWeightsInt8 : : run ) ) ; <nl> + m . impl ( " conv2d_unpack " , TORCH_FN ( QConvUnpackWeightsInt8 < 2 > : : run ) ) ; <nl> + m . impl ( " conv3d_unpack " , TORCH_FN ( QConvUnpackWeightsInt8 < 3 > : : run ) ) ; <nl> + m . impl ( " conv2d_stride " , TORCH_FN ( QConvStride < 2 > : : run ) ) ; <nl> + m . impl ( " conv2d_padding " , TORCH_FN ( QConvPadding < 2 > : : run ) ) ; <nl> + m . impl ( " conv2d_dilation " , TORCH_FN ( QConvDilation < 2 > : : run ) ) ; <nl> + m . impl ( " conv2d_groups " , TORCH_FN ( QConvGroups < 2 > : : run ) ) ; <nl> + m . impl ( " conv3d_stride " , TORCH_FN ( QConvStride < 3 > : : run ) ) ; <nl> + m . impl ( " conv3d_padding " , TORCH_FN ( QConvPadding < 3 > : : run ) ) ; <nl> + m . impl ( " conv3d_dilation " , TORCH_FN ( QConvDilation < 3 > : : run ) ) ; <nl> + m . impl ( " conv3d_groups " , TORCH_FN ( QConvGroups < 3 > : : run ) ) ; <nl> } <nl> <nl> } / / namespace <nl> mmm a / aten / src / ATen / native / quantized / cpu / qhardswish . cpp <nl> ppp b / aten / src / ATen / native / quantized / cpu / qhardswish . cpp <nl> Tensor quantized_hardswish ( const Tensor & qx , double output_scale , int64_t output <nl> } <nl> <nl> TORCH_LIBRARY_IMPL ( quantized , QuantizedCPU , m ) { <nl> - m . impl ( " hardswish " , quantized_hardswish ) ; <nl> + m . impl ( " hardswish " , TORCH_FN ( quantized_hardswish ) ) ; <nl> } <nl> <nl> } } / / namespace at : : native <nl> mmm a / aten / src / ATen / native / quantized / cpu / qlinear . cpp <nl> ppp b / aten / src / ATen / native / quantized / cpu / qlinear . cpp <nl> class QLinearInt8 final { <nl> } ; <nl> <nl> TORCH_LIBRARY_IMPL ( quantized , QuantizedCPU , m ) { <nl> - m . impl ( " linear " , QLinearInt8 < false > : : run ) ; <nl> - m . impl ( " linear_relu " , QLinearInt8 < true > : : run ) ; <nl> + m . impl ( " linear " , TORCH_FN ( QLinearInt8 < false > : : run ) ) ; <nl> + m . impl ( " linear_relu " , TORCH_FN ( QLinearInt8 < true > : : run ) ) ; <nl> } <nl> <nl> TORCH_LIBRARY_IMPL ( _quantized , QuantizedCPU , m ) { <nl> - m . impl ( " linear " , QLinearInt8 < false > : : run ) ; <nl> + m . impl ( " linear " , TORCH_FN ( QLinearInt8 < false > : : run ) ) ; <nl> } <nl> <nl> } / / namespace <nl> mmm a / aten / src / ATen / native / quantized / cpu / qlinear_dynamic . cpp <nl> ppp b / aten / src / ATen / native / quantized / cpu / qlinear_dynamic . cpp <nl> class QLinearDynamicFp16 final { <nl> } ; <nl> <nl> TORCH_LIBRARY_IMPL ( quantized , CPU , m ) { <nl> - m . impl ( " linear_dynamic " , QLinearDynamicInt8 < false > : : run ) ; <nl> - m . impl ( " linear_relu_dynamic " , QLinearDynamicInt8 < true > : : run ) ; <nl> - m . impl ( " linear_dynamic_fp16 " , QLinearDynamicFp16 < false > : : run ) ; <nl> + m . impl ( " linear_dynamic " , TORCH_FN ( QLinearDynamicInt8 < false > : : run ) ) ; <nl> + m . impl ( " linear_relu_dynamic " , TORCH_FN ( QLinearDynamicInt8 < true > : : run ) ) ; <nl> + m . impl ( " linear_dynamic_fp16 " , TORCH_FN ( QLinearDynamicFp16 < false > : : run ) ) ; <nl> } <nl> <nl> TORCH_LIBRARY_IMPL ( _quantized , CPU , m ) { <nl> - m . impl ( " linear_dynamic " , QLinearDynamicInt8 < false > : : run ) ; <nl> + m . impl ( " linear_dynamic " , TORCH_FN ( QLinearDynamicInt8 < false > : : run ) ) ; <nl> } <nl> <nl> } / / namespace <nl> mmm a / aten / src / ATen / native / quantized / cpu / qlinear_prepack . cpp <nl> ppp b / aten / src / ATen / native / quantized / cpu / qlinear_prepack . cpp <nl> class QLinearPackWeightFp16Legacy final { <nl> } ; <nl> <nl> TORCH_LIBRARY_IMPL ( quantized , QuantizedCPU , m ) { <nl> - m . impl ( " linear_prepack " , QLinearPackWeightInt8 : : run ) ; <nl> - m . impl ( " linear_prepack_legacy " , QLinearPackWeightInt8Legacy : : run ) ; <nl> + m . impl ( " linear_prepack " , TORCH_FN ( QLinearPackWeightInt8 : : run ) ) ; <nl> + m . impl ( " linear_prepack_legacy " , TORCH_FN ( QLinearPackWeightInt8Legacy : : run ) ) ; <nl> } <nl> <nl> TORCH_LIBRARY_IMPL ( quantized , CPU , m ) { <nl> - m . impl ( " linear_prepack_fp16 " , QLinearPackWeightFp16 : : run ) ; <nl> - m . impl ( " linear_prepack_fp16_legacy " , QLinearPackWeightFp16Legacy : : run ) ; <nl> + m . impl ( " linear_prepack_fp16 " , TORCH_FN ( QLinearPackWeightFp16 : : run ) ) ; <nl> + m . impl ( " linear_prepack_fp16_legacy " , TORCH_FN ( QLinearPackWeightFp16Legacy : : run ) ) ; <nl> } <nl> <nl> TORCH_LIBRARY_IMPL ( _quantized , QuantizedCPU , m ) { <nl> - m . impl ( " linear_prepack " , QLinearPackWeightInt8 : : run ) ; <nl> + m . impl ( " linear_prepack " , TORCH_FN ( QLinearPackWeightInt8 : : run ) ) ; <nl> } <nl> <nl> TORCH_LIBRARY_IMPL ( _quantized , CPU , m ) { <nl> - m . impl ( " linear_prepack_fp16 " , QLinearPackWeightFp16 : : run ) ; <nl> - m . impl ( " linear_prepack_fp16_legacy " , QLinearPackWeightFp16Legacy : : run ) ; <nl> + m . impl ( " linear_prepack_fp16 " , TORCH_FN ( QLinearPackWeightFp16 : : run ) ) ; <nl> + m . impl ( " linear_prepack_fp16_legacy " , TORCH_FN ( QLinearPackWeightFp16Legacy : : run ) ) ; <nl> } <nl> <nl> } / / namespace <nl> mmm a / aten / src / ATen / native / quantized / cpu / qlinear_unpack . cpp <nl> ppp b / aten / src / ATen / native / quantized / cpu / qlinear_unpack . cpp <nl> class QLinearUnpackWeightFp16Legacy final { <nl> } ; <nl> <nl> TORCH_LIBRARY_IMPL ( quantized , CPU , m ) { <nl> - m . impl ( " linear_unpack . legacy " , QLinearUnpackWeightInt8Legacy : : run ) ; <nl> - m . impl ( " linear_unpack_fp16 . legacy " , QLinearUnpackWeightFp16Legacy : : run ) ; <nl> + m . impl ( " linear_unpack . legacy " , TORCH_FN ( QLinearUnpackWeightInt8Legacy : : run ) ) ; <nl> + m . impl ( " linear_unpack_fp16 . legacy " , TORCH_FN ( QLinearUnpackWeightFp16Legacy : : run ) ) ; <nl> } <nl> <nl> TORCH_LIBRARY_IMPL ( quantized , CatchAll , m ) { <nl> - m . impl ( " linear_unpack " , QLinearUnpackWeightInt8 : : run ) ; <nl> - m . impl ( " linear_unpack_fp16 " , QLinearUnpackWeightFp16 : : run ) ; <nl> + m . impl ( " linear_unpack " , TORCH_FN ( QLinearUnpackWeightInt8 : : run ) ) ; <nl> + m . impl ( " linear_unpack_fp16 " , TORCH_FN ( QLinearUnpackWeightFp16 : : run ) ) ; <nl> } <nl> <nl> } / / namespace <nl> mmm a / aten / src / ATen / native / quantized / cpu / qmul . cpp <nl> ppp b / aten / src / ATen / native / quantized / cpu / qmul . cpp <nl> class QMulScalarTensorOut final { <nl> } ; <nl> <nl> TORCH_LIBRARY_IMPL ( quantized , QuantizedCPU , m ) { <nl> - m . impl ( " mul " , QMul < / * ReLUFused = * / false > : : run ) ; <nl> - m . impl ( " mul_relu " , QMul < / * ReLUFused = * / true > : : run ) ; <nl> - m . impl ( " mul_out " , QMulOut < / * ReLUFused = * / false > : : run ) ; <nl> - m . impl ( " mul_relu_out " , QMulOut < / * ReLUFused = * / true > : : run ) ; <nl> - m . impl ( " mul_scalar " , QMulScalar < / * ReLUFused = * / false > : : run ) ; <nl> - m . impl ( " mul_scalar_relu " , QMulScalar < / * ReLUFused = * / true > : : run ) ; <nl> - m . impl ( " mul_scalar_out " , QMulScalarOut < / * ReLUFused = * / false > : : run ) ; <nl> - m . impl ( " mul_scalar_relu_out " , QMulScalarOut < / * ReLUFused = * / true > : : run ) ; <nl> + m . impl ( " mul " , TORCH_FN ( QMul < / * ReLUFused = * / false > : : run ) ) ; <nl> + m . impl ( " mul_relu " , TORCH_FN ( QMul < / * ReLUFused = * / true > : : run ) ) ; <nl> + m . impl ( " mul_out " , TORCH_FN ( QMulOut < / * ReLUFused = * / false > : : run ) ) ; <nl> + m . impl ( " mul_relu_out " , TORCH_FN ( QMulOut < / * ReLUFused = * / true > : : run ) ) ; <nl> + m . impl ( " mul_scalar " , TORCH_FN ( QMulScalar < / * ReLUFused = * / false > : : run ) ) ; <nl> + m . impl ( " mul_scalar_relu " , TORCH_FN ( QMulScalar < / * ReLUFused = * / true > : : run ) ) ; <nl> + m . impl ( " mul_scalar_out " , TORCH_FN ( QMulScalarOut < / * ReLUFused = * / false > : : run ) ) ; <nl> + m . impl ( " mul_scalar_relu_out " , TORCH_FN ( QMulScalarOut < / * ReLUFused = * / true > : : run ) ) ; <nl> / / TODO : remove after broadcasting is supported <nl> - m . impl ( " mul_scalar . Tensor " , QMulScalarTensor < / * ReLUFused = * / false > : : run ) ; <nl> - m . impl ( " mul_scalar_relu . Tensor " , QMulScalarTensor < / * ReLUFused = * / true > : : run ) ; <nl> - m . impl ( " mul_scalar_out . Tensor " , QMulScalarTensorOut < / * ReLUFused = * / false > : : run ) ; <nl> - m . impl ( " mul_scalar_relu_out . Tensor " , QMulScalarTensorOut < / * ReLUFused = * / true > : : run ) ; <nl> + m . impl ( " mul_scalar . Tensor " , TORCH_FN ( QMulScalarTensor < / * ReLUFused = * / false > : : run ) ) ; <nl> + m . impl ( " mul_scalar_relu . Tensor " , TORCH_FN ( QMulScalarTensor < / * ReLUFused = * / true > : : run ) ) ; <nl> + m . impl ( " mul_scalar_out . Tensor " , TORCH_FN ( QMulScalarTensorOut < / * ReLUFused = * / false > : : run ) ) ; <nl> + m . impl ( " mul_scalar_relu_out . Tensor " , TORCH_FN ( QMulScalarTensorOut < / * ReLUFused = * / true > : : run ) ) ; <nl> } <nl> <nl> } / / namespace <nl> mmm a / aten / src / ATen / native / quantized / cpu / qpool . cpp <nl> ppp b / aten / src / ATen / native / quantized / cpu / qpool . cpp <nl> class QMaxPool2D_arr_args final { <nl> } ; <nl> <nl> TORCH_LIBRARY_IMPL ( quantized , QuantizedCPU , m ) { <nl> - m . impl ( " max_pool2d " , QMaxPool2D_arr_args : : run ) ; <nl> + m . impl ( " max_pool2d " , TORCH_FN ( QMaxPool2D_arr_args : : run ) ) ; <nl> } <nl> <nl> } / / namespace <nl> mmm a / aten / src / ATen / native / quantized / cpu / qrelu . cpp <nl> ppp b / aten / src / ATen / native / quantized / cpu / qrelu . cpp <nl> class QRelu6 final { <nl> } ; <nl> <nl> TORCH_LIBRARY_IMPL ( quantized , QuantizedCPU , m ) { <nl> - m . impl ( " relu6 " , QRelu6 : : run ) ; <nl> + m . impl ( " relu6 " , TORCH_FN ( QRelu6 : : run ) ) ; <nl> } <nl> <nl> } / / namespace <nl> mmm a / aten / src / ATen / native / quantized / cpu / qthreshold . cpp <nl> ppp b / aten / src / ATen / native / quantized / cpu / qthreshold . cpp <nl> Tensor quantized_threshold ( <nl> } <nl> <nl> TORCH_LIBRARY_IMPL ( quantized , QuantizedCPU , m ) { <nl> - m . impl ( " threshold " , quantized_threshold ) ; <nl> + m . impl ( " threshold " , TORCH_FN ( quantized_threshold ) ) ; <nl> } <nl> <nl> } / / namespace native <nl> mmm a / aten / src / ATen / native / vulkan / VulkanRegisterOpContextClass . cpp <nl> ppp b / aten / src / ATen / native / vulkan / VulkanRegisterOpContextClass . cpp <nl> TORCH_LIBRARY ( vulkan_prepack , m ) { <nl> } <nl> <nl> TORCH_LIBRARY_IMPL ( vulkan_prepack , CPU , m ) { <nl> - m . impl ( " conv2d_clamp_prepack " , createConv2dClampPrePackOpContext ) ; <nl> + m . impl ( " conv2d_clamp_prepack " , TORCH_FN ( createConv2dClampPrePackOpContext ) ) ; <nl> } <nl> <nl> TORCH_LIBRARY_IMPL ( vulkan_prepack , Vulkan , m ) { <nl> mmm a / aten / src / ATen / native / xnnpack / RegisterOpContextClass . cpp <nl> ppp b / aten / src / ATen / native / xnnpack / RegisterOpContextClass . cpp <nl> TORCH_LIBRARY ( prepacked , m ) { <nl> } <nl> <nl> TORCH_LIBRARY_IMPL ( prepacked , CPU , m ) { <nl> - m . impl ( " linear_clamp_prepack " , createLinearClampPrePackOpContext ) ; <nl> - m . impl ( " linear_clamp_run " , internal : : linear : : linear_clamp_run ) ; <nl> - m . impl ( " conv2d_clamp_prepack " , createConv2dClampPrePackOpContext ) ; <nl> - m . impl ( " conv2d_clamp_run " , internal : : convolution2d : : conv2d_clamp_run ) ; <nl> + m . impl ( " linear_clamp_prepack " , TORCH_FN ( createLinearClampPrePackOpContext ) ) ; <nl> + m . impl ( " linear_clamp_run " , TORCH_FN ( internal : : linear : : linear_clamp_run ) ) ; <nl> + m . impl ( " conv2d_clamp_prepack " , TORCH_FN ( createConv2dClampPrePackOpContext ) ) ; <nl> + m . impl ( " conv2d_clamp_run " , TORCH_FN ( internal : : convolution2d : : conv2d_clamp_run ) ) ; <nl> } <nl> <nl> } / / namespace xnnpack <nl> mmm a / aten / src / ATen / templates / BackendSelectRegister . cpp <nl> ppp b / aten / src / ATen / templates / BackendSelectRegister . cpp <nl> namespace { <nl> <nl> $ { backend_select_method_definitions } <nl> <nl> - static auto registry = torch : : RegisterOperators ( ) <nl> + TORCH_LIBRARY_IMPL ( aten , BackendSelect , m ) { <nl> $ { backend_select_function_registrations } ; <nl> - <nl> + } <nl> <nl> } / / namespace <nl> } / / at <nl> new file mode 100644 <nl> index 000000000000 . . d94243294693 <nl> mmm / dev / null <nl> ppp b / c10 / core / CompileTimeFunctionPointer . h <nl> <nl> + # pragma once <nl> + <nl> + # include < c10 / util / TypeTraits . h > <nl> + <nl> + namespace c10 { <nl> + <nl> + / * * <nl> + * Represent a function pointer as a C + + type . <nl> + * This allows using the function pointer as a type <nl> + * in a template and calling it from inside the template <nl> + * allows the compiler to inline the call because it <nl> + * knows the function pointer at compile time . <nl> + * <nl> + * Example 1 : <nl> + * int add ( int a , int b ) { return a + b ; } <nl> + * using Add = TORCH_FN_TYPE ( add ) ; <nl> + * template < class Func > struct Executor { <nl> + * int execute ( int a , int b ) { <nl> + * return Func : : func_ptr ( ) ( a , b ) ; <nl> + * } <nl> + * } ; <nl> + * Executor < Add > executor ; <nl> + * EXPECT_EQ ( 3 , executor . execute ( 1 , 2 ) ) ; <nl> + * <nl> + * Example 2 : <nl> + * int add ( int a , int b ) { return a + b ; } <nl> + * template < class Func > int execute ( Func , int a , int b ) { <nl> + * return Func : : func_ptr ( ) ( a , b ) ; <nl> + * } <nl> + * EXPECT_EQ ( 3 , execute ( TORCH_FN ( add ) , 1 , 2 ) ) ; <nl> + * / <nl> + template < class FuncType_ , FuncType_ * func_ptr_ > <nl> + struct CompileTimeFunctionPointer final { <nl> + static_assert ( guts : : is_function_type < FuncType_ > : : value , " TORCH_FN can only wrap function types . " ) ; <nl> + using FuncType = FuncType_ ; <nl> + <nl> + static constexpr FuncType * func_ptr ( ) { <nl> + return func_ptr_ ; <nl> + } <nl> + } ; <nl> + <nl> + template < class T > struct is_compile_time_function_pointer : std : : false_type { } ; <nl> + template < class FuncType , FuncType * func_ptr > <nl> + struct is_compile_time_function_pointer < CompileTimeFunctionPointer < FuncType , func_ptr > > : std : : true_type { } ; <nl> + <nl> + } <nl> + <nl> + # define TORCH_FN_TYPE ( func ) : : c10 : : CompileTimeFunctionPointer < std : : remove_pointer_t < std : : remove_reference_t < decltype ( func ) > > , func > <nl> + # define TORCH_FN ( func ) TORCH_FN_TYPE ( func ) ( ) <nl> new file mode 100644 <nl> index 000000000000 . . a24b19870e64 <nl> mmm / dev / null <nl> ppp b / c10 / test / core / CompileTimeFunctionPointer_test . cpp <nl> <nl> + # include < c10 / core / CompileTimeFunctionPointer . h > <nl> + # include < gtest / gtest . h > <nl> + <nl> + namespace test_is_compile_time_function_pointer { <nl> + static_assert ( ! c10 : : is_compile_time_function_pointer < void ( ) > : : value , " " ) ; <nl> + <nl> + void dummy ( ) { } <nl> + static_assert ( c10 : : is_compile_time_function_pointer < TORCH_FN_TYPE ( dummy ) > : : value , " " ) ; <nl> + } <nl> + <nl> + namespace test_access_through_type { <nl> + void dummy ( ) { } <nl> + using dummy_ptr = TORCH_FN_TYPE ( dummy ) ; <nl> + static_assert ( c10 : : is_compile_time_function_pointer < dummy_ptr > : : value , " " ) ; <nl> + static_assert ( dummy_ptr : : func_ptr ( ) = = & dummy , " " ) ; <nl> + static_assert ( std : : is_same < void ( ) , dummy_ptr : : FuncType > : : value , " " ) ; <nl> + } <nl> + <nl> + namespace test_access_through_value { <nl> + void dummy ( ) { } <nl> + constexpr auto dummy_ptr = TORCH_FN ( dummy ) ; <nl> + static_assert ( dummy_ptr . func_ptr ( ) = = & dummy , " " ) ; <nl> + static_assert ( std : : is_same < void ( ) , decltype ( dummy_ptr ) : : FuncType > : : value , " " ) ; <nl> + } <nl> + <nl> + namespace test_access_through_type_also_works_if_specified_as_pointer { <nl> + void dummy ( ) { } <nl> + using dummy_ptr = TORCH_FN_TYPE ( & dummy ) ; <nl> + static_assert ( c10 : : is_compile_time_function_pointer < dummy_ptr > : : value , " " ) ; <nl> + static_assert ( dummy_ptr : : func_ptr ( ) = = & dummy , " " ) ; <nl> + static_assert ( std : : is_same < void ( ) , dummy_ptr : : FuncType > : : value , " " ) ; <nl> + } <nl> + <nl> + namespace test_access_through_value_also_works_if_specified_as_pointer { <nl> + void dummy ( ) { } <nl> + constexpr auto dummy_ptr = TORCH_FN ( & dummy ) ; <nl> + static_assert ( dummy_ptr . func_ptr ( ) = = & dummy , " " ) ; <nl> + static_assert ( std : : is_same < void ( ) , decltype ( dummy_ptr ) : : FuncType > : : value , " " ) ; <nl> + } <nl> + <nl> + namespace test_run_through_type { <nl> + int add ( int a , int b ) { return a + b ; } <nl> + using Add = TORCH_FN_TYPE ( add ) ; <nl> + template < class Func > struct Executor { <nl> + int execute ( int a , int b ) { <nl> + return Func : : func_ptr ( ) ( a , b ) ; <nl> + } <nl> + } ; <nl> + <nl> + TEST ( CompileTimeFunctionPointerTest , runFunctionThroughType ) { <nl> + Executor < Add > executor ; <nl> + EXPECT_EQ ( 3 , executor . execute ( 1 , 2 ) ) ; <nl> + } <nl> + } <nl> + <nl> + namespace test_run_through_value { <nl> + int add ( int a , int b ) { return a + b ; } <nl> + template < class Func > int execute ( Func , int a , int b ) { <nl> + return Func : : func_ptr ( ) ( a , b ) ; <nl> + } <nl> + <nl> + TEST ( CompileTimeFunctionPointerTest , runFunctionThroughValue ) { <nl> + EXPECT_EQ ( 3 , execute ( TORCH_FN ( add ) , 1 , 2 ) ) ; <nl> + } <nl> + } <nl> mmm a / test / mobile / op_deps / simple_ops . cpp <nl> ppp b / test / mobile / op_deps / simple_ops . cpp <nl> TORCH_LIBRARY ( _test , m ) { <nl> m . impl ( " AA " , torch : : CppFunction : : makeUnboxedOnly ( AA_op ) ) ; <nl> <nl> m . def ( " BB ( Tensor self ) - > Tensor " ) ; <nl> - m . impl ( " BB " , & BB_op ) ; <nl> + m . impl ( " BB " , TORCH_FN ( BB_op ) ) ; <nl> <nl> - m . def ( " CC ( Tensor self ) - > Tensor " , & CC_op ) ; <nl> - m . def ( " DD " , & DD_op ) ; <nl> + m . def ( " CC ( Tensor self ) - > Tensor " , TORCH_FN ( CC_op ) ) ; <nl> + m . def ( " DD " , TORCH_FN ( DD_op ) ) ; <nl> } <nl> <nl> TORCH_LIBRARY_FRAGMENT_THIS_API_IS_FOR_PER_OP_REGISTRATION_ONLY ( _test , m ) { <nl> mmm a / tools / autograd / gen_variable_type . py <nl> ppp b / tools / autograd / gen_variable_type . py <nl> <nl> " " " ) <nl> <nl> UNBOXEDONLY_WRAPPER_REGISTRATION = CodeTemplate ( " " " \ <nl> - m . impl_UNBOXED ( " $ { unqual_operator_name_with_overload } " , $ { class_type } : : $ { type_wrapper_name } ) ; <nl> + m . impl_UNBOXED ( " $ { unqual_operator_name_with_overload } " , & $ { class_type } : : $ { type_wrapper_name } ) ; <nl> " " " ) <nl> <nl> WRAPPER_REGISTRATION = CodeTemplate ( " " " \ <nl> - m . impl ( " $ { unqual_operator_name_with_overload } " , $ { class_type } : : $ { type_wrapper_name } ) ; <nl> + m . impl ( " $ { unqual_operator_name_with_overload } " , TORCH_FN ( $ { class_type } : : $ { type_wrapper_name } ) ) ; <nl> " " " ) <nl> <nl> UNPACK_TENSOR = CodeTemplate ( " " " \ <nl> mmm a / torch / csrc / autograd / VariableTypeManual . cpp <nl> ppp b / torch / csrc / autograd / VariableTypeManual . cpp <nl> static auto registry = torch : : RegisterOperators ( ) <nl> . op ( torch : : RegisterOperators : : options ( ) <nl> . schema ( " aten : : detach ( Tensor self ) - > Tensor " ) <nl> . aliasAnalysis ( AliasAnalysisKind : : FROM_SCHEMA ) <nl> - . kernel < decltype ( VariableType : : detach ) > ( DispatchKey : : Autograd , & VariableType : : detach ) ) <nl> + . kernel < decltype ( VariableType : : detach ) , & VariableType : : detach > ( DispatchKey : : Autograd ) ) <nl> . op ( torch : : RegisterOperators : : options ( ) <nl> . schema ( " aten : : detach_ ( Tensor ( a ! ) self ) - > Tensor ( a ! ) " ) <nl> . aliasAnalysis ( AliasAnalysisKind : : FROM_SCHEMA ) <nl> mmm a / torch / csrc / jit / mobile / register_mobile_autograd . cpp <nl> ppp b / torch / csrc / jit / mobile / register_mobile_autograd . cpp <nl> void log_softmax_kernel ( const c10 : : OperatorHandle & op , Stack * stack ) { <nl> <nl> / / NB ! This is _aten , not aten ! ! ! <nl> TORCH_LIBRARY_IMPL ( _aten , Autograd , m ) { <nl> - m . impl ( " add . Scalar " , torch : : autograd : : VariableType : : add_Scalar ) ; <nl> - m . impl ( " mul . Tensor " , torch : : autograd : : VariableType : : mul_Tensor ) ; <nl> + m . impl ( " add . Scalar " , TORCH_FN ( torch : : autograd : : VariableType : : add_Scalar ) ) ; <nl> + m . impl ( " mul . Tensor " , TORCH_FN ( torch : : autograd : : VariableType : : mul_Tensor ) ) ; <nl> m . impl ( " conv2d " , torch : : CppFunction : : makeFromBoxedFunction < conv2d_kernel > ( ) ) ; <nl> - m . impl ( " dropout " , VariableType : : dropout ) ; <nl> - m . impl ( " feature_dropout " , VariableType : : feature_dropout ) ; <nl> + m . impl ( " dropout " , TORCH_FN ( VariableType : : dropout ) ) ; <nl> + m . impl ( " feature_dropout " , TORCH_FN ( VariableType : : feature_dropout ) ) ; <nl> m . impl ( <nl> " log_softmax . int " , <nl> torch : : CppFunction : : makeFromBoxedFunction < log_softmax_kernel > ( ) ) ; <nl> TORCH_LIBRARY_IMPL ( _aten , Autograd , m ) { <nl> dilation . vec ( ) , <nl> ceil_mode ) ; <nl> } ) ; <nl> - m . impl ( " relu " , VariableType : : relu ) ; <nl> + m . impl ( " relu " , TORCH_FN ( VariableType : : relu ) ) ; <nl> m . impl ( " view " , torch : : CppFunction : : makeFromBoxedFunction < view_kernel > ( ) ) ; <nl> - m . impl ( " t " , VariableType : : t ) ; <nl> - m . impl ( " addmm " , VariableType : : addmm ) ; <nl> + m . impl ( " t " , TORCH_FN ( VariableType : : t ) ) ; <nl> + m . impl ( " addmm " , TORCH_FN ( VariableType : : addmm ) ) ; <nl> } <nl> } / / anonymous namespace <nl> mmm a / torch / csrc / jit / runtime / register_string_ops . cpp <nl> ppp b / torch / csrc / jit / runtime / register_string_ops . cpp <nl> TORCH_LIBRARY_IMPL ( aten , CatchAll , m ) { <nl> return splits ; <nl> } ) ; <nl> <nl> - m . impl ( " slice . str " , stringSlice ) ; <nl> + m . impl ( " slice . str " , TORCH_FN ( stringSlice ) ) ; <nl> <nl> / / upper and lower require there to be at least one alpha character , <nl> / / and ignore all other characters <nl> mmm a / torch / library . h <nl> ppp b / torch / library . h <nl> class CAFFE2_API CppFunction final { <nl> , debug_ ( ) <nl> { } <nl> <nl> + / / This overload accepts compile time function pointers , e . g . , CppFunction ( TORCH_FN ( add_impl ) ) <nl> + template < typename FuncPtr > <nl> + explicit CppFunction ( FuncPtr f , std : : enable_if_t < c10 : : is_compile_time_function_pointer < FuncPtr > : : value , std : : nullptr_t > = nullptr ) <nl> + : func_ ( c10 : : KernelFunction : : makeFromUnboxedRuntimeFunction ( f . func_ptr ( ) ) ) <nl> + / / TODO : Don ' t go through WrapRuntimeKernelFunctor <nl> + , schema_ ( c10 : : detail : : inferFunctionSchemaFromFunctor < c10 : : impl : : WrapFunctionIntoRuntimeFunctor < std : : decay_t < typename FuncPtr : : FuncType > > > ( ) ) <nl> + , debug_ ( ) <nl> + { } <nl> + <nl> / / This overload accepts lambdas , e . g . , CppFunction ( [ ] ( const Tensor & self ) { . . . } ) <nl> template < typename Lambda > <nl> explicit CppFunction ( Lambda & & f , std : : enable_if_t < c10 : : guts : : is_functor < std : : decay_t < Lambda > > : : value , std : : nullptr_t > = nullptr ) <nl> | Back out " Revert D21986243 : TORCH_FN " ( ) | pytorch/pytorch | f69b72c73895bf345e290f6a8e3b2658ac037e3f | 2020-06-16T20:38:29Z |
mmm a / src / date - delay . js <nl> ppp b / src / date - delay . js <nl> function DateToTimeString ( ) { <nl> } ; <nl> <nl> <nl> + / / ECMA 262 - 15 . 9 . 5 . 7 <nl> + function DateToLocaleTimeString ( ) { <nl> + var t = GetTimeFrom ( this ) ; <nl> + if ( $ isNaN ( t ) ) return kInvalidDate ; <nl> + var lt = LocalTime ( t ) ; <nl> + return TimeString ( lt ) ; <nl> + } ; <nl> + <nl> + <nl> / / ECMA 262 - 15 . 9 . 5 . 9 <nl> function DateGetTime ( ) { <nl> return GetTimeFrom ( this ) ; <nl> function SetupDate ( ) { <nl> toTimeString : DateToTimeString , <nl> toLocaleString : DateToString , <nl> toLocaleDateString : DateToDateString , <nl> - toLocaleTimeString : DateToTimeString , <nl> + toLocaleTimeString : DateToLocaleTimeString , <nl> valueOf : DateGetTime , <nl> getTime : DateGetTime , <nl> getFullYear : DateGetFullYear , <nl> mmm a / test / mjsunit / date . js <nl> ppp b / test / mjsunit / date . js <nl> l . setUTCMilliseconds ( ) ; <nl> l . setUTCMilliseconds ( 2 ) ; <nl> assertTrue ( isNaN ( l . getUTCMilliseconds ( ) ) ) ; <nl> <nl> + / / Test that toLocaleTimeString only returns the time portion of the <nl> + / / date without the timezone information . <nl> + function testToLocaleTimeString ( ) { <nl> + var d = new Date ( ) ; <nl> + var s = d . toLocaleTimeString ( ) ; <nl> + assertEquals ( 8 , s . length ) ; <nl> + } <nl> + <nl> + testToLocaleTimeString ( ) ; <nl> | Make Date . prototype . toTimeString and Date . prototype . toLocaleTimeString | v8/v8 | 552e5f831fd22e6ebd02cf0432c5cf3cc9972e3d | 2008-09-04T07:13:21Z |
mmm a / Telegram / SourceFiles / boxes / send_files_box . cpp <nl> ppp b / Telegram / SourceFiles / boxes / send_files_box . cpp <nl> class SendFilesBox : : AlbumPreview : public Ui : : RpWidget { <nl> void updateSizeAnimated ( const std : : vector < Ui : : GroupMediaLayout > & layout ) ; <nl> void updateSize ( ) ; <nl> <nl> + int thumbIndexUnderCursor ( ) ; <nl> void deleteThumbUnderCursor ( ) ; <nl> <nl> void paintAlbum ( Painter & p ) const ; <nl> void SendFilesBox : : AlbumPreview : : paintFiles ( Painter & p , QRect clip ) const { <nl> } <nl> } <nl> <nl> - void SendFilesBox : : AlbumPreview : : deleteThumbUnderCursor ( ) { <nl> + int SendFilesBox : : AlbumPreview : : thumbIndexUnderCursor ( ) { <nl> const auto thumb = findThumb ( mapFromGlobal ( QCursor : : pos ( ) ) ) ; <nl> if ( ! thumb ) { <nl> - return ; <nl> + return - 1 ; <nl> } <nl> const auto thumbIt = ranges : : find_if ( _thumbs , [ & ] ( auto & t ) { <nl> return t . get ( ) = = thumb ; <nl> } ) ; <nl> - const auto index = std : : distance ( _thumbs . begin ( ) , thumbIt ) ; <nl> + Expects ( thumbIt ! = _thumbs . end ( ) ) ; <nl> + return std : : distance ( _thumbs . begin ( ) , thumbIt ) ; <nl> + } <nl> + <nl> + void SendFilesBox : : AlbumPreview : : deleteThumbUnderCursor ( ) { <nl> + auto index = thumbIndexUnderCursor ( ) ; <nl> + if ( index < 0 ) { <nl> + return ; <nl> + } <nl> const auto orderIt = ranges : : find ( _order , index ) ; <nl> Expects ( orderIt ! = _order . end ( ) ) ; <nl> <nl> _order . erase ( orderIt ) ; <nl> - for ( auto i = orderIt ; i ! = _order . end ( ) ; i + + ) { <nl> - if ( ( * i ) > index ) { <nl> - ( * i ) - - ; <nl> + ranges : : for_each ( _order , [ = ] ( auto & i ) { <nl> + if ( i > index ) { <nl> + i - - ; <nl> } <nl> - } <nl> - _thumbDeleted . fire ( index ) ; <nl> + } ) ; <nl> + _thumbDeleted . fire ( std : : move ( index ) ) ; <nl> } <nl> <nl> void SendFilesBox : : AlbumPreview : : mousePressEvent ( QMouseEvent * e ) { <nl> void SendFilesBox : : prepareAlbumPreview ( ) { <nl> _list , <nl> _sendWay - > value ( ) ) ) ; <nl> <nl> + addThumbButtonHandlers ( ) ; <nl> + <nl> + _preview = wrap ; <nl> + _albumPreview - > show ( ) ; <nl> + setupShadows ( wrap , _albumPreview ) ; <nl> + <nl> + initPreview ( _albumPreview - > desiredHeightValue ( ) ) ; <nl> + } <nl> + <nl> + void SendFilesBox : : addThumbButtonHandlers ( ) { <nl> _albumPreview - > thumbDeleted ( <nl> ) | rpl : : start_with_next ( [ = ] ( auto index ) { <nl> <nl> void SendFilesBox : : prepareAlbumPreview ( ) { <nl> <nl> } , _albumPreview - > lifetime ( ) ) ; <nl> <nl> - _preview = wrap ; <nl> - _albumPreview - > show ( ) ; <nl> - setupShadows ( wrap , _albumPreview ) ; <nl> - <nl> - initPreview ( _albumPreview - > desiredHeightValue ( ) ) ; <nl> } <nl> <nl> void SendFilesBox : : setupShadows ( <nl> mmm a / Telegram / SourceFiles / boxes / send_files_box . h <nl> ppp b / Telegram / SourceFiles / boxes / send_files_box . h <nl> class SendFilesBox : public Ui : : BoxContent { <nl> void updateControlsGeometry ( ) ; <nl> void updateCaptionPlaceholder ( ) ; <nl> <nl> + void addThumbButtonHandlers ( ) ; <nl> + <nl> bool canAddFiles ( not_null < const QMimeData * > data ) const ; <nl> bool canAddUrls ( const QList < QUrl > & urls ) const ; <nl> bool addFiles ( not_null < const QMimeData * > data ) ; <nl> | Split some things into different methods in SendFilesBox . | telegramdesktop/tdesktop | a26e4eee1876c69125ac32c3deea1bbc64f437dc | 2020-01-23T07:09:33Z |
mmm a / src / system / gen / php / classes / arrayaccess . cpp <nl> ppp b / src / system / gen / php / classes / arrayaccess . cpp <nl> <nl> / / @ generated by HipHop Compiler <nl> <nl> # include < php / classes / arrayaccess . h > <nl> + # include < php / classes / arrayaccess . fws . h > <nl> # include < runtime / ext / ext . h > <nl> # include < runtime / eval / eval . h > <nl> <nl> new file mode 100644 <nl> index 00000000000 . . 3b3ae4571ec <nl> mmm / dev / null <nl> ppp b / src / system / gen / php / classes / arrayaccess . fws . h <nl> <nl> + / * <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | HipHop for PHP | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | Copyright ( c ) 2010 Facebook , Inc . ( http : / / www . facebook . com ) | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | This source file is subject to version 3 . 01 of the PHP license , | <nl> + | that is bundled with this package in the file LICENSE , and is | <nl> + | available through the world - wide - web at the following url : | <nl> + | http : / / www . php . net / license / 3_01 . txt | <nl> + | If you did not receive a copy of the PHP license and are unable to | <nl> + | obtain it through the world - wide - web , please send a note to | <nl> + | license @ php . net so we can mail you a copy immediately . | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + * / <nl> + / / @ generated by HipHop Compiler <nl> + <nl> + # ifndef __GENERATED_php_classes_arrayaccess_fws_h0e85a4ac__ <nl> + # define __GENERATED_php_classes_arrayaccess_fws_h0e85a4ac__ <nl> + <nl> + <nl> + namespace HPHP { <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + / / 1 . Static Strings <nl> + <nl> + / / 2 . Static Arrays <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + } <nl> + <nl> + <nl> + # endif / / __GENERATED_php_classes_arrayaccess_fws_h0e85a4ac__ <nl> mmm a / src / system / gen / php / classes / debugger . cpp <nl> ppp b / src / system / gen / php / classes / debugger . cpp <nl> <nl> / / @ generated by HipHop Compiler <nl> <nl> # include < php / classes / debugger . h > <nl> + # include < php / classes / debugger . fws . h > <nl> # include < runtime / ext / ext . h > <nl> # include < runtime / eval / eval . h > <nl> <nl> new file mode 100644 <nl> index 00000000000 . . cf169a85004 <nl> mmm / dev / null <nl> ppp b / src / system / gen / php / classes / debugger . fws . h <nl> <nl> + / * <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | HipHop for PHP | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | Copyright ( c ) 2010 Facebook , Inc . ( http : / / www . facebook . com ) | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | This source file is subject to version 3 . 01 of the PHP license , | <nl> + | that is bundled with this package in the file LICENSE , and is | <nl> + | available through the world - wide - web at the following url : | <nl> + | http : / / www . php . net / license / 3_01 . txt | <nl> + | If you did not receive a copy of the PHP license and are unable to | <nl> + | obtain it through the world - wide - web , please send a note to | <nl> + | license @ php . net so we can mail you a copy immediately . | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + * / <nl> + / / @ generated by HipHop Compiler <nl> + <nl> + # ifndef __GENERATED_php_classes_debugger_fws_h502f1f8a__ <nl> + # define __GENERATED_php_classes_debugger_fws_h502f1f8a__ <nl> + <nl> + <nl> + namespace HPHP { <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + / / 1 . Static Strings <nl> + <nl> + / / 2 . Static Arrays <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + } <nl> + <nl> + <nl> + # endif / / __GENERATED_php_classes_debugger_fws_h502f1f8a__ <nl> mmm a / src / system / gen / php / classes / directory . cpp <nl> ppp b / src / system / gen / php / classes / directory . cpp <nl> <nl> / / @ generated by HipHop Compiler <nl> <nl> # include < php / classes / directory . h > <nl> + # include < php / classes / directory . fws . h > <nl> # include < runtime / ext / ext . h > <nl> # include < runtime / eval / eval . h > <nl> <nl> mmm a / src / system / gen / php / classes / directory . fw . h <nl> ppp b / src / system / gen / php / classes / directory . fw . h <nl> namespace HPHP { <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> / / 1 . Static Strings <nl> - extern StaticString s_sys_ss229c615f ; <nl> - extern StaticString s_sys_ss4140acbf ; <nl> - extern StaticString s_sys_ss11506c8f ; <nl> - extern StaticString s_sys_ss0babeace ; <nl> - extern StaticString s_sys_ss5977ff8c ; <nl> - extern StaticString s_sys_ss1b610cff ; <nl> - extern StaticString s_sys_ss21d85096 ; <nl> <nl> / / 2 . Static Arrays <nl> <nl> new file mode 100644 <nl> index 00000000000 . . a8237790c7e <nl> mmm / dev / null <nl> ppp b / src / system / gen / php / classes / directory . fws . h <nl> <nl> + / * <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | HipHop for PHP | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | Copyright ( c ) 2010 Facebook , Inc . ( http : / / www . facebook . com ) | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | This source file is subject to version 3 . 01 of the PHP license , | <nl> + | that is bundled with this package in the file LICENSE , and is | <nl> + | available through the world - wide - web at the following url : | <nl> + | http : / / www . php . net / license / 3_01 . txt | <nl> + | If you did not receive a copy of the PHP license and are unable to | <nl> + | obtain it through the world - wide - web , please send a note to | <nl> + | license @ php . net so we can mail you a copy immediately . | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + * / <nl> + / / @ generated by HipHop Compiler <nl> + <nl> + # ifndef __GENERATED_php_classes_directory_fws_h448c8a25__ <nl> + # define __GENERATED_php_classes_directory_fws_h448c8a25__ <nl> + <nl> + <nl> + namespace HPHP { <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + / / 1 . Static Strings <nl> + extern StaticString s_sys_ss229c615f ; <nl> + extern StaticString s_sys_ss4140acbf ; <nl> + extern StaticString s_sys_ss11506c8f ; <nl> + extern StaticString s_sys_ss0babeace ; <nl> + extern StaticString s_sys_ss5977ff8c ; <nl> + extern StaticString s_sys_ss1b610cff ; <nl> + extern StaticString s_sys_ss21d85096 ; <nl> + <nl> + / / 2 . Static Arrays <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + } <nl> + <nl> + <nl> + # endif / / __GENERATED_php_classes_directory_fws_h448c8a25__ <nl> mmm a / src / system / gen / php / classes / exception . cpp <nl> ppp b / src / system / gen / php / classes / exception . cpp <nl> <nl> / / @ generated by HipHop Compiler <nl> <nl> # include < php / classes / exception . h > <nl> + # include < php / classes / exception . fws . h > <nl> # include < runtime / ext / ext . h > <nl> # include < runtime / eval / eval . h > <nl> <nl> mmm a / src / system / gen / php / classes / exception . fw . h <nl> ppp b / src / system / gen / php / classes / exception . fw . h <nl> namespace HPHP { <nl> <nl> / / 1 . Static Strings <nl> extern StaticString s_sys_ss00000000 ; <nl> - extern StaticString s_sys_ss10600e60 ; <nl> - extern StaticString s_sys_ss2e45e4ea ; <nl> - extern StaticString s_sys_ss229c615f ; <nl> - extern StaticString s_sys_ss55f425c0 ; <nl> - extern StaticString s_sys_ss6b4cb5ed ; <nl> - extern StaticString s_sys_ss1b10b1ba ; <nl> - extern StaticString s_sys_ss3cdea590 ; <nl> - extern StaticString s_sys_ss1f74c210 ; <nl> - extern StaticString s_sys_ss7a853247 ; <nl> - extern StaticString s_sys_ss1958457c ; <nl> - extern StaticString s_sys_ss3d6301f5 ; <nl> - extern StaticString s_sys_ss7f49956c ; <nl> - extern StaticString s_sys_ss70cc2eb1 ; <nl> - extern StaticString s_sys_ss58ba5adc ; <nl> - extern StaticString s_sys_ss1dc3d04f ; <nl> - extern StaticString s_sys_ss0f36a862 ; <nl> - extern StaticString s_sys_ss62d8d71d ; <nl> - extern StaticString s_sys_ss13e682d2 ; <nl> - extern StaticString s_sys_ss58af461f ; <nl> - extern StaticString s_sys_ss3b13b346 ; <nl> - extern StaticString s_sys_ss169ecc8a ; <nl> - extern StaticString s_sys_ss2c6c2b8b ; <nl> - extern StaticString s_sys_ss5d552e95 ; <nl> - extern StaticString s_sys_ss30737366 ; <nl> - extern StaticString s_sys_ss64f192b5 ; <nl> - extern StaticString s_sys_ss6b362b85 ; <nl> - extern StaticString s_sys_ss5b143841 ; <nl> - extern StaticString s_sys_ss7e2a01fc ; <nl> - extern StaticString s_sys_ss0958d827 ; <nl> - extern StaticString s_sys_ss089562ad ; <nl> - extern StaticString s_sys_ss18a8b3dc ; <nl> - extern StaticString s_sys_ss05a0ea07 ; <nl> - extern StaticString s_sys_ss2cf0a747 ; <nl> - extern StaticString s_sys_ss1fe107ad ; <nl> - extern StaticString s_sys_ss084f972c ; <nl> - extern StaticString s_sys_ss2e0d3849 ; <nl> <nl> / / 2 . Static Arrays <nl> <nl> new file mode 100644 <nl> index 00000000000 . . 36b7117d1fd <nl> mmm / dev / null <nl> ppp b / src / system / gen / php / classes / exception . fws . h <nl> <nl> + / * <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | HipHop for PHP | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | Copyright ( c ) 2010 Facebook , Inc . ( http : / / www . facebook . com ) | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | This source file is subject to version 3 . 01 of the PHP license , | <nl> + | that is bundled with this package in the file LICENSE , and is | <nl> + | available through the world - wide - web at the following url : | <nl> + | http : / / www . php . net / license / 3_01 . txt | <nl> + | If you did not receive a copy of the PHP license and are unable to | <nl> + | obtain it through the world - wide - web , please send a note to | <nl> + | license @ php . net so we can mail you a copy immediately . | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + * / <nl> + / / @ generated by HipHop Compiler <nl> + <nl> + # ifndef __GENERATED_php_classes_exception_fws_h32dbfdd0__ <nl> + # define __GENERATED_php_classes_exception_fws_h32dbfdd0__ <nl> + <nl> + <nl> + namespace HPHP { <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + / / 1 . Static Strings <nl> + extern StaticString s_sys_ss10600e60 ; <nl> + extern StaticString s_sys_ss2e45e4ea ; <nl> + extern StaticString s_sys_ss229c615f ; <nl> + extern StaticString s_sys_ss55f425c0 ; <nl> + extern StaticString s_sys_ss6b4cb5ed ; <nl> + extern StaticString s_sys_ss1b10b1ba ; <nl> + extern StaticString s_sys_ss3cdea590 ; <nl> + extern StaticString s_sys_ss1f74c210 ; <nl> + extern StaticString s_sys_ss7a853247 ; <nl> + extern StaticString s_sys_ss1958457c ; <nl> + extern StaticString s_sys_ss3d6301f5 ; <nl> + extern StaticString s_sys_ss7f49956c ; <nl> + extern StaticString s_sys_ss70cc2eb1 ; <nl> + extern StaticString s_sys_ss58ba5adc ; <nl> + extern StaticString s_sys_ss1dc3d04f ; <nl> + extern StaticString s_sys_ss0f36a862 ; <nl> + extern StaticString s_sys_ss62d8d71d ; <nl> + extern StaticString s_sys_ss13e682d2 ; <nl> + extern StaticString s_sys_ss58af461f ; <nl> + extern StaticString s_sys_ss3b13b346 ; <nl> + extern StaticString s_sys_ss169ecc8a ; <nl> + extern StaticString s_sys_ss2c6c2b8b ; <nl> + extern StaticString s_sys_ss5d552e95 ; <nl> + extern StaticString s_sys_ss30737366 ; <nl> + extern StaticString s_sys_ss64f192b5 ; <nl> + extern StaticString s_sys_ss6b362b85 ; <nl> + extern StaticString s_sys_ss5b143841 ; <nl> + extern StaticString s_sys_ss7e2a01fc ; <nl> + extern StaticString s_sys_ss0958d827 ; <nl> + extern StaticString s_sys_ss089562ad ; <nl> + extern StaticString s_sys_ss18a8b3dc ; <nl> + extern StaticString s_sys_ss05a0ea07 ; <nl> + extern StaticString s_sys_ss2cf0a747 ; <nl> + extern StaticString s_sys_ss1fe107ad ; <nl> + extern StaticString s_sys_ss084f972c ; <nl> + extern StaticString s_sys_ss2e0d3849 ; <nl> + <nl> + / / 2 . Static Arrays <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + } <nl> + <nl> + <nl> + # endif / / __GENERATED_php_classes_exception_fws_h32dbfdd0__ <nl> mmm a / src / system / gen / php / classes / iterator . cpp <nl> ppp b / src / system / gen / php / classes / iterator . cpp <nl> <nl> # include < php / classes / iterator . h > <nl> # include < php / classes / splfile . h > <nl> # include < php / globals / constants . h > <nl> + # include < php / classes / arrayaccess . fws . h > <nl> + # include < php / classes / exception . fws . h > <nl> + # include < php / classes / iterator . fws . h > <nl> + # include < php / classes / splfile . fws . h > <nl> + # include < php / globals / constants . fws . h > <nl> # include < runtime / ext / ext . h > <nl> # include < runtime / eval / eval . h > <nl> <nl> mmm a / src / system / gen / php / classes / iterator . fw . h <nl> ppp b / src / system / gen / php / classes / iterator . fw . h <nl> namespace HPHP { <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> / / 1 . Static Strings <nl> - extern StaticString s_sys_ss5b908ab0 ; <nl> - extern StaticString s_sys_ss00ce7919 ; <nl> - extern StaticString s_sys_ss4f67744c ; <nl> - extern StaticString s_sys_ss0c10eb92 ; <nl> - extern StaticString s_sys_ss3c6754b7 ; <nl> - extern StaticString s_sys_ss35f9d4be ; <nl> - extern StaticString s_sys_ss53ceeb6c ; <nl> - extern StaticString s_sys_ss229c615f ; <nl> - extern StaticString s_sys_ss6b4cb5ed ; <nl> - extern StaticString s_sys_ss2dc69ec2 ; <nl> - extern StaticString s_sys_ss549781c8 ; <nl> - extern StaticString s_sys_ss7646d15b ; <nl> - extern StaticString s_sys_ss403290f5 ; <nl> - extern StaticString s_sys_ss3bf89873 ; <nl> - extern StaticString s_sys_ss5cbbd412 ; <nl> - extern StaticString s_sys_ss65104d10 ; <nl> - extern StaticString s_sys_ss5ee263d1 ; <nl> - extern StaticString s_sys_ss7b94de24 ; <nl> - extern StaticString s_sys_ss68175ea2 ; <nl> - extern StaticString s_sys_ss18b77dcf ; <nl> - extern StaticString s_sys_ss79503405 ; <nl> - extern StaticString s_sys_ss4d202b9f ; <nl> - extern StaticString s_sys_ss5713adf1 ; <nl> - extern StaticString s_sys_ss75ad17e1 ; <nl> - extern StaticString s_sys_ss4f638bdc ; <nl> - extern StaticString s_sys_ss76b5e27b ; <nl> - extern StaticString s_sys_ss712c57f7 ; <nl> - extern StaticString s_sys_ss25c683eb ; <nl> - extern StaticString s_sys_ss48725a0c ; <nl> - extern StaticString s_sys_ss4af9d29e ; <nl> - extern StaticString s_sys_ss1f14ff71 ; <nl> - extern StaticString s_sys_ss7db173af ; <nl> - extern StaticString s_sys_ss658b04e8 ; <nl> - extern StaticString s_sys_ss486e8646 ; <nl> - extern StaticString s_sys_ss531f214d ; <nl> - extern StaticString s_sys_ss447efd48 ; <nl> - extern StaticString s_sys_ss742fc700 ; <nl> - extern StaticString s_sys_ss0bbfbb68 ; <nl> - extern StaticString s_sys_ss5b7508c8 ; <nl> - extern StaticString s_sys_ss19c96546 ; <nl> - extern StaticString s_sys_ss5371ad73 ; <nl> - extern StaticString s_sys_ss431a6ed8 ; <nl> - extern StaticString s_sys_ss0af036d3 ; <nl> - extern StaticString s_sys_ss5e2eaa32 ; <nl> - extern StaticString s_sys_ss21d85096 ; <nl> - extern StaticString s_sys_ss77054c67 ; <nl> - extern StaticString s_sys_ss1eba23bd ; <nl> - extern StaticString s_sys_ss1d522e0a ; <nl> - extern StaticString s_sys_ss016dc059 ; <nl> - extern StaticString s_sys_ss3a190f5f ; <nl> - extern StaticString s_sys_ss02b6fd60 ; <nl> - extern StaticString s_sys_ss58e4193c ; <nl> - extern StaticString s_sys_ss54808c44 ; <nl> <nl> / / 2 . Static Arrays <nl> - extern StaticArray s_sys_sa00000000 ; <nl> <nl> / / 3 . Constants <nl> <nl> new file mode 100644 <nl> index 00000000000 . . 602b9261791 <nl> mmm / dev / null <nl> ppp b / src / system / gen / php / classes / iterator . fws . h <nl> <nl> + / * <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | HipHop for PHP | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | Copyright ( c ) 2010 Facebook , Inc . ( http : / / www . facebook . com ) | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | This source file is subject to version 3 . 01 of the PHP license , | <nl> + | that is bundled with this package in the file LICENSE , and is | <nl> + | available through the world - wide - web at the following url : | <nl> + | http : / / www . php . net / license / 3_01 . txt | <nl> + | If you did not receive a copy of the PHP license and are unable to | <nl> + | obtain it through the world - wide - web , please send a note to | <nl> + | license @ php . net so we can mail you a copy immediately . | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + * / <nl> + / / @ generated by HipHop Compiler <nl> + <nl> + # ifndef __GENERATED_php_classes_iterator_fws_h0012ac1b__ <nl> + # define __GENERATED_php_classes_iterator_fws_h0012ac1b__ <nl> + <nl> + <nl> + namespace HPHP { <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + / / 1 . Static Strings <nl> + extern StaticString s_sys_ss5b908ab0 ; <nl> + extern StaticString s_sys_ss00ce7919 ; <nl> + extern StaticString s_sys_ss4f67744c ; <nl> + extern StaticString s_sys_ss0c10eb92 ; <nl> + extern StaticString s_sys_ss3c6754b7 ; <nl> + extern StaticString s_sys_ss35f9d4be ; <nl> + extern StaticString s_sys_ss53ceeb6c ; <nl> + extern StaticString s_sys_ss229c615f ; <nl> + extern StaticString s_sys_ss6b4cb5ed ; <nl> + extern StaticString s_sys_ss2dc69ec2 ; <nl> + extern StaticString s_sys_ss549781c8 ; <nl> + extern StaticString s_sys_ss7646d15b ; <nl> + extern StaticString s_sys_ss403290f5 ; <nl> + extern StaticString s_sys_ss3bf89873 ; <nl> + extern StaticString s_sys_ss5cbbd412 ; <nl> + extern StaticString s_sys_ss65104d10 ; <nl> + extern StaticString s_sys_ss5ee263d1 ; <nl> + extern StaticString s_sys_ss7b94de24 ; <nl> + extern StaticString s_sys_ss68175ea2 ; <nl> + extern StaticString s_sys_ss18b77dcf ; <nl> + extern StaticString s_sys_ss79503405 ; <nl> + extern StaticString s_sys_ss4d202b9f ; <nl> + extern StaticString s_sys_ss5713adf1 ; <nl> + extern StaticString s_sys_ss75ad17e1 ; <nl> + extern StaticString s_sys_ss4f638bdc ; <nl> + extern StaticString s_sys_ss76b5e27b ; <nl> + extern StaticString s_sys_ss712c57f7 ; <nl> + extern StaticString s_sys_ss25c683eb ; <nl> + extern StaticString s_sys_ss48725a0c ; <nl> + extern StaticString s_sys_ss4af9d29e ; <nl> + extern StaticString s_sys_ss1f14ff71 ; <nl> + extern StaticString s_sys_ss7db173af ; <nl> + extern StaticString s_sys_ss658b04e8 ; <nl> + extern StaticString s_sys_ss486e8646 ; <nl> + extern StaticString s_sys_ss531f214d ; <nl> + extern StaticString s_sys_ss447efd48 ; <nl> + extern StaticString s_sys_ss742fc700 ; <nl> + extern StaticString s_sys_ss0bbfbb68 ; <nl> + extern StaticString s_sys_ss5b7508c8 ; <nl> + extern StaticString s_sys_ss19c96546 ; <nl> + extern StaticString s_sys_ss5371ad73 ; <nl> + extern StaticString s_sys_ss431a6ed8 ; <nl> + extern StaticString s_sys_ss0af036d3 ; <nl> + extern StaticString s_sys_ss5e2eaa32 ; <nl> + extern StaticString s_sys_ss21d85096 ; <nl> + extern StaticString s_sys_ss77054c67 ; <nl> + extern StaticString s_sys_ss1eba23bd ; <nl> + extern StaticString s_sys_ss1d522e0a ; <nl> + extern StaticString s_sys_ss016dc059 ; <nl> + extern StaticString s_sys_ss3a190f5f ; <nl> + extern StaticString s_sys_ss02b6fd60 ; <nl> + extern StaticString s_sys_ss58e4193c ; <nl> + extern StaticString s_sys_ss54808c44 ; <nl> + <nl> + / / 2 . Static Arrays <nl> + extern StaticArray s_sys_sa00000000 ; <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + } <nl> + <nl> + <nl> + # endif / / __GENERATED_php_classes_iterator_fws_h0012ac1b__ <nl> mmm a / src / system / gen / php / classes / reflection . cpp <nl> ppp b / src / system / gen / php / classes / reflection . cpp <nl> <nl> # include < php / classes / exception . h > <nl> # include < php / classes / reflection . h > <nl> # include < php / classes / stdclass . h > <nl> + # include < php / classes / exception . fws . h > <nl> + # include < php / classes / reflection . fws . h > <nl> + # include < php / classes / stdclass . fws . h > <nl> # include < runtime / ext / ext . h > <nl> # include < runtime / eval / eval . h > <nl> <nl> mmm a / src / system / gen / php / classes / reflection . fw . h <nl> ppp b / src / system / gen / php / classes / reflection . fw . h <nl> namespace HPHP { <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> / / 1 . Static Strings <nl> - extern StaticString s_sys_ss77c51ddf ; <nl> - extern StaticString s_sys_ss446ed36e ; <nl> - extern StaticString s_sys_ss7730b079 ; <nl> - extern StaticString s_sys_ss20448282 ; <nl> - extern StaticString s_sys_ss1cfa5b62 ; <nl> - extern StaticString s_sys_ss403290f5_1 ; <nl> - extern StaticString s_sys_ss1f74c210_1 ; <nl> - extern StaticString s_sys_ss644993a4 ; <nl> - extern StaticString s_sys_ss38ae19c4 ; <nl> - extern StaticString s_sys_ss76d82ece ; <nl> - extern StaticString s_sys_ss4fc853c6 ; <nl> - extern StaticString s_sys_ss3512adea ; <nl> - extern StaticString s_sys_ss229c615f ; <nl> - extern StaticString s_sys_ss5533e10d ; <nl> - extern StaticString s_sys_ss6b4cb5ed ; <nl> - extern StaticString s_sys_ss01d79b38 ; <nl> - extern StaticString s_sys_ss7b513d57 ; <nl> - extern StaticString s_sys_ss504c4c09 ; <nl> - extern StaticString s_sys_ss7eaeeecb ; <nl> - extern StaticString s_sys_ss1f74c210 ; <nl> - extern StaticString s_sys_ss471864c8 ; <nl> - extern StaticString s_sys_ss251b7f2b ; <nl> - extern StaticString s_sys_ss6d16d594 ; <nl> - extern StaticString s_sys_ss1d07a592 ; <nl> - extern StaticString s_sys_ss3a464145 ; <nl> - extern StaticString s_sys_ss6463ffdf ; <nl> - extern StaticString s_sys_ss70714913 ; <nl> - extern StaticString s_sys_ss7f49956c ; <nl> - extern StaticString s_sys_ss36718f18 ; <nl> - extern StaticString s_sys_ss02406793 ; <nl> - extern StaticString s_sys_ss446f4f05 ; <nl> - extern StaticString s_sys_ss70cc2eb1 ; <nl> - extern StaticString s_sys_ss2f433c87 ; <nl> - extern StaticString s_sys_ss18fea5e1 ; <nl> - extern StaticString s_sys_ss633e9909 ; <nl> - extern StaticString s_sys_ss11341594 ; <nl> - extern StaticString s_sys_ss37a6123e ; <nl> - extern StaticString s_sys_ss424fa11e ; <nl> - extern StaticString s_sys_ss42c3f8cc ; <nl> - extern StaticString s_sys_ss13143955 ; <nl> - extern StaticString s_sys_ss3132c356 ; <nl> - extern StaticString s_sys_ss559d6063 ; <nl> - extern StaticString s_sys_ss13b3dd65 ; <nl> - extern StaticString s_sys_ss386ae1f4 ; <nl> - extern StaticString s_sys_ss25a95208 ; <nl> - extern StaticString s_sys_ss07bc4570 ; <nl> - extern StaticString s_sys_ss6ea191c5 ; <nl> - extern StaticString s_sys_ss58b49929 ; <nl> - extern StaticString s_sys_ss6d39474d_1 ; <nl> - extern StaticString s_sys_ss1dd0e851 ; <nl> - extern StaticString s_sys_ss1d03d335 ; <nl> - extern StaticString s_sys_ss2de08356 ; <nl> - extern StaticString s_sys_ss673ff4bd ; <nl> - extern StaticString s_sys_ss53a3b5b6 ; <nl> - extern StaticString s_sys_ss6488aaaa ; <nl> - extern StaticString s_sys_ss491d6014 ; <nl> - extern StaticString s_sys_ss33e6769b ; <nl> - extern StaticString s_sys_ss365fcaa0 ; <nl> - extern StaticString s_sys_ss24059ddf ; <nl> - extern StaticString s_sys_ss32c2a32d ; <nl> - extern StaticString s_sys_ss16957472 ; <nl> - extern StaticString s_sys_ss40c44738 ; <nl> - extern StaticString s_sys_ss602f4b44 ; <nl> - extern StaticString s_sys_ss04fdcfb9 ; <nl> - extern StaticString s_sys_ss1cb1cb04 ; <nl> - extern StaticString s_sys_ss05797b22 ; <nl> - extern StaticString s_sys_ss76a09ed2 ; <nl> - extern StaticString s_sys_ss4a3329a8 ; <nl> - extern StaticString s_sys_ss4bf6681d ; <nl> - extern StaticString s_sys_ss3be3d316 ; <nl> - extern StaticString s_sys_ss3b59d4c1 ; <nl> - extern StaticString s_sys_ss5b8cc668 ; <nl> - extern StaticString s_sys_ss34bc6371 ; <nl> - extern StaticString s_sys_ss5f965e7b ; <nl> - extern StaticString s_sys_ss15c7d6fb ; <nl> - extern StaticString s_sys_ss43880cae ; <nl> - extern StaticString s_sys_ss157d479f ; <nl> - extern StaticString s_sys_ss3a6b8527 ; <nl> - extern StaticString s_sys_ss1558c380 ; <nl> - extern StaticString s_sys_ss4e9b09e6 ; <nl> - extern StaticString s_sys_ss56221a08 ; <nl> - extern StaticString s_sys_ss71135554 ; <nl> - extern StaticString s_sys_ss09e666be ; <nl> - extern StaticString s_sys_ss0dcefc3c ; <nl> - extern StaticString s_sys_ss25cd0249 ; <nl> - extern StaticString s_sys_ss0f25871d ; <nl> - extern StaticString s_sys_ss5c5cac7a ; <nl> - extern StaticString s_sys_ss7ab11f15 ; <nl> - extern StaticString s_sys_ss6eda836e ; <nl> - extern StaticString s_sys_ss1cd809f9 ; <nl> - extern StaticString s_sys_ss3c286a52 ; <nl> - extern StaticString s_sys_ss142f8c29 ; <nl> - extern StaticString s_sys_ss5d4432c4 ; <nl> - extern StaticString s_sys_ss7676509e ; <nl> - extern StaticString s_sys_ss7ca39b31 ; <nl> - extern StaticString s_sys_ss370b68ce ; <nl> - extern StaticString s_sys_ss454dd8cb ; <nl> - extern StaticString s_sys_ss4227604f ; <nl> - extern StaticString s_sys_ss5e2f636f ; <nl> - extern StaticString s_sys_ss6fb88316 ; <nl> - extern StaticString s_sys_ss58723b7c ; <nl> - extern StaticString s_sys_ss1733f4e7 ; <nl> - extern StaticString s_sys_ss1926c97e ; <nl> - extern StaticString s_sys_ss5182be9c ; <nl> - extern StaticString s_sys_ss028b2c66 ; <nl> - extern StaticString s_sys_ss3195c8e2 ; <nl> - extern StaticString s_sys_ss68683632 ; <nl> - extern StaticString s_sys_ss6d6e147d ; <nl> - extern StaticString s_sys_ss10d8f28e ; <nl> - extern StaticString s_sys_ss77e35232 ; <nl> - extern StaticString s_sys_ss01fe7030 ; <nl> - extern StaticString s_sys_ss54ee5c66 ; <nl> - extern StaticString s_sys_ss781593b7 ; <nl> - extern StaticString s_sys_ss5646283f ; <nl> - extern StaticString s_sys_ss2d13045e ; <nl> - extern StaticString s_sys_ss52349fb9 ; <nl> - extern StaticString s_sys_ss749653da ; <nl> - extern StaticString s_sys_ss649ab5a0 ; <nl> - extern StaticString s_sys_ss13766fad ; <nl> - extern StaticString s_sys_ss208f545e ; <nl> - extern StaticString s_sys_ss6ae2e71d ; <nl> - extern StaticString s_sys_ss2216aac8 ; <nl> - extern StaticString s_sys_ss305f9a8d ; <nl> - extern StaticString s_sys_ss1574ec09 ; <nl> - extern StaticString s_sys_ss35281082 ; <nl> - extern StaticString s_sys_ss0d71bb50 ; <nl> - extern StaticString s_sys_ss1254dd7a ; <nl> - extern StaticString s_sys_ss68a05993 ; <nl> - extern StaticString s_sys_ss4249a61c ; <nl> - extern StaticString s_sys_ss47c0a605 ; <nl> - extern StaticString s_sys_ss276d2668 ; <nl> - extern StaticString s_sys_ss0a473a5e ; <nl> - extern StaticString s_sys_ss1c88e80f ; <nl> - extern StaticString s_sys_ss008c8db5 ; <nl> - extern StaticString s_sys_ss796d376e ; <nl> - extern StaticString s_sys_ss70133db3 ; <nl> - extern StaticString s_sys_ss78ba13f7 ; <nl> - extern StaticString s_sys_ss5f12d619 ; <nl> - extern StaticString s_sys_ss1fe107ad ; <nl> - extern StaticString s_sys_ss009c2796 ; <nl> <nl> / / 2 . Static Arrays <nl> - extern StaticArray s_sys_sa00000000 ; <nl> <nl> / / 3 . Constants <nl> <nl> new file mode 100644 <nl> index 00000000000 . . 7874fd143e3 <nl> mmm / dev / null <nl> ppp b / src / system / gen / php / classes / reflection . fws . h <nl> <nl> + / * <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | HipHop for PHP | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | Copyright ( c ) 2010 Facebook , Inc . ( http : / / www . facebook . com ) | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | This source file is subject to version 3 . 01 of the PHP license , | <nl> + | that is bundled with this package in the file LICENSE , and is | <nl> + | available through the world - wide - web at the following url : | <nl> + | http : / / www . php . net / license / 3_01 . txt | <nl> + | If you did not receive a copy of the PHP license and are unable to | <nl> + | obtain it through the world - wide - web , please send a note to | <nl> + | license @ php . net so we can mail you a copy immediately . | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + * / <nl> + / / @ generated by HipHop Compiler <nl> + <nl> + # ifndef __GENERATED_php_classes_reflection_fws_h41074b82__ <nl> + # define __GENERATED_php_classes_reflection_fws_h41074b82__ <nl> + <nl> + <nl> + namespace HPHP { <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + / / 1 . Static Strings <nl> + extern StaticString s_sys_ss77c51ddf ; <nl> + extern StaticString s_sys_ss446ed36e ; <nl> + extern StaticString s_sys_ss7730b079 ; <nl> + extern StaticString s_sys_ss20448282 ; <nl> + extern StaticString s_sys_ss1cfa5b62 ; <nl> + extern StaticString s_sys_ss403290f5_1 ; <nl> + extern StaticString s_sys_ss1f74c210_1 ; <nl> + extern StaticString s_sys_ss644993a4 ; <nl> + extern StaticString s_sys_ss38ae19c4 ; <nl> + extern StaticString s_sys_ss76d82ece ; <nl> + extern StaticString s_sys_ss4fc853c6 ; <nl> + extern StaticString s_sys_ss3512adea ; <nl> + extern StaticString s_sys_ss229c615f ; <nl> + extern StaticString s_sys_ss5533e10d ; <nl> + extern StaticString s_sys_ss6b4cb5ed ; <nl> + extern StaticString s_sys_ss01d79b38 ; <nl> + extern StaticString s_sys_ss7b513d57 ; <nl> + extern StaticString s_sys_ss504c4c09 ; <nl> + extern StaticString s_sys_ss7eaeeecb ; <nl> + extern StaticString s_sys_ss1f74c210 ; <nl> + extern StaticString s_sys_ss471864c8 ; <nl> + extern StaticString s_sys_ss251b7f2b ; <nl> + extern StaticString s_sys_ss6d16d594 ; <nl> + extern StaticString s_sys_ss1d07a592 ; <nl> + extern StaticString s_sys_ss3a464145 ; <nl> + extern StaticString s_sys_ss6463ffdf ; <nl> + extern StaticString s_sys_ss70714913 ; <nl> + extern StaticString s_sys_ss7f49956c ; <nl> + extern StaticString s_sys_ss36718f18 ; <nl> + extern StaticString s_sys_ss02406793 ; <nl> + extern StaticString s_sys_ss446f4f05 ; <nl> + extern StaticString s_sys_ss70cc2eb1 ; <nl> + extern StaticString s_sys_ss2f433c87 ; <nl> + extern StaticString s_sys_ss18fea5e1 ; <nl> + extern StaticString s_sys_ss633e9909 ; <nl> + extern StaticString s_sys_ss11341594 ; <nl> + extern StaticString s_sys_ss37a6123e ; <nl> + extern StaticString s_sys_ss424fa11e ; <nl> + extern StaticString s_sys_ss42c3f8cc ; <nl> + extern StaticString s_sys_ss13143955 ; <nl> + extern StaticString s_sys_ss3132c356 ; <nl> + extern StaticString s_sys_ss559d6063 ; <nl> + extern StaticString s_sys_ss13b3dd65 ; <nl> + extern StaticString s_sys_ss386ae1f4 ; <nl> + extern StaticString s_sys_ss25a95208 ; <nl> + extern StaticString s_sys_ss07bc4570 ; <nl> + extern StaticString s_sys_ss6ea191c5 ; <nl> + extern StaticString s_sys_ss58b49929 ; <nl> + extern StaticString s_sys_ss6d39474d_1 ; <nl> + extern StaticString s_sys_ss1dd0e851 ; <nl> + extern StaticString s_sys_ss1d03d335 ; <nl> + extern StaticString s_sys_ss2de08356 ; <nl> + extern StaticString s_sys_ss673ff4bd ; <nl> + extern StaticString s_sys_ss53a3b5b6 ; <nl> + extern StaticString s_sys_ss6488aaaa ; <nl> + extern StaticString s_sys_ss491d6014 ; <nl> + extern StaticString s_sys_ss33e6769b ; <nl> + extern StaticString s_sys_ss365fcaa0 ; <nl> + extern StaticString s_sys_ss24059ddf ; <nl> + extern StaticString s_sys_ss32c2a32d ; <nl> + extern StaticString s_sys_ss16957472 ; <nl> + extern StaticString s_sys_ss40c44738 ; <nl> + extern StaticString s_sys_ss602f4b44 ; <nl> + extern StaticString s_sys_ss04fdcfb9 ; <nl> + extern StaticString s_sys_ss1cb1cb04 ; <nl> + extern StaticString s_sys_ss05797b22 ; <nl> + extern StaticString s_sys_ss76a09ed2 ; <nl> + extern StaticString s_sys_ss4a3329a8 ; <nl> + extern StaticString s_sys_ss4bf6681d ; <nl> + extern StaticString s_sys_ss3be3d316 ; <nl> + extern StaticString s_sys_ss3b59d4c1 ; <nl> + extern StaticString s_sys_ss5b8cc668 ; <nl> + extern StaticString s_sys_ss34bc6371 ; <nl> + extern StaticString s_sys_ss5f965e7b ; <nl> + extern StaticString s_sys_ss15c7d6fb ; <nl> + extern StaticString s_sys_ss43880cae ; <nl> + extern StaticString s_sys_ss157d479f ; <nl> + extern StaticString s_sys_ss3a6b8527 ; <nl> + extern StaticString s_sys_ss1558c380 ; <nl> + extern StaticString s_sys_ss4e9b09e6 ; <nl> + extern StaticString s_sys_ss56221a08 ; <nl> + extern StaticString s_sys_ss71135554 ; <nl> + extern StaticString s_sys_ss09e666be ; <nl> + extern StaticString s_sys_ss0dcefc3c ; <nl> + extern StaticString s_sys_ss25cd0249 ; <nl> + extern StaticString s_sys_ss0f25871d ; <nl> + extern StaticString s_sys_ss5c5cac7a ; <nl> + extern StaticString s_sys_ss7ab11f15 ; <nl> + extern StaticString s_sys_ss6eda836e ; <nl> + extern StaticString s_sys_ss1cd809f9 ; <nl> + extern StaticString s_sys_ss3c286a52 ; <nl> + extern StaticString s_sys_ss142f8c29 ; <nl> + extern StaticString s_sys_ss5d4432c4 ; <nl> + extern StaticString s_sys_ss7676509e ; <nl> + extern StaticString s_sys_ss7ca39b31 ; <nl> + extern StaticString s_sys_ss370b68ce ; <nl> + extern StaticString s_sys_ss454dd8cb ; <nl> + extern StaticString s_sys_ss4227604f ; <nl> + extern StaticString s_sys_ss5e2f636f ; <nl> + extern StaticString s_sys_ss6fb88316 ; <nl> + extern StaticString s_sys_ss58723b7c ; <nl> + extern StaticString s_sys_ss1733f4e7 ; <nl> + extern StaticString s_sys_ss1926c97e ; <nl> + extern StaticString s_sys_ss5182be9c ; <nl> + extern StaticString s_sys_ss028b2c66 ; <nl> + extern StaticString s_sys_ss3195c8e2 ; <nl> + extern StaticString s_sys_ss68683632 ; <nl> + extern StaticString s_sys_ss6d6e147d ; <nl> + extern StaticString s_sys_ss10d8f28e ; <nl> + extern StaticString s_sys_ss77e35232 ; <nl> + extern StaticString s_sys_ss01fe7030 ; <nl> + extern StaticString s_sys_ss54ee5c66 ; <nl> + extern StaticString s_sys_ss781593b7 ; <nl> + extern StaticString s_sys_ss5646283f ; <nl> + extern StaticString s_sys_ss2d13045e ; <nl> + extern StaticString s_sys_ss52349fb9 ; <nl> + extern StaticString s_sys_ss749653da ; <nl> + extern StaticString s_sys_ss649ab5a0 ; <nl> + extern StaticString s_sys_ss13766fad ; <nl> + extern StaticString s_sys_ss208f545e ; <nl> + extern StaticString s_sys_ss6ae2e71d ; <nl> + extern StaticString s_sys_ss2216aac8 ; <nl> + extern StaticString s_sys_ss305f9a8d ; <nl> + extern StaticString s_sys_ss1574ec09 ; <nl> + extern StaticString s_sys_ss35281082 ; <nl> + extern StaticString s_sys_ss0d71bb50 ; <nl> + extern StaticString s_sys_ss1254dd7a ; <nl> + extern StaticString s_sys_ss68a05993 ; <nl> + extern StaticString s_sys_ss4249a61c ; <nl> + extern StaticString s_sys_ss47c0a605 ; <nl> + extern StaticString s_sys_ss276d2668 ; <nl> + extern StaticString s_sys_ss0a473a5e ; <nl> + extern StaticString s_sys_ss1c88e80f ; <nl> + extern StaticString s_sys_ss008c8db5 ; <nl> + extern StaticString s_sys_ss796d376e ; <nl> + extern StaticString s_sys_ss70133db3 ; <nl> + extern StaticString s_sys_ss78ba13f7 ; <nl> + extern StaticString s_sys_ss5f12d619 ; <nl> + extern StaticString s_sys_ss1fe107ad ; <nl> + extern StaticString s_sys_ss009c2796 ; <nl> + <nl> + / / 2 . Static Arrays <nl> + extern StaticArray s_sys_sa00000000 ; <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + } <nl> + <nl> + <nl> + # endif / / __GENERATED_php_classes_reflection_fws_h41074b82__ <nl> mmm a / src / system / gen / php / classes / splfile . cpp <nl> ppp b / src / system / gen / php / classes / splfile . cpp <nl> <nl> <nl> # include < php / classes / iterator . h > <nl> # include < php / classes / splfile . h > <nl> + # include < php / classes / iterator . fws . h > <nl> + # include < php / classes / splfile . fws . h > <nl> # include < runtime / ext / ext . h > <nl> # include < runtime / eval / eval . h > <nl> <nl> mmm a / src / system / gen / php / classes / splfile . fw . h <nl> ppp b / src / system / gen / php / classes / splfile . fw . h <nl> extern StaticString s_sys_ss2d8b6f3b ; <nl> extern StaticString s_sys_ss016dc059_1 ; <nl> extern StaticString s_sys_ss5da6122e_1 ; <nl> extern StaticString s_sys_ss2a618761 ; <nl> - extern StaticString s_sys_ss229c615f ; <nl> - extern StaticString s_sys_ss6b4cb5ed ; <nl> - extern StaticString s_sys_ss7b94de24 ; <nl> - extern StaticString s_sys_ss412aefc3 ; <nl> - extern StaticString s_sys_ss6af27f9a ; <nl> - extern StaticString s_sys_ss5d1cc100 ; <nl> - extern StaticString s_sys_ss28be99b2 ; <nl> - extern StaticString s_sys_ss7f18fdf3 ; <nl> - extern StaticString s_sys_ss1d3a541e ; <nl> - extern StaticString s_sys_ss3181607a ; <nl> - extern StaticString s_sys_ss4b7e339b ; <nl> - extern StaticString s_sys_ss794886dd ; <nl> - extern StaticString s_sys_ss1f600049 ; <nl> - extern StaticString s_sys_ss2322e838 ; <nl> - extern StaticString s_sys_ss483e9353 ; <nl> - extern StaticString s_sys_ss6cd9d043 ; <nl> - extern StaticString s_sys_ss192ce465 ; <nl> - extern StaticString s_sys_ss4aac3a61 ; <nl> - extern StaticString s_sys_ss6731e29c ; <nl> - extern StaticString s_sys_ss5d0078af ; <nl> - extern StaticString s_sys_ss5713adf1 ; <nl> - extern StaticString s_sys_ss1b59269e ; <nl> - extern StaticString s_sys_ss062b6dc1 ; <nl> - extern StaticString s_sys_ss6d39474d ; <nl> - extern StaticString s_sys_ss75ad17e1 ; <nl> - extern StaticString s_sys_ss2565d86a ; <nl> - extern StaticString s_sys_ss3cd2604a ; <nl> - extern StaticString s_sys_ss48aaec55 ; <nl> - extern StaticString s_sys_ss366d118c ; <nl> - extern StaticString s_sys_ss10fe9cda ; <nl> - extern StaticString s_sys_ss52b41b72 ; <nl> - extern StaticString s_sys_ss3e9ddbc1 ; <nl> - extern StaticString s_sys_ss24e95019 ; <nl> - extern StaticString s_sys_ss3c26db08 ; <nl> - extern StaticString s_sys_ss37a06e7d ; <nl> - extern StaticString s_sys_ss44934786 ; <nl> - extern StaticString s_sys_ss6d03a6ea ; <nl> - extern StaticString s_sys_ss0af50f06 ; <nl> - extern StaticString s_sys_ss25c683eb ; <nl> - extern StaticString s_sys_ss371013f8 ; <nl> - extern StaticString s_sys_ss2a0ccb7a ; <nl> - extern StaticString s_sys_ss60465f1d ; <nl> - extern StaticString s_sys_ss72c51c58 ; <nl> - extern StaticString s_sys_ss16bfe3b1 ; <nl> - extern StaticString s_sys_ss47b9c59d ; <nl> - extern StaticString s_sys_ss4af9d29e ; <nl> - extern StaticString s_sys_ss7db173af ; <nl> - extern StaticString s_sys_ss447efd48 ; <nl> - extern StaticString s_sys_ss48bdfe35 ; <nl> extern StaticString s_sys_ss122506fb ; <nl> - extern StaticString s_sys_ss0af036d3 ; <nl> - extern StaticString s_sys_ss21d85096 ; <nl> - extern StaticString s_sys_ss77054c67 ; <nl> - extern StaticString s_sys_ss1eba23bd ; <nl> - extern StaticString s_sys_ss06fa5330 ; <nl> - extern StaticString s_sys_ss5633b25b ; <nl> - extern StaticString s_sys_ss1d522e0a ; <nl> - extern StaticString s_sys_ss25d241c5 ; <nl> - extern StaticString s_sys_ss0e43d437 ; <nl> - extern StaticString s_sys_ss016dc059 ; <nl> - extern StaticString s_sys_ss5da6122e ; <nl> - extern StaticString s_sys_ss3a190f5f ; <nl> - extern StaticString s_sys_ss54808c44 ; <nl> <nl> / / 2 . Static Arrays <nl> <nl> new file mode 100644 <nl> index 00000000000 . . 53e7397fb48 <nl> mmm / dev / null <nl> ppp b / src / system / gen / php / classes / splfile . fws . h <nl> <nl> + / * <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | HipHop for PHP | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | Copyright ( c ) 2010 Facebook , Inc . ( http : / / www . facebook . com ) | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | This source file is subject to version 3 . 01 of the PHP license , | <nl> + | that is bundled with this package in the file LICENSE , and is | <nl> + | available through the world - wide - web at the following url : | <nl> + | http : / / www . php . net / license / 3_01 . txt | <nl> + | If you did not receive a copy of the PHP license and are unable to | <nl> + | obtain it through the world - wide - web , please send a note to | <nl> + | license @ php . net so we can mail you a copy immediately . | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + * / <nl> + / / @ generated by HipHop Compiler <nl> + <nl> + # ifndef __GENERATED_php_classes_splfile_fws_h77cc6ced__ <nl> + # define __GENERATED_php_classes_splfile_fws_h77cc6ced__ <nl> + <nl> + <nl> + namespace HPHP { <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + / / 1 . Static Strings <nl> + extern StaticString s_sys_ss229c615f ; <nl> + extern StaticString s_sys_ss6b4cb5ed ; <nl> + extern StaticString s_sys_ss7b94de24 ; <nl> + extern StaticString s_sys_ss412aefc3 ; <nl> + extern StaticString s_sys_ss6af27f9a ; <nl> + extern StaticString s_sys_ss5d1cc100 ; <nl> + extern StaticString s_sys_ss28be99b2 ; <nl> + extern StaticString s_sys_ss7f18fdf3 ; <nl> + extern StaticString s_sys_ss1d3a541e ; <nl> + extern StaticString s_sys_ss3181607a ; <nl> + extern StaticString s_sys_ss4b7e339b ; <nl> + extern StaticString s_sys_ss794886dd ; <nl> + extern StaticString s_sys_ss1f600049 ; <nl> + extern StaticString s_sys_ss2322e838 ; <nl> + extern StaticString s_sys_ss483e9353 ; <nl> + extern StaticString s_sys_ss6cd9d043 ; <nl> + extern StaticString s_sys_ss192ce465 ; <nl> + extern StaticString s_sys_ss4aac3a61 ; <nl> + extern StaticString s_sys_ss6731e29c ; <nl> + extern StaticString s_sys_ss5d0078af ; <nl> + extern StaticString s_sys_ss5713adf1 ; <nl> + extern StaticString s_sys_ss1b59269e ; <nl> + extern StaticString s_sys_ss062b6dc1 ; <nl> + extern StaticString s_sys_ss6d39474d ; <nl> + extern StaticString s_sys_ss75ad17e1 ; <nl> + extern StaticString s_sys_ss2565d86a ; <nl> + extern StaticString s_sys_ss3cd2604a ; <nl> + extern StaticString s_sys_ss48aaec55 ; <nl> + extern StaticString s_sys_ss366d118c ; <nl> + extern StaticString s_sys_ss10fe9cda ; <nl> + extern StaticString s_sys_ss52b41b72 ; <nl> + extern StaticString s_sys_ss3e9ddbc1 ; <nl> + extern StaticString s_sys_ss24e95019 ; <nl> + extern StaticString s_sys_ss3c26db08 ; <nl> + extern StaticString s_sys_ss37a06e7d ; <nl> + extern StaticString s_sys_ss44934786 ; <nl> + extern StaticString s_sys_ss6d03a6ea ; <nl> + extern StaticString s_sys_ss0af50f06 ; <nl> + extern StaticString s_sys_ss25c683eb ; <nl> + extern StaticString s_sys_ss371013f8 ; <nl> + extern StaticString s_sys_ss2a0ccb7a ; <nl> + extern StaticString s_sys_ss60465f1d ; <nl> + extern StaticString s_sys_ss72c51c58 ; <nl> + extern StaticString s_sys_ss16bfe3b1 ; <nl> + extern StaticString s_sys_ss47b9c59d ; <nl> + extern StaticString s_sys_ss4af9d29e ; <nl> + extern StaticString s_sys_ss7db173af ; <nl> + extern StaticString s_sys_ss447efd48 ; <nl> + extern StaticString s_sys_ss48bdfe35 ; <nl> + extern StaticString s_sys_ss0af036d3 ; <nl> + extern StaticString s_sys_ss21d85096 ; <nl> + extern StaticString s_sys_ss77054c67 ; <nl> + extern StaticString s_sys_ss1eba23bd ; <nl> + extern StaticString s_sys_ss06fa5330 ; <nl> + extern StaticString s_sys_ss5633b25b ; <nl> + extern StaticString s_sys_ss1d522e0a ; <nl> + extern StaticString s_sys_ss25d241c5 ; <nl> + extern StaticString s_sys_ss0e43d437 ; <nl> + extern StaticString s_sys_ss016dc059 ; <nl> + extern StaticString s_sys_ss5da6122e ; <nl> + extern StaticString s_sys_ss3a190f5f ; <nl> + extern StaticString s_sys_ss54808c44 ; <nl> + <nl> + / / 2 . Static Arrays <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + } <nl> + <nl> + <nl> + # endif / / __GENERATED_php_classes_splfile_fws_h77cc6ced__ <nl> mmm a / src / system / gen / php / classes / splobjectstorage . cpp <nl> ppp b / src / system / gen / php / classes / splobjectstorage . cpp <nl> <nl> <nl> # include < php / classes / iterator . h > <nl> # include < php / classes / splobjectstorage . h > <nl> + # include < php / classes / iterator . fws . h > <nl> + # include < php / classes / splobjectstorage . fws . h > <nl> # include < runtime / ext / ext . h > <nl> # include < runtime / eval / eval . h > <nl> <nl> mmm a / src / system / gen / php / classes / splobjectstorage . fw . h <nl> ppp b / src / system / gen / php / classes / splobjectstorage . fw . h <nl> namespace HPHP { <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> / / 1 . Static Strings <nl> - extern StaticString s_sys_ss352fe1c6 ; <nl> - extern StaticString s_sys_ss3d348351 ; <nl> - extern StaticString s_sys_ss14775b54 ; <nl> - extern StaticString s_sys_ss05dd2d70 ; <nl> - extern StaticString s_sys_ss65104d10 ; <nl> - extern StaticString s_sys_ss5ee263d1 ; <nl> - extern StaticString s_sys_ss7b94de24 ; <nl> - extern StaticString s_sys_ss1456596b ; <nl> - extern StaticString s_sys_ss43880cae ; <nl> - extern StaticString s_sys_ss4af9d29e ; <nl> - extern StaticString s_sys_ss7db173af ; <nl> - extern StaticString s_sys_ss447efd48 ; <nl> - extern StaticString s_sys_ss21d85096 ; <nl> - extern StaticString s_sys_ss045859b1 ; <nl> - extern StaticString s_sys_ss7e2b6dc3 ; <nl> - extern StaticString s_sys_ss3a190f5f ; <nl> - extern StaticString s_sys_ss54808c44 ; <nl> <nl> / / 2 . Static Arrays <nl> - extern StaticArray s_sys_sa00000000 ; <nl> <nl> / / 3 . Constants <nl> <nl> new file mode 100644 <nl> index 00000000000 . . 18787b44ffb <nl> mmm / dev / null <nl> ppp b / src / system / gen / php / classes / splobjectstorage . fws . h <nl> <nl> + / * <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | HipHop for PHP | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | Copyright ( c ) 2010 Facebook , Inc . ( http : / / www . facebook . com ) | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | This source file is subject to version 3 . 01 of the PHP license , | <nl> + | that is bundled with this package in the file LICENSE , and is | <nl> + | available through the world - wide - web at the following url : | <nl> + | http : / / www . php . net / license / 3_01 . txt | <nl> + | If you did not receive a copy of the PHP license and are unable to | <nl> + | obtain it through the world - wide - web , please send a note to | <nl> + | license @ php . net so we can mail you a copy immediately . | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + * / <nl> + / / @ generated by HipHop Compiler <nl> + <nl> + # ifndef __GENERATED_php_classes_splobjectstorage_fws_h23b804cd__ <nl> + # define __GENERATED_php_classes_splobjectstorage_fws_h23b804cd__ <nl> + <nl> + <nl> + namespace HPHP { <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + / / 1 . Static Strings <nl> + extern StaticString s_sys_ss352fe1c6 ; <nl> + extern StaticString s_sys_ss3d348351 ; <nl> + extern StaticString s_sys_ss14775b54 ; <nl> + extern StaticString s_sys_ss05dd2d70 ; <nl> + extern StaticString s_sys_ss65104d10 ; <nl> + extern StaticString s_sys_ss5ee263d1 ; <nl> + extern StaticString s_sys_ss7b94de24 ; <nl> + extern StaticString s_sys_ss1456596b ; <nl> + extern StaticString s_sys_ss43880cae ; <nl> + extern StaticString s_sys_ss4af9d29e ; <nl> + extern StaticString s_sys_ss7db173af ; <nl> + extern StaticString s_sys_ss447efd48 ; <nl> + extern StaticString s_sys_ss21d85096 ; <nl> + extern StaticString s_sys_ss045859b1 ; <nl> + extern StaticString s_sys_ss7e2b6dc3 ; <nl> + extern StaticString s_sys_ss3a190f5f ; <nl> + extern StaticString s_sys_ss54808c44 ; <nl> + <nl> + / / 2 . Static Arrays <nl> + extern StaticArray s_sys_sa00000000 ; <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + } <nl> + <nl> + <nl> + # endif / / __GENERATED_php_classes_splobjectstorage_fws_h23b804cd__ <nl> mmm a / src / system / gen / php / classes / stdclass . cpp <nl> ppp b / src / system / gen / php / classes / stdclass . cpp <nl> <nl> / / @ generated by HipHop Compiler <nl> <nl> # include < php / classes / stdclass . h > <nl> + # include < php / classes / stdclass . fws . h > <nl> # include < runtime / ext / ext . h > <nl> # include < runtime / eval / eval . h > <nl> <nl> mmm a / src / system / gen / php / classes / stdclass . fw . h <nl> ppp b / src / system / gen / php / classes / stdclass . fw . h <nl> namespace HPHP { <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> / / 1 . Static Strings <nl> - extern StaticString s_sys_ss31db296c ; <nl> - extern StaticString s_sys_ss78ba13f7 ; <nl> <nl> / / 2 . Static Arrays <nl> <nl> new file mode 100644 <nl> index 00000000000 . . 9b75c213e6b <nl> mmm / dev / null <nl> ppp b / src / system / gen / php / classes / stdclass . fws . h <nl> <nl> + / * <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | HipHop for PHP | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | Copyright ( c ) 2010 Facebook , Inc . ( http : / / www . facebook . com ) | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | This source file is subject to version 3 . 01 of the PHP license , | <nl> + | that is bundled with this package in the file LICENSE , and is | <nl> + | available through the world - wide - web at the following url : | <nl> + | http : / / www . php . net / license / 3_01 . txt | <nl> + | If you did not receive a copy of the PHP license and are unable to | <nl> + | obtain it through the world - wide - web , please send a note to | <nl> + | license @ php . net so we can mail you a copy immediately . | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + * / <nl> + / / @ generated by HipHop Compiler <nl> + <nl> + # ifndef __GENERATED_php_classes_stdclass_fws_h6e40b335__ <nl> + # define __GENERATED_php_classes_stdclass_fws_h6e40b335__ <nl> + <nl> + <nl> + namespace HPHP { <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + / / 1 . Static Strings <nl> + extern StaticString s_sys_ss31db296c ; <nl> + extern StaticString s_sys_ss78ba13f7 ; <nl> + <nl> + / / 2 . Static Arrays <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + } <nl> + <nl> + <nl> + # endif / / __GENERATED_php_classes_stdclass_fws_h6e40b335__ <nl> mmm a / src / system / gen / php / globals / constants . cpp <nl> ppp b / src / system / gen / php / globals / constants . cpp <nl> <nl> / / @ generated by HipHop Compiler <nl> <nl> # include < php / globals / constants . h > <nl> + # include < php / globals / constants . fws . h > <nl> # include < runtime / ext / ext . h > <nl> # include < runtime / eval / eval . h > <nl> <nl> mmm a / src / system / gen / php / globals / constants . fw . h <nl> ppp b / src / system / gen / php / globals / constants . fw . h <nl> namespace HPHP { <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> / / 1 . Static Strings <nl> - extern StaticString s_sys_ss00000000 ; <nl> <nl> / / 2 . Static Arrays <nl> <nl> new file mode 100644 <nl> index 00000000000 . . 96c97375839 <nl> mmm / dev / null <nl> ppp b / src / system / gen / php / globals / constants . fws . h <nl> <nl> + / * <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | HipHop for PHP | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | Copyright ( c ) 2010 Facebook , Inc . ( http : / / www . facebook . com ) | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | This source file is subject to version 3 . 01 of the PHP license , | <nl> + | that is bundled with this package in the file LICENSE , and is | <nl> + | available through the world - wide - web at the following url : | <nl> + | http : / / www . php . net / license / 3_01 . txt | <nl> + | If you did not receive a copy of the PHP license and are unable to | <nl> + | obtain it through the world - wide - web , please send a note to | <nl> + | license @ php . net so we can mail you a copy immediately . | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + * / <nl> + / / @ generated by HipHop Compiler <nl> + <nl> + # ifndef __GENERATED_php_globals_constants_fws_h549767e4__ <nl> + # define __GENERATED_php_globals_constants_fws_h549767e4__ <nl> + <nl> + <nl> + namespace HPHP { <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + / / 1 . Static Strings <nl> + extern StaticString s_sys_ss00000000 ; <nl> + <nl> + / / 2 . Static Arrays <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + } <nl> + <nl> + <nl> + # endif / / __GENERATED_php_globals_constants_fws_h549767e4__ <nl> mmm a / src / system / gen / php / globals / symbols . cpp <nl> ppp b / src / system / gen / php / globals / symbols . cpp <nl> <nl> / / @ generated by HipHop Compiler <nl> <nl> # include < php / globals / symbols . h > <nl> + # include < php / globals / symbols . fws . h > <nl> # include < runtime / ext / ext . h > <nl> # include < runtime / eval / eval . h > <nl> <nl> mmm a / src / system / gen / php / globals / symbols . fw . h <nl> ppp b / src / system / gen / php / globals / symbols . fw . h <nl> namespace HPHP { <nl> / / 1 . Static Strings <nl> <nl> / / 2 . Static Arrays <nl> - extern StaticArray s_sys_sa00000000 ; <nl> <nl> / / 3 . Constants <nl> <nl> new file mode 100644 <nl> index 00000000000 . . c90ca98dac8 <nl> mmm / dev / null <nl> ppp b / src / system / gen / php / globals / symbols . fws . h <nl> <nl> + / * <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | HipHop for PHP | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | Copyright ( c ) 2010 Facebook , Inc . ( http : / / www . facebook . com ) | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + | This source file is subject to version 3 . 01 of the PHP license , | <nl> + | that is bundled with this package in the file LICENSE , and is | <nl> + | available through the world - wide - web at the following url : | <nl> + | http : / / www . php . net / license / 3_01 . txt | <nl> + | If you did not receive a copy of the PHP license and are unable to | <nl> + | obtain it through the world - wide - web , please send a note to | <nl> + | license @ php . net so we can mail you a copy immediately . | <nl> + + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - + <nl> + * / <nl> + / / @ generated by HipHop Compiler <nl> + <nl> + # ifndef __GENERATED_php_globals_symbols_fws_h4b065cbd__ <nl> + # define __GENERATED_php_globals_symbols_fws_h4b065cbd__ <nl> + <nl> + <nl> + namespace HPHP { <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + / / 1 . Static Strings <nl> + <nl> + / / 2 . Static Arrays <nl> + extern StaticArray s_sys_sa00000000 ; <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + } <nl> + <nl> + <nl> + # endif / / __GENERATED_php_globals_symbols_fws_h4b065cbd__ <nl> | make - C system for Minghui ' s change | facebook/hhvm | d141630d995b421e1100851fcc3830dbe9a5c382 | 2010-09-29T23:58:40Z |
mmm a / tools / depends / target / gnutls / Makefile <nl> ppp b / tools / depends / target / gnutls / Makefile <nl> DEPS = . . / . . / Makefile . include Makefile <nl> <nl> # lib name , version <nl> LIBNAME = gnutls <nl> - VERSION = 3 . 4 . 14 <nl> + VERSION = 3 . 5 . 10 <nl> SOURCE = $ ( LIBNAME ) - $ ( VERSION ) <nl> ARCHIVE = $ ( SOURCE ) . tar . xz <nl> <nl> endif <nl> <nl> # configuration settings <nl> CONFIGURE = cp - f $ ( CONFIG_SUB ) $ ( CONFIG_GUESS ) . ; \ <nl> - . / configure - - prefix = $ ( PREFIX ) - - disable - shared - - without - p11 - kit - - disable - nls \ <nl> + . / configure - - prefix = $ ( PREFIX ) - - disable - shared - - without - p11 - kit - - disable - nls - - with - included - unistring \ <nl> - - with - included - libtasn1 - - enable - local - libopts - - disable - doc - - disable - tests $ ( CONFIGURE_HACKS ) <nl> <nl> LIBDYLIB = $ ( PLATFORM ) / lib / . libs / lib $ ( LIBNAME ) . a <nl> mmm a / tools / depends / target / openssl / Makefile <nl> ppp b / tools / depends / target / openssl / Makefile <nl> DEPS = . . / . . / Makefile . include Makefile <nl> <nl> # lib name , version <nl> LIBNAME = openssl <nl> - VERSION = 1 . 0 . 2j <nl> + VERSION = 1 . 0 . 2k <nl> SOURCE = $ ( LIBNAME ) - $ ( VERSION ) <nl> ARCHIVE = $ ( SOURCE ) . tar . gz <nl> <nl> mmm a / tools / depends / target / openssl / cacert . pem <nl> ppp b / tools / depends / target / openssl / cacert . pem <nl> <nl> # # <nl> # # Bundle of CA Root Certificates <nl> # # <nl> - # # Certificate data from Mozilla as of : Wed Sep 2 18 : 30 : 34 2015 <nl> + # # Certificate data from Mozilla as of : Wed Jan 18 04 : 12 : 05 2017 GMT <nl> # # <nl> # # This is a bundle of X . 509 certificates of public Certificate Authorities <nl> # # ( CA ) . These were automatically extracted from Mozilla ' s root certificates <nl> # # file ( certdata . txt ) . This file can be found in the mozilla source tree : <nl> - # # http : / / hg . mozilla . org / releases / mozilla - release / raw - file / default / security / nss / lib / ckfw / builtins / certdata . txt <nl> + # # https : / / hg . mozilla . org / releases / mozilla - release / raw - file / default / security / nss / lib / ckfw / builtins / certdata . txt <nl> # # <nl> # # It contains the certificates in PEM format and therefore <nl> # # can be directly used with curl / libcurl / php_curl , or with <nl> # # an Apache + mod_ssl webserver for SSL client authentication . <nl> # # Just configure this file as the SSLCACertificateFile . <nl> # # <nl> - # # Conversion done with mk - ca - bundle . pl version 1 . 25 . <nl> - # # SHA1 : ed3c0bbfb7912bcc00cd2033b0cb85c98d10559c <nl> + # # Conversion done with mk - ca - bundle . pl version 1 . 27 . <nl> + # # SHA256 : dffa79e6aa993f558e82884abf7bb54bf440ab66ee91d82a27a627f6f2a4ace4 <nl> # # <nl> <nl> <nl> - Equifax Secure CA <nl> - = = = = = = = = = = = = = = = = = <nl> mmmmmmBEGIN CERTIFICATEmmm - - <nl> - MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJVUzEQMA4GA1UE <nl> - ChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5 <nl> - MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoT <nl> - B0VxdWlmYXgxLTArBgNVBAsTJEVxdWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCB <nl> - nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7 + 2gRvE4RiIcPR <nl> - fM6fBeC4AfBONOziipUEZKzxa1NfBbPLZ4C / QgKO / t0BCezhABRP / PvwDN1Dulsr4R + AcJkVV5MW <nl> - 8Q + XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe / FP3gx7kCAwEAAaOCAQkwggEFMHAG <nl> - A1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UE <nl> - CxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoG <nl> - A1UdEAQTMBGBDzIwMTgwODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo + SvS <nl> - spXXR9gjIBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ / UMAwGA1UdEwQFMAMB <nl> - Af8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUAA4GBAFjOKer89961 <nl> - zgK5F7WF0bnj4JXMJTENAKaSbn + 2kmOeUJXRmm / kEd5jhW6Y7qj / WsjTVbJmcVfewCHrPSqnI0kB <nl> - BIZCe / zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh1voqZiegDfqnc1zqcPGUIWVEX / r87yloqaKHee95 <nl> - 70 + sB3c4 <nl> mmmmmmEND CERTIFICATEmmm - - <nl> - <nl> GlobalSign Root CA <nl> = = = = = = = = = = = = = = = = = = <nl> mmm - - BEGIN CERTIFICATEmmm - - <nl> xuKhXFSbplQAz / DxwceYMBo7Nhbbo27q / a2ywtrvAkcTisDxszGtTxzhT5yvDwyd93gN2PQ1VoDa <nl> t20Xj50egWTh / sVFuq1ruQp6Tk9LhO5L8X3dEQ = = <nl> mmm - - END CERTIFICATEmmm - - <nl> <nl> - Verisign Class 4 Public Primary Certification Authority - G3 <nl> - = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> mmmmmmBEGIN CERTIFICATEmmm - - <nl> - MIIEGjCCAwICEQDsoKeLbnVqAc / EfMwvlF7XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV <nl> - UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv <nl> - cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl <nl> - IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh <nl> - dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw <nl> - CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy <nl> - dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv <nl> - cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDQgUHVibGljIFByaW1hcnkg <nl> - Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC <nl> - ggEBAK3LpRFpxlmr8Y + 1GQ9Wzsy1HyDkniYlS + BzZYlZ3tCD5PUPtbut8XzoIfzk6AzufEUiGXaS <nl> - tBO3IFsJ + mGuqPKljYXCKtbeZjbSmwL0qJJgfJxptI8kHtCGUvYynEFYHiK9zUVilQhu0GbdU6LM <nl> - 8BDcVHOLBKFGMzNcF0C5nk3T875Vg + ixiY5afJqWIpA7iCXy0lOIAgwLePLmNxdLMEYH5IBtptiW <nl> - Lugs + BGzOA1mppvqySNb247i8xOOGlktqgLw7KSHZtzBP / XYufTsgsbSPZUd5cBPhMnZo0QoBmrX <nl> - Razwa2rvTl / 4EYIeOGM0ZlDUPpNz + jDDZq3 / ky2X7wMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA <nl> - j / ola09b5KROJ1WrIhVZPMq1CtRK26vdoV9TxaBXOcLORyu + OshWv8LZJxA6sQU8wHcxuzrTBXtt <nl> - mhwwjIDLk5Mqg6sFUYICABFna / OIYUdfA5PVWw3g8dShMjWFsjrbsIKr0csKvE + MW8VLADsfKoKm <nl> - fjaF3H48ZwC15DtS4KjrXRX5xm3wrR0OhbepmnMUWluPQSjA1egtTaRezarZ7c7c2NU8Qh0XwRJd <nl> - RTjDOPP8hS6DRkiy1yBfkjaP53kPmF6Z6PDQpLv1U70qzlmwr25 / bLvSHgCwIe34QWKCudiyxLtG <nl> - UPMxxY8BqHTr9Xgn2uf3ZkPznoM + IKrDNWCRzg = = <nl> mmmmmmEND CERTIFICATEmmm - - <nl> - <nl> Entrust . net Premium 2048 Secure Server CA <nl> = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> mmm - - BEGIN CERTIFICATEmmm - - <nl> W3iDVuycNsMm4hH2Z0kdkquM + + v / eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0 <nl> tHuu2guQOHXvgR1m0vdXcDazv / wor3ElhVsT / h5 / WrQ8 <nl> mmm - - END CERTIFICATEmmm - - <nl> <nl> - RSA Security 2048 v3 <nl> - = = = = = = = = = = = = = = = = = = = = <nl> mmmmmmBEGIN CERTIFICATEmmm - - <nl> - MIIDYTCCAkmgAwIBAgIQCgEBAQAAAnwAAAAKAAAAAjANBgkqhkiG9w0BAQUFADA6MRkwFwYDVQQK <nl> - ExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJpdHkgMjA0OCBWMzAeFw0wMTAy <nl> - MjIyMDM5MjNaFw0yNjAyMjIyMDM5MjNaMDoxGTAXBgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAb <nl> - BgNVBAsTFFJTQSBTZWN1cml0eSAyMDQ4IFYzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC <nl> - AQEAt49VcdKA3XtpeafwGFAyPGJn9gqVB93mG / Oe2dJBVGutn3y + Gc37RqtBaB4Y6lXIL5F4iSj7 <nl> - Jylg / 9 + PjDvJSZu1pJTOAeo + tWN7fyb9Gd3AIb2E0S1PRsNO3Ng3OTsor8udGuorryGlwSMiuLgb <nl> - WhOHV4PR8CDn6E8jQrAApX2J6elhc5SYcSa8LWrg903w8bYqODGBDSnhAMFRD0xS + ARaqn1y07iH <nl> - KrtjEAMqs6FPDVpeRrc9DvV07Jmf + T0kgYim3WBU6JU2PcYJk5qjEoAAVZkZR73QpXzDuvsf9 / UP <nl> - + Ky5tfQ3mBMY3oVbtwyCO4dvlTlYMNpuAWgXIszACwIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH / <nl> - MA4GA1UdDwEB / wQEAwIBBjAfBgNVHSMEGDAWgBQHw1EwpKrpRa41JPr / JCwz0LGdjDAdBgNVHQ4E <nl> - FgQUB8NRMKSq6UWuNST6 / yQsM9CxnYwwDQYJKoZIhvcNAQEFBQADggEBAF8 + hnZuuDU8TjYcHnmY <nl> - v / 3VEhF5Ug7uMYm83X / 50cYVIeiKAVQNOvtUudZj1LGqlk2iQk3UUx + LEN5 / Zb5gEydxiKRz44Rj <nl> - 0aRV4VCT5hsOedBnvEbIvz8XDZXmxpBp3ue0L96VfdASPz0 + f00 / FGj1EVDVwfSQpQgdMWD / YIwj <nl> - VAqv / qFuxdF6Kmh4zx6CCiC0H63lhbJqaHVOrSU3lIW + vaHU6rcMSzyd6BIA8F + sDeGscGNz9395 <nl> - nzIlQnQFgCi / vcEkllgVsRch6YlL2weIZ / QVrXA + L02FO8K32 / 6YaCOJ4XQP3vTFhGMpG8zLB8kA <nl> - pKnXwiJPZ9d37CAFYd4 = <nl> mmmmmmEND CERTIFICATEmmm - - <nl> - <nl> GeoTrust Global CA <nl> = = = = = = = = = = = = = = = = = = <nl> mmm - - BEGIN CERTIFICATEmmm - - <nl> EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR / GjqOC6oybtv8TyWf2TLH <nl> llpwrN9M <nl> mmm - - END CERTIFICATEmmm - - <nl> <nl> - Staat der Nederlanden Root CA <nl> - = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> mmmmmmBEGIN CERTIFICATEmmm - - <nl> - MIIDujCCAqKgAwIBAgIEAJiWijANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJOTDEeMBwGA1UE <nl> - ChMVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSYwJAYDVQQDEx1TdGFhdCBkZXIgTmVkZXJsYW5kZW4g <nl> - Um9vdCBDQTAeFw0wMjEyMTcwOTIzNDlaFw0xNTEyMTYwOTE1MzhaMFUxCzAJBgNVBAYTAk5MMR4w <nl> - HAYDVQQKExVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xJjAkBgNVBAMTHVN0YWF0IGRlciBOZWRlcmxh <nl> - bmRlbiBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmNK1URF6gaYUmHFt <nl> - vsznExvWJw56s2oYHLZhWtVhCb / ekBPHZ + 7d89rFDBKeNVU + LCeIQGv33N0iYfXCxw719tV2U02P <nl> - jLwYdjeFnejKScfST5gTCaI + Ioicf9byEGW07l8Y1Rfj + MX94p2i71MOhXeiD + EwR + 4A5zN9RGca <nl> - C1Hoi6CeUJhoNFIfLm0B8mBF8jHrqTFoKbt6QZ7GGX + UtFE5A3 + y3qcym7RHjm + 0Sq7lr7HcsBth <nl> - vJly3uSJt3omXdozSVtSnA71iq3DuD3oBmrC1SoLbHuEvVYFy4ZlkuxEK7COudxwC0barbxjiDn6 <nl> - 22r + I / q85Ej0ZytqERAhSQIDAQABo4GRMIGOMAwGA1UdEwQFMAMBAf8wTwYDVR0gBEgwRjBEBgRV <nl> - HSAAMDwwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cucGtpb3ZlcmhlaWQubmwvcG9saWNpZXMvcm9v <nl> - dC1wb2xpY3kwDgYDVR0PAQH / BAQDAgEGMB0GA1UdDgQWBBSofeu8Y6R0E3QA7Jbg0zTBLL9s + DAN <nl> - BgkqhkiG9w0BAQUFAAOCAQEABYSHVXQ2YcG70dTGFagTtJ + k / rvuFbQvBgwp8qiSpGEN / KtcCFtR <nl> - EytNwiphyPgJWPwtArI5fZlmgb9uXJVFIGzmeafR2Bwp / MIgJ1HI8XxdNGdphREwxgDS1 / PTfLbw <nl> - MVcoEoJz6TMvplW0C5GUR5z6u3pCMuiufi3IvKwUv9kP2Vv8wfl6leF9fpb8cbDCTMjfRTTJzg3y <nl> - nGQI0DvDKcWy7ZAEwbEpkcUwb8GpcjPM / l0WFywRaed + / sWDCN + 83CI6LiBpIzlWYGeQiy52OfsR <nl> - iJf2fL1LuCAWZwWN4jvBcj + UlTfHXbme2JOhF4 / / DGYVwSR8MnwDHTuhWEUykw = = <nl> mmmmmmEND CERTIFICATEmmm - - <nl> - <nl> - UTN DATACorp SGC Root CA <nl> - = = = = = = = = = = = = = = = = = = = = = = = = <nl> mmmmmmBEGIN CERTIFICATEmmm - - <nl> - MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCBkzELMAkGA1UE <nl> - BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl <nl> - IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZ <nl> - BgNVBAMTElVUTiAtIERBVEFDb3JwIFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBa <nl> - MIGTMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4w <nl> - HAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRy <nl> - dXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjANBgkqhkiG9w0BAQEFAAOC <nl> - AQ8AMIIBCgKCAQEA3 + 5YEKIrblXEjr8uRgnn4AgPLit6E5Qbvfa2gI5lBZMAHryv4g + OGQ0SR + ys <nl> - raP6LnD43m77VkIVni5c7yPeIbkFdicZD0 / Ww5y0vpQZY / KmEQrrU0icvvIpOxboGqBMpsn0GFlo <nl> - wHDyUwDAXlCCpVZvNvlK4ESGoE1O1kduSUrLZ9emxAW5jh70 / P / N5zbgnAVssjMiFdC04MwXwLLA <nl> - 9P4yPykqlXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh + xKrhfQgUL7EYw0XILyulWbfXv <nl> - 33i + Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQABo4GrMIGoMAsGA1Ud <nl> - DwQEAwIBxjAPBgNVHRMBAf8EBTADAQH / MB0GA1UdDgQWBBRTMtGzz3 / 64PGgXYVOktKeRR20TzA9 <nl> - BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dD <nl> - LmNybDAqBgNVHSUEIzAhBggrBgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3 <nl> - DQEBBQUAA4IBAQAnNZcAiosovcYzMB4p / OL31ZjUQLtgyr + rFywJNn9Q + kHcrpY6CiM + iVnJowft <nl> - Gzet / Hy + UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyjj98C5OBxOvG0 <nl> - I3KgqgHf35g + FFCgMSa9KOlaMCZ1 + XtgHI3zzVAmbQQnmt / VDUVHKWss5nbZqSl9Mt3JNjy9rjXx <nl> - EZ4du5A / EkdOjtd + D2JzHVImOBwYSf0wdJrE5SIv2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwP <nl> - DPafepE39peC4N1xaf92P2BNPM / 3mfnGV / TJVTl4uix5yaaIK / QI <nl> mmmmmmEND CERTIFICATEmmm - - <nl> - <nl> UTN USERFirst Hardware Root CA <nl> = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> mmm - - BEGIN CERTIFICATEmmm - - <nl> IBHNfTIzSJRUTN3cecQwn + uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREes <nl> t2d / AYoFWpO + ocH / + OcOZ6RHSXZddZAa9SaP8A = = <nl> mmm - - END CERTIFICATEmmm - - <nl> <nl> - NetLock Notary ( Class A ) Root <nl> - = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> mmmmmmBEGIN CERTIFICATEmmm - - <nl> - MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQI <nl> - EwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6 <nl> - dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9j <nl> - ayBLb3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oX <nl> - DTE5MDIxOTIzMTQ0N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQH <nl> - EwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYD <nl> - VQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFz <nl> - cyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSM <nl> - D7tM9DceqQWC2ObhbHDqeLVu0ThEDaiDzl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZ <nl> - z + qMkjvN9wfcZnSX9EUi3fRc4L9t875lM + QVOr / bmJBVOMTtplVjC7B4BPTjbsE / jvxReB + SnoPC <nl> - / tmwqcm8WgD / qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1 + mm9dU7GrDPzr4PN6s6iz / 0b2Y6LYOph7 <nl> - tqyF / 7AlT3Rj5xMHpQqPBffAZG9 + pyeAlt7ULoZgx2srXnN7F + eRP2QM2EsiNCubMvJIH5 + hCoR6 <nl> - 4sKtlz2O1cH5VqNQ6ca0 + pii7pXmKgOM3wIDAQABo4ICnzCCApswDgYDVR0PAQH / BAQDAgAGMBIG <nl> - A1UdEwEB / wQIMAYBAf8CAQQwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaC <nl> - Ak1GSUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pv <nl> - bGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQu <nl> - IEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2Vn <nl> - LWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0 <nl> - ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFz <nl> - IGxlaXJhc2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBh <nl> - IGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVu <nl> - b3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1YW5jZSBh <nl> - bmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sg <nl> - Q1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFp <nl> - bCBhdCBjcHNAbmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv + sgoA0BO5TE5 <nl> - ayZrU3 / b39 / zcT0mwBQOxmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B / 6 + CgmM0ZjP <nl> - ytoUMaFP0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6 + NJMSEN1rUQQeJB <nl> - CWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp + uxdAu6tYPVuxkf1qbFFgBJ34TUMdr <nl> - KuZoPL9coAob4Q566eKAw + np9v1sEZ7Q5SgnK1QyQhSCdeZK8CtmdWOMovsEPoMOmzbwGOQmIMOM <nl> - 8CgHrTwXZoi1 / baI <nl> mmmmmmEND CERTIFICATEmmm - - <nl> - <nl> XRamp Global CA Root <nl> = = = = = = = = = = = = = = = = = = = = <nl> mmm - - BEGIN CERTIFICATEmmm - - <nl> vFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf29w4LTJxoeHtxMcfrHuBnQfO3 <nl> oKfN5XozNmr6mis = <nl> mmm - - END CERTIFICATEmmm - - <nl> <nl> - TURKTRUST Certificate Services Provider Root 1 <nl> - = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> mmmmmmBEGIN CERTIFICATEmmm - - <nl> - MIID + zCCAuOgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBtzE / MD0GA1UEAww2VMOcUktUUlVTVCBF <nl> - bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGDAJUUjEP <nl> - MA0GA1UEBwwGQU5LQVJBMVYwVAYDVQQKDE0oYykgMjAwNSBUw5xSS1RSVVNUIEJpbGdpIMSwbGV0 <nl> - acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjAeFw0wNTA1MTMx <nl> - MDI3MTdaFw0xNTAzMjIxMDI3MTdaMIG3MT8wPQYDVQQDDDZUw5xSS1RSVVNUIEVsZWt0cm9uaWsg <nl> - U2VydGlmaWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLExCzAJBgNVBAYMAlRSMQ8wDQYDVQQHDAZB <nl> - TktBUkExVjBUBgNVBAoMTShjKSAyMDA1IFTDnFJLVFJVU1QgQmlsZ2kgxLBsZXRpxZ9pbSB2ZSBC <nl> - aWxpxZ9pbSBHw7x2ZW5sacSfaSBIaXptZXRsZXJpIEEuxZ4uMIIBIjANBgkqhkiG9w0BAQEFAAOC <nl> - AQ8AMIIBCgKCAQEAylIF1mMD2Bxf3dJ7XfIMYGFbazt0K3gNfUW9InTojAPBxhEqPZW8qZSwu5GX <nl> - yGl8hMW0kWxsE2qkVa2kheiVfrMArwDCBRj1cJ02i67L5BuBf5OI + 2pVu32Fks66WJ / bMsW9Xe8i <nl> - Si9BB35JYbOG7E6mQW6EvAPs9TscyB / C7qju6hJKjRTP8wrgUDn5CDX4EVmt5yLqS8oUBt5CurKZ <nl> - 8y1UiBAG6uEaPj1nH / vO + 3yC6BFdSsG5FOpU2WabfIl9BJpiyelSPJ6c79L1JuTm5Rh8i27fbMx4 <nl> - W09ysstcP4wFjdFMjK2Sx + F4f2VsSQZQLJ4ywtdKxnWKWU51b0dewQIDAQABoxAwDjAMBgNVHRME <nl> - BTADAQH / MA0GCSqGSIb3DQEBBQUAA4IBAQAV9VX / N5aAWSGk / KEVTCD21F / aAyT8z5Aa9CEKmu46 <nl> - sWrv7 / hg0Uw2ZkUd82YCdAR7kjCo3gp2D + + Vbr3JN + YaDayJSFvMgzbC9UZcWYJWtNX + I7TYVBxE <nl> - q8Sn5RTOPEFhfEPmzcSBCYsk + 1Ql1haolgxnB2 + zUEfjHCQo3SqYpGH + 2 + oSN7wBGjSFvW5P55Fy <nl> - B0SFHljKVETd96y5y4khctuPwGkplyqjrhgjlxxBKot8KsF8kOipKMDTkcatKIdAaLX / 7KfS0zgY <nl> - nNN9aV3wxqUeJBujR / xpB2jn5Jq07Q + hh4cCzofSSE7hvP / L8XKSRGQDJereW26fyfJOrN3H <nl> mmmmmmEND CERTIFICATEmmm - - <nl> - <nl> - TURKTRUST Certificate Services Provider Root 2 <nl> - = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> mmmmmmBEGIN CERTIFICATEmmm - - <nl> - MIIEPDCCAySgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvjE / MD0GA1UEAww2VMOcUktUUlVTVCBF <nl> - bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJUUjEP <nl> - MA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUg <nl> - QmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwHhcN <nl> - MDUxMTA3MTAwNzU3WhcNMTUwOTE2MTAwNzU3WjCBvjE / MD0GA1UEAww2VMOcUktUUlVTVCBFbGVr <nl> - dHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJUUjEPMA0G <nl> - A1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmls <nl> - acWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwggEiMA0G <nl> - CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpNn7DkUNMwxmYCMjHWHtPFoylzkkBH3MOrHUTpvqe <nl> - LCDe2JAOCtFp0if7qnefJ1Il4std2NiDUBd9irWCPwSOtNXwSadktx4uXyCcUHVPr + G1QRT0mJKI <nl> - x + XlZEdhR3n9wFHxwZnn3M5q + 6 + 1ATDcRhzviuyV79z / rxAc653YsKpqhRgNF8k + v / Gb0AmJQv2g <nl> - QrSdiVFVKc8bcLyEVK3BEx + Y9C52YItdP5qtygy / p1Zbj3e41Z55SZI / 4PGXJHpsmxcPbe9TmJEr <nl> - 5A + + WXkHeLuXlfSfadRYhwqp48y2WBmfJiGxxFmNskF1wK1pzpwACPI2 / z7woQ8arBT9pmAPAgMB <nl> - AAGjQzBBMB0GA1UdDgQWBBTZN7NOBf3Zz58SFq62iS / rJTqIHDAPBgNVHQ8BAf8EBQMDBwYAMA8G <nl> - A1UdEwEB / wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHJglrfJ3NgpXiOFX7KzLXb7iNcX / ntt <nl> - Rbj2hWyfIvwqECLsqrkw9qtY1jkQMZkpAL2JZkH7dN6RwRgLn7Vhy506vvWolKMiVW4XSf / SKfE4 <nl> - Jl3vpao6 + XF75tpYHdN0wgH6PmlYX63LaL4ULptswLbcoCb6dxriJNoaN + BnrdFzgw2lGh1uEpJ + <nl> - hGIAF728JRhX8tepb1mIvDS3LoV4nZbcFMMsilKbloxSZj2GFotHuFEJjOp9zYhys2AzsfAKRO8P <nl> - 9Qk3iCQOLGsgOqL6EfJANZxEaGM7rDNvY7wsu / LSy3Z9fYjYHcgFHW68lKlmjHdxx / qR + i9Rnuk5 <nl> - UrbnBEI = <nl> mmmmmmEND CERTIFICATEmmm - - <nl> - <nl> SwissSign Gold CA - G2 <nl> = = = = = = = = = = = = = = = = = = = = = = <nl> mmm - - BEGIN CERTIFICATEmmm - - <nl> FAkK + qDmfQjGGoe9GKhzvSbKYAydzpmfz1wPMOG + FDHqAjAU9JM8SaczepBGR7NjfRObTrdvGDeA <nl> U / 7dIOA1mjbRxwG55tzd8 / 8dLDoWV9mSOdY = <nl> mmm - - END CERTIFICATEmmm - - <nl> <nl> - IGC / A <nl> - = = = = = <nl> mmmmmmBEGIN CERTIFICATEmmm - - <nl> - MIIEAjCCAuqgAwIBAgIFORFFEJQwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYTAkZSMQ8wDQYD <nl> - VQQIEwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVE <nl> - Q1NTSTEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZy <nl> - MB4XDTAyMTIxMzE0MjkyM1oXDTIwMTAxNzE0MjkyMlowgYUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQI <nl> - EwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVEQ1NT <nl> - STEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZyMIIB <nl> - IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsh / R0GLFMzvABIaIs9z4iPf930Pfeo2aSVz2 <nl> - TqrMHLmh6yeJ8kbpO0px1R2OLc / mratjUMdUC24SyZA2xtgv2pGqaMVy / hcKshd + ebUyiHDKcMCW <nl> - So7kVc0dJ5S / znIq7Fz5cyD + vfcuiWe4u0dzEvfRNWk68gq5rv9GQkaiv6GFGvm / 5P9JhfejcIYy <nl> - HF2fYPepraX / z9E0 + X1bF8bc1g4oa8Ld8fUzaJ1O / Id8NhLWo4DoQw1VYZTqZDdH6nfK0LJYBcNd <nl> - frGoRpAxVs5wKpayMLh35nnAvSk7 / ZR3TL0gzUEl4C7HG7vupARB0l2tEmqKm0f7yd1GQOGdPDPQ <nl> - tQIDAQABo3cwdTAPBgNVHRMBAf8EBTADAQH / MAsGA1UdDwQEAwIBRjAVBgNVHSAEDjAMMAoGCCqB <nl> - egF5AQEBMB0GA1UdDgQWBBSjBS8YYFDCiQrdKyFP / 45OqDAxNjAfBgNVHSMEGDAWgBSjBS8YYFDC <nl> - iQrdKyFP / 45OqDAxNjANBgkqhkiG9w0BAQUFAAOCAQEABdwm2Pp3FURo / C9mOnTgXeQp / wYHE4RK <nl> - q89toB9RlPhJy3Q2FLwV3duJL92PoF189RLrn544pEfMs5bZvpwlqwN + Mw + VgQ39FuCIvjfwbF3Q <nl> - MZsyK10XZZOYYLxuj7GoPB7ZHPOpJkL5ZB3C55L29B5aqhlSXa / oovdgoPaN8In1buAKBQGVyYsg <nl> - Crpa / JosPL3Dt8ldeCUFP1YUmwza + zpI / pdpXsoQhvdOlgQITeywvl3cO45Pwf2aNjSaTFR + FwNI <nl> - lQgRHAdvhQh + XU3Endv7rs6y0bO4g2wdsrN58dhwmX7wEwLOXt1R0982gaEbeC9xs / FZTEYYKKuF <nl> - 0mBWWg = = <nl> mmmmmmEND CERTIFICATEmmm - - <nl> - <nl> Security Communication EV RootCA1 <nl> = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> mmm - - BEGIN CERTIFICATEmmm - - <nl> PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY <nl> WyH8EZE0vkHve52Xdf + XlcCWWC / qu0bXu + TZLg = = <nl> mmm - - END CERTIFICATEmmm - - <nl> <nl> - TC TrustCenter Class 2 CA II <nl> - = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> mmmmmmBEGIN CERTIFICATEmmm - - <nl> - MIIEqjCCA5KgAwIBAgIOLmoAAQACH9dSISwRXDswDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UEBhMC <nl> - REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNVBAsTGVRDIFRydXN0Q2VudGVy <nl> - IENsYXNzIDIgQ0ExJTAjBgNVBAMTHFRDIFRydXN0Q2VudGVyIENsYXNzIDIgQ0EgSUkwHhcNMDYw <nl> - MTEyMTQzODQzWhcNMjUxMjMxMjI1OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1 <nl> - c3RDZW50ZXIgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQTElMCMGA1UE <nl> - AxMcVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC <nl> - AQoCggEBAKuAh5uO8MN8h9foJIIRszzdQ2Lu + MNF2ujhoF / RKrLqk2jftMjWQ + nEdVl / / OEd + DFw <nl> - IxuInie5e / 060smp6RQvkL4DUsFJzfb95AhmC1eKokKguNV / aVyQMrKXDcpK3EY + AlWJU + MaWss2 <nl> - xgdW94zPEfRMuzBwBJWl9jmM / XOBCH2JXjIeIqkiRUuwZi4wzJ9l / fzLganx4Duvo4bRierERXlQ <nl> - Xa7pIXSSTYtZgo + U4 + lK8edJsBTj9WLL1XK9H7nSn6DNqPoByNkN39r8R52zyFTfSUrxIan + GE7u <nl> - SNQZu + 995OKdy1u2bv / jzVrndIIFuoAlOMvkaZ6vQaoahPUCAwEAAaOCATQwggEwMA8GA1UdEwEB <nl> - / wQFMAMBAf8wDgYDVR0PAQH / BAQDAgEGMB0GA1UdDgQWBBTjq1RMgKHbVkO3kUrL84J6E1wIqzCB <nl> - 7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRydXN0Y2VudGVyLmRlL2NybC92Mi90 <nl> - Y19jbGFzc18yX2NhX0lJLmNybIaBn2xkYXA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBU <nl> - cnVzdENlbnRlciUyMENsYXNzJTIwMiUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21i <nl> - SCxPVT1yb290Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU / Y2VydGlmaWNhdGVSZXZvY2F0aW9u <nl> - TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEAjNfffu4bgBCzg / XbEeprS6iSGNn3Bzn1LL4G <nl> - dXpoUxUc6krtXvwjshOg0wn / 9vYua0Fxec3ibf2uWWuFHbhOIprtZjluS5TmVfwLG4t3wVMTZonZ <nl> - KNaL80VKY7f9ewthXbhtvsPcW3nS7Yblok2 + XnR8au0WOB9 / WIFaGusyiC2y8zl3gK9etmF1Kdsj <nl> - TYjKUCjLhdLTEKJZbtOTVAB6okaVhgWcqRmY5TFyDADiZ9lA4CQze28suVyrZZ0srHbqNZn1l7kP <nl> - JOzHdiEoZa5X6AeIdUpWoNIFOqTmjZKILPPy4cHGYdtBxceb9w4aUUXCYWvcZCcXjFq32nQozZfk <nl> - vQ = = <nl> mmmmmmEND CERTIFICATEmmm - - <nl> - <nl> - TC TrustCenter Universal CA I <nl> - = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> mmmmmmBEGIN CERTIFICATEmmm - - <nl> - MIID3TCCAsWgAwIBAgIOHaIAAQAC7LdggHiNtgYwDQYJKoZIhvcNAQEFBQAweTELMAkGA1UEBhMC <nl> - REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNVBAsTG1RDIFRydXN0Q2VudGVy <nl> - IFVuaXZlcnNhbCBDQTEmMCQGA1UEAxMdVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBIEkwHhcN <nl> - MDYwMzIyMTU1NDI4WhcNMjUxMjMxMjI1OTU5WjB5MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMg <nl> - VHJ1c3RDZW50ZXIgR21iSDEkMCIGA1UECxMbVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBMSYw <nl> - JAYDVQQDEx1UQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0EgSTCCASIwDQYJKoZIhvcNAQEBBQAD <nl> - ggEPADCCAQoCggEBAKR3I5ZEr5D0MacQ9CaHnPM42Q9e3s9B6DGtxnSRJJZ4Hgmgm5qVSkr1YnwC <nl> - qMqs + 1oEdjneX / H5s7 / zA1hV0qq34wQi0fiU2iIIAI3TfCZdzHd55yx4Oagmcw6iXSVphU9VDprv <nl> - xrlE4Vc93x9UIuVvZaozhDrzznq + VZeujRIPFDPiUHDDSYcTvFHe15gSWu86gzOSBnWLknwSaHtw <nl> - ag + 1m7Z3W0hZneTvWq3zwZ7U10VOylY0Ibw + F1tvdwxIAUMpsN0 / lm7mlaoMwCC2 / T42J5zjXM9O <nl> - gdwZu5GQfezmlwQek8wiSdeXhrYTCjxDI3d + 8NzmzSQfO4ObNDqDNOMCAwEAAaNjMGEwHwYDVR0j <nl> - BBgwFoAUkqR1LKSevoFE63n8isWVpesQdXMwDwYDVR0TAQH / BAUwAwEB / zAOBgNVHQ8BAf8EBAMC <nl> - AYYwHQYDVR0OBBYEFJKkdSyknr6BROt5 / IrFlaXrEHVzMA0GCSqGSIb3DQEBBQUAA4IBAQAo0uCG <nl> - 1eb4e / CX3CJrO5UUVg8RMKWaTzqwOuAGy2X17caXJ / 4l8lfmXpWMPmRgFVp / Lw0BxbFg / UU1z / Cy <nl> - vwbZ71q + s2IhtNerNXxTPqYn8aEt2hojnczd7Dwtnic0XQ / CNnm8yUpiLe1r2X1BQ3y2qsrtYbE3 <nl> - ghUJGooWMNjsydZHcnhLEEYUjl8Or + zHL6sQ17bxbuyGssLoDZJz3KL0Dzq / YSMQiZxIQG5wALPT <nl> - ujdEWBF6AmqI8Dc08BnprNRlc / ZpjGSUOnmFKbAWKwyCPwacx / 0QK54PLLae4xW / 2TYcuiUaUj0a <nl> - 7CIMHOCkoj3w6DnPgcB77V0fb8XQC9eY <nl> mmmmmmEND CERTIFICATEmmm - - <nl> - <nl> Deutsche Telekom Root CA 2 <nl> = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> mmm - - BEGIN CERTIFICATEmmm - - <nl> dyd1Lx + 4ivn + xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU <nl> Cm26OWMohpLzGITY + 9HPBVZkVw = = <nl> mmm - - END CERTIFICATEmmm - - <nl> <nl> - ComSign Secured CA <nl> - = = = = = = = = = = = = = = = = = = <nl> mmmmmmBEGIN CERTIFICATEmmm - - <nl> - MIIDqzCCApOgAwIBAgIRAMcoRwmzuGxFjB36JPU2TukwDQYJKoZIhvcNAQEFBQAwPDEbMBkGA1UE <nl> - AxMSQ29tU2lnbiBTZWN1cmVkIENBMRAwDgYDVQQKEwdDb21TaWduMQswCQYDVQQGEwJJTDAeFw0w <nl> - NDAzMjQxMTM3MjBaFw0yOTAzMTYxNTA0NTZaMDwxGzAZBgNVBAMTEkNvbVNpZ24gU2VjdXJlZCBD <nl> - QTEQMA4GA1UEChMHQ29tU2lnbjELMAkGA1UEBhMCSUwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw <nl> - ggEKAoIBAQDGtWhfHZQVw6QIVS3joFd67 + l0Kru5fFdJGhFeTymHDEjWaueP1H5XJLkGieQcPOqs <nl> - 49ohgHMhCu95mGwfCP + hUH3ymBvJVG8 + pSjsIQQPRbsHPaHA + iqYHU4Gk / v1iDurX8sWv + bznkqH <nl> - 7Rnqwp9D5PGBpX8QTz7RSmKtUxvLg / 8HZaWSLWapW7ha9B20IZFKF3ueMv5WJDmyVIRD9YTC2LxB <nl> - kMyd1mja6YJQqTtoz7VdApRgFrFD2UNd3V2Hbuq7s8lr9gOUCXDeFhF6K + h2j0kQmHe5Y1yLM5d1 <nl> - 9guMsqtb3nQgJT / j8xH5h2iGNXHDHYwt6 + UarA9z1YJZQIDTAgMBAAGjgacwgaQwDAYDVR0TBAUw <nl> - AwEB / zBEBgNVHR8EPTA7MDmgN6A1hjNodHRwOi8vZmVkaXIuY29tc2lnbi5jby5pbC9jcmwvQ29t <nl> - U2lnblNlY3VyZWRDQS5jcmwwDgYDVR0PAQH / BAQDAgGGMB8GA1UdIwQYMBaAFMFL7XC29z58ADsA <nl> - j8c + DkWfHl3sMB0GA1UdDgQWBBTBS + 1wtvc + fAA7AI / HPg5Fnx5d7DANBgkqhkiG9w0BAQUFAAOC <nl> - AQEAFs / ukhNQq3sUnjO2QiBq1BW9Cav8cujvR3qQrFHBZE7piL1DRYHjZiM / EoZNGeQFsOY3wo3a <nl> - BijJD4mkU6l1P7CW + 6tMM1X5eCZGbxs2mPtCdsGCuY7e + 0X5YxtiOzkGynd6qDwJz2w2PQ8KRUtp <nl> - FhpFfTMDZflScZAmlaxMDPWLkz / MdXSFmLr / YnpNH4n + rr2UAJm / EaXc4HnFFgt9AmEd6oX5AhVP <nl> - 51qJThRv4zdLhfXBPGHg / QVBspJ / wx2g0K5SZGBrGMYmnNj1ZOQ2GmKfig8 + / 21OGVZOIJFsnzQz <nl> - OjRXUDpvgV4GxvU + fE6OK85lBi5d0ipTdF7Tbieejw = = <nl> mmmmmmEND CERTIFICATEmmm - - <nl> - <nl> Cybertrust Global Root <nl> = = = = = = = = = = = = = = = = = = = = = = <nl> mmm - - BEGIN CERTIFICATEmmm - - <nl> LBOhgLJeDEoTniDYYkCrkOpkSi + sDQESeUWoL4cZaMjihccwsnX5OD + ywJO0a + IDRM5noN + J1q2M <nl> dqMTw5RhK2vZbMEHCiIHhWyFJEapvj + LeISCfiQMnf2BN + MlqO02TpUsyZyQ2uypQjyttgI = <nl> mmm - - END CERTIFICATEmmm - - <nl> <nl> - Buypass Class 2 CA 1 <nl> - = = = = = = = = = = = = = = = = = = = = <nl> mmmmmmBEGIN CERTIFICATEmmm - - <nl> - MIIDUzCCAjugAwIBAgIBATANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU <nl> - QnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMiBDQSAxMB4XDTA2 <nl> - MTAxMzEwMjUwOVoXDTE2MTAxMzEwMjUwOVowSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBh <nl> - c3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDIgQ0EgMTCCASIwDQYJKoZI <nl> - hvcNAQEBBQADggEPADCCAQoCggEBAIs8B0XY9t / mx8q6jUPFR42wWsE425KEHK8T1A9vNkYgxC7M <nl> - cXA0ojTTNy7Y3Tp3L8DrKehc0rWpkTSHIln + zNvnma + WwajHQN2lFYxuyHyXA8vmIPLXl18xoS83 <nl> - 0r7uvqmtqEyeIWZDO6i88wmjONVZJMHCR3axiFyCO7srpgTXjAePzdVBHfCuuCkslFJgNJQ72uA4 <nl> - 0Z0zPhX0kzLFANq1KWYOOngPIVJfAuWSeyXTkh4vFZ2B5J2O6O + JzhRMVB0cgRJNcKi + EAUXfh / R <nl> - uFdV7c27UsKwHnjCTTZoy1YmwVLBvXb3WNVyfh9EdrsAiR0WnVE1703CVu9r4Iw7DekCAwEAAaNC <nl> - MEAwDwYDVR0TAQH / BAUwAwEB / zAdBgNVHQ4EFgQUP42aWYv8e3uco684sDntkHGA1sgwDgYDVR0P <nl> - AQH / BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAVGn4TirnoB6NLJzKyQJHyIdFkhb5jatLPgcIV <nl> - 1Xp + DCmsNx4cfHZSldq1fyOhKXdlyTKdqC5Wq2B2zha0jX94wNWZUYN / Xtm + DKhQ7SLHrQVMdvvt <nl> - 7h5HZPb3J31cKA9FxVxiXqaakZG3Uxcu3K1gnZZkOb1naLKuBctN518fV4bVIJwo + 28TOPX2EZL2 <nl> - fZleHwzoq0QkKXJAPTZSr4xYkHPB7GEseaHsh7U / 2k3ZIQAw3pDaDtMaSKk + hQsUi4y8QZ5q9w5w <nl> - wDX3OaJdZtB7WZ + oRxKaJyOkLY4ng5IgodcVf / EuGO70SH8vf / GhGLWhC5SgYiAynB321O + / TIho <nl> mmmmmmEND CERTIFICATEmmm - - <nl> - <nl> - Buypass Class 3 CA 1 <nl> - = = = = = = = = = = = = = = = = = = = = <nl> mmmmmmBEGIN CERTIFICATEmmm - - <nl> - MIIDUzCCAjugAwIBAgIBAjANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU <nl> - QnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMyBDQSAxMB4XDTA1 <nl> - MDUwOTE0MTMwM1oXDTE1MDUwOTE0MTMwM1owSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBh <nl> - c3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMTCCASIwDQYJKoZI <nl> - hvcNAQEBBQADggEPADCCAQoCggEBAKSO13TZKWTeXx + HgJHqTjnmGcZEC4DVC69TB4sSveZn8AKx <nl> - ifZgisRbsELRwCGoy + Gb72RRtqfPFfV0gGgEkKBYouZ0plNTVUhjP5JW3SROjvi6K / / zNIqeKNc0 <nl> - n6wv1g / xpC + 9UrJJhW05NfBEMJNGJPO251P7vGGvqaMU + 8IXF4Rs4HyI + MkcVyzwPX6UvCWThOia <nl> - AJpFBUJXgPROztmuOfbIUxAMZTpHe2DC1vqRycZxbL2RhzyRhkmr8w + gbCZ2Xhysm3HljbybIR6c <nl> - 1jh + JIAVMYKWsUnTYjdbiAwKYjT + p0h + mbEwi5A3lRyoH6UsjfRVyNvdWQrCrXig9IsCAwEAAaNC <nl> - MEAwDwYDVR0TAQH / BAUwAwEB / zAdBgNVHQ4EFgQUOBTmyPCppAP0Tj4io1vy1uCtQHQwDgYDVR0P <nl> - AQH / BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQABZ6OMySU9E2NdFm / soT4JXJEVKirZgCFPBdy7 <nl> - pYmrEzMqnji3jG8CcmPHc3ceCQa6Oyh7pEfJYWsICCD8igWKH7y6xsL + z27sEzNxZy5p + qksP2bA <nl> - EllNC1QCkoS72xLvg3BweMhT + t / Gxv / ciC8HwEmdMldg0 / L2mSlf56oBzKwzqBwKu5HEA6BvtjT5 <nl> - htOzdlSY9EqBs1OdTUDs5XcTRa9bqh / YL0yCe / 4qxFi7T / ye / QNlGioOw6UgFpRreaaiErS7GqQj <nl> - el / wroQk5PMr + 4okoyeYZdowdXb8GZHo2 + ubPzK / QJcHJrrM85SFSnonk8 + QQtS4Wxam58tAA915 <nl> mmmmmmEND CERTIFICATEmmm - - <nl> - <nl> - EBG Elektronik Sertifika Hizmet Sa \ xC4 \ x9Flay \ xc4 \ xb1 \ x63 \ xc4 \ xb1s \ xc4 \ xb1 <nl> - = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> mmmmmmBEGIN CERTIFICATEmmm - - <nl> - MIIF5zCCA8 + gAwIBAgIITK9zQhyOdAIwDQYJKoZIhvcNAQEFBQAwgYAxODA2BgNVBAMML0VCRyBF <nl> - bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMTcwNQYDVQQKDC5FQkcg <nl> - QmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXptZXRsZXJpIEEuxZ4uMQswCQYDVQQGEwJUUjAe <nl> - Fw0wNjA4MTcwMDIxMDlaFw0xNjA4MTQwMDMxMDlaMIGAMTgwNgYDVQQDDC9FQkcgRWxla3Ryb25p <nl> - ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTE3MDUGA1UECgwuRUJHIEJpbGnFn2lt <nl> - IFRla25vbG9qaWxlcmkgdmUgSGl6bWV0bGVyaSBBLsWeLjELMAkGA1UEBhMCVFIwggIiMA0GCSqG <nl> - SIb3DQEBAQUAA4ICDwAwggIKAoICAQDuoIRh0DpqZhAy2DE4f6en5f2h4fuXd7hxlugTlkaDT7by <nl> - X3JWbhNgpQGR4lvFzVcfd2NR / y8927k / qqk153nQ9dAktiHq6yOU / im / + 4mRDGSaBUorzAzu8T2b <nl> - gmmkTPiab + ci2hC6X5L8GCcKqKpE + i4stPtGmggDg3KriORqcsnlZR9uKg + ds + g75AxuetpX / dfr <nl> - eYteIAbTdgtsApWjluTLdlHRKJ2hGvxEok3MenaoDT2 / F08iiFD9rrbskFBKW5 + VQarKD7JK / oCZ <nl> - TqNGFav4c0JqwmZ2sQomFd2TkuzbqV9UIlKRcF0T6kjsbgNs2d1s / OsNA / + mgxKb8amTD8UmTDGy <nl> - Y5lhcucqZJnSuOl14nypqZoaqsNW2xCaPINStnuWt6yHd6i58mcLlEOzrz5z + kI2sSXFCjEmN1Zn <nl> - uqMLfdb3ic1nobc6HmZP9qBVFCVMLDMNpkGMvQQxahByCp0OLna9XvNRiYuoP1Vzv9s6xiQFlpJI <nl> - qkuNKgPlV5EQ9GooFW5Hd4RcUXSfGenmHmMWOeMRFeNYGkS9y8RsZteEBt8w9DeiQyJ50hBs37vm <nl> - ExH8nYQKE3vwO9D8owrXieqWfo1IhR5kX9tUoqzVegJ5a9KK8GfaZXINFHDk6Y54jzJ0fFfy1tb0 <nl> - Nokb + Clsi7n2l9GkLqq + CxnCRelwXQIDAJ3Zo2MwYTAPBgNVHRMBAf8EBTADAQH / MA4GA1UdDwEB <nl> - / wQEAwIBBjAdBgNVHQ4EFgQU587GT / wWZ5b6SqMHwQSny2re2kcwHwYDVR0jBBgwFoAU587GT / wW <nl> - Z5b6SqMHwQSny2re2kcwDQYJKoZIhvcNAQEFBQADggIBAJuYml2 + 8ygjdsZs93 / mQJ7ANtyVDR2t <nl> - FcU22NU57 / IeIl6zgrRdu0waypIN30ckHrMk2pGI6YNw3ZPX6bqz3xZaPt7gyPvT / Wwp + BVGoGgm <nl> - zJNSroIBk5DKd8pNSe / iWtkqvTDOTLKBtjDOWU / aWR1qeqRFsIImgYZ29fUQALjuswnoT4cCB64k <nl> - XPBfrAowzIpAoHMEwfuJJPaaHFy3PApnNgUIMbOv2AFoKuB4j3TeuFGkjGwgPaL7s9QJ / XvCgKqT <nl> - bCmYIai7FvOpEl90tYeY8pUm3zTvilORiF0alKM / fCL414i6poyWqD1SNGKfAB5UVUJnxk1Gj7sU <nl> - RT0KlhaOEKGXmdXTMIXM3rRyt7yKPBgpaP3ccQfuJDlq + u2lrDgv + R4QDgZxGhBM / nV + / x5XOULK <nl> - 1 + EVoVZVWRvRo68R2E7DpSvvkL / A7IITW43WciyTTo9qKd + FPNMN4KIYEsxVL0e3p5sC / kH2iExt <nl> - 2qkBR4NkJ2IQgtYSe14DHzSpyZH + r11thie3I6p1GMog57AP14kOpmciY / SDQSsGS7tY1dHXt7kQ <nl> - Y9iJSrSq3RZj9W6 + YKH47ejWkE8axsWgKdOnIaj1Wjz3x0miIZpKlVIglnKaZsv30oZDfCK + lvm9 <nl> - AahH3eU7QPl1K5srRmSGjR70j / sHd9DqSaIcjVIUpgqT <nl> mmmmmmEND CERTIFICATEmmm - - <nl> - <nl> certSIGN ROOT CA <nl> = = = = = = = = = = = = = = = = <nl> mmm - - BEGIN CERTIFICATEmmm - - <nl> AJw9SDkjOVgaFRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA = = <nl> mmm - - END CERTIFICATEmmm - - <nl> <nl> NetLock Arany ( Class Gold ) Főtanúsítvány <nl> - = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> + = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> mmm - - BEGIN CERTIFICATEmmm - - <nl> MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQGEwJIVTERMA8G <nl> A1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610 <nl> IPVVYpbtbZNQvOSqeK3Zywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW + wmG2UMbX4cQrcufx9MmDm <nl> 66 + KAQ = = <nl> mmm - - END CERTIFICATEmmm - - <nl> <nl> - CA Disig <nl> - = = = = = = = = <nl> mmmmmmBEGIN CERTIFICATEmmm - - <nl> - MIIEDzCCAvegAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMK <nl> - QnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwHhcNMDYw <nl> - MzIyMDEzOTM0WhcNMTYwMzIyMDEzOTM0WjBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMKQnJhdGlz <nl> - bGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwggEiMA0GCSqGSIb3 <nl> - DQEBAQUAA4IBDwAwggEKAoIBAQCS9jHBfYj9mQGp2HvycXXxMcbzdWb6UShGhJd4NLxs / LxFWYgm <nl> - GErENx + hSkS943EE9UQX4j / 8SFhvXJ56CbpRNyIjZkMhsDxkovhqFQ4 / 61HhVKndBpnXmjxUizkD <nl> - Pw / Fzsbrg3ICqB9x8y34dQjbYkzo + s7552oftms1grrijxaSfQUMbEYDXcDtab86wYqg6I7ZuUUo <nl> - hwjstMoVvoLdtUSLLa2GDGhibYVW8qwUYzrG0ZmsNHhWS8 + 2rT + MitcE5eN4TPWGqvWP + j1scaMt <nl> - ymfraHtuM6kMgiioTGohQBUgDCZbg8KpFhXAJIJdKxatymP2dACw30PEEGBWZ2NFAgMBAAGjgf8w <nl> - gfwwDwYDVR0TAQH / BAUwAwEB / zAdBgNVHQ4EFgQUjbJJaJ1yCCW5wCf1UJNWSEZx + Y8wDgYDVR0P <nl> - AQH / BAQDAgEGMDYGA1UdEQQvMC2BE2Nhb3BlcmF0b3JAZGlzaWcuc2uGFmh0dHA6Ly93d3cuZGlz <nl> - aWcuc2svY2EwZgYDVR0fBF8wXTAtoCugKYYnaHR0cDovL3d3dy5kaXNpZy5zay9jYS9jcmwvY2Ff <nl> - ZGlzaWcuY3JsMCygKqAohiZodHRwOi8vY2EuZGlzaWcuc2svY2EvY3JsL2NhX2Rpc2lnLmNybDAa <nl> - BgNVHSAEEzARMA8GDSuBHpGT5goAAAABAQEwDQYJKoZIhvcNAQEFBQADggEBAF00dGFMrzvY / 59t <nl> - WDYcPQuBDRIrRhCA / ec8J9B6yKm2fnQwM6M6int0wHl5QpNt / 7EpFIKrIYwvF / k / Ji / 1WcbvgAa3 <nl> - mkkp7M5 + cTxqEEHA9tOasnxakZzArFvITV734VP / Q3f8nktnbNfzg9Gg4H8l37iYC5oyOGwwoPP / <nl> - CBUz91BKez6jPiCp3C9WgArtQVCwyfTssuMmRAAOb54GvCKWU3BlxFAKRmukLyeBEicTXxChds6K <nl> - ezfqwzlhA5WYOudsiCUI / HloDYd9Yvi0X / vF2Ey9WLw / Q1vUHgFNPGO + I + + MzVpQuGhU + QqZMxEA <nl> - 4Z7CRneC9VkGjCFMhwnN5ag = <nl> mmmmmmEND CERTIFICATEmmm - - <nl> - <nl> - Juur - SK <nl> - = = = = = = = <nl> mmmmmmBEGIN CERTIFICATEmmm - - <nl> - MIIE5jCCA86gAwIBAgIEO45L / DANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcNAQkBFglwa2lA <nl> - c2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAw <nl> - DgYDVQQDEwdKdXVyLVNLMB4XDTAxMDgzMDE0MjMwMVoXDTE2MDgyNjE0MjMwMVowXTEYMBYGCSqG <nl> - SIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVy <nl> - aW1pc2tlc2t1czEQMA4GA1UEAxMHSnV1ci1TSzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC <nl> - ggEBAIFxNj4zB9bjMI0TfncyRsvPGbJgMUaXhvSYRqTCZUXP00B841oiqBB4M8yIsdOBSvZiF3tf <nl> - TQou0M + LI + 5PAk676w7KvRhj6IAcjeEcjT3g / 1tf6mTll + g / mX8MCgkzABpTpyHhOEvWgxutr2TC <nl> - + Rx6jGZITWYfGAriPrsfB2WThbkasLnE + w0R9vXW + RvHLCu3GFH + 4Hv2qEivbDtPL + / 40UceJlfw <nl> - UR0zlv / vWT3aTdEVNMfqPxZIe5EcgEMPPbgFPtGzlc3Yyg / CQ2fbt5PgIoIuvvVoKIO5wTtpeyDa <nl> - Tpxt4brNj3pssAki14sL2xzVWiZbDcDq5WDQn / 413z8CAwEAAaOCAawwggGoMA8GA1UdEwEB / wQF <nl> - MAMBAf8wggEWBgNVHSAEggENMIIBCTCCAQUGCisGAQQBzh8BAQEwgfYwgdAGCCsGAQUFBwICMIHD <nl> - HoHAAFMAZQBlACAAcwBlAHIAdABpAGYAaQBrAGEAYQB0ACAAbwBuACAAdgDkAGwAagBhAHMAdABh <nl> - AHQAdQBkACAAQQBTAC0AaQBzACAAUwBlAHIAdABpAGYAaQB0AHMAZQBlAHIAaQBtAGkAcwBrAGUA <nl> - cwBrAHUAcwAgAGEAbABhAG0ALQBTAEsAIABzAGUAcgB0AGkAZgBpAGsAYQBhAHQAaQBkAGUAIABr <nl> - AGkAbgBuAGkAdABhAG0AaQBzAGUAawBzMCEGCCsGAQUFBwIBFhVodHRwOi8vd3d3LnNrLmVlL2Nw <nl> - cy8wKwYDVR0fBCQwIjAgoB6gHIYaaHR0cDovL3d3dy5zay5lZS9qdXVyL2NybC8wHQYDVR0OBBYE <nl> - FASqekej5ImvGs8KQKcYP2 / v6X2 + MB8GA1UdIwQYMBaAFASqekej5ImvGs8KQKcYP2 / v6X2 + MA4G <nl> - A1UdDwEB / wQEAwIB5jANBgkqhkiG9w0BAQUFAAOCAQEAe8EYlFOiCfP + JmeaUOTDBS8rNXiRTHyo <nl> - ERF5TElZrMj3hWVcRrs7EKACr81Ptcw2Kuxd / u + gkcm2k298gFTsxwhwDY77guwqYHhpNjbRxZyL <nl> - abVAyJRld / JXIWY7zoVAtjNjGr95HvxcHdMdkxuLDF2FvZkwMhgJkVLpfKG6 / 2SSmuz + Ne6ML678 <nl> - IIbsSt4beDI3poHSna9aEhbKmVv8b20OxaAehsmR0FyYgl9jDIpaq9iVpszLita / ZEuOyoqysOkh <nl> - Mp6qqIWYNIE5ITuoOlIyPfZrN4YGWhWY3PARZv40ILcD9EEQfTmEeZZyY7aWAuVrua0ZTbvGRNs2 <nl> - yyqcjg = = <nl> mmmmmmEND CERTIFICATEmmm - - <nl> - <nl> Hongkong Post Root CA 1 <nl> = = = = = = = = = = = = = = = = = = = = = = = <nl> mmm - - BEGIN CERTIFICATEmmm - - <nl> Zt3hrvJBW8qYVoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4 / WwMioBK + ZlgRSssDxLQqKi2WF + A5VLxI <nl> mmm - - END CERTIFICATEmmm - - <nl> <nl> Certinomis - Autorité Racine <nl> - = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> + = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> mmm - - BEGIN CERTIFICATEmmm - - <nl> MIIFnDCCA4SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjETMBEGA1UEChMK <nl> Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxJjAkBgNVBAMMHUNlcnRpbm9taXMg <nl> wk01 + dIL8hf2rGbVJLJP0RyZwG71fet0BLj5TXcJ17TPBzAJ8bgAVtkXFhYKK4bfjwEZGuW7gmP / <nl> vgt2Fl43N + bYdJeimUV5 <nl> mmm - - END CERTIFICATEmmm - - <nl> <nl> - Root CA Generalitat Valenciana <nl> - = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> mmmmmmBEGIN CERTIFICATEmmm - - <nl> - MIIGizCCBXOgAwIBAgIEO0XlaDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJFUzEfMB0GA1UE <nl> - ChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290 <nl> - IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwHhcNMDEwNzA2MTYyMjQ3WhcNMjEwNzAxMTUyMjQ3 <nl> - WjBoMQswCQYDVQQGEwJFUzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UE <nl> - CxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwggEiMA0G <nl> - CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGKqtXETcvIorKA3Qdyu0togu8M1JAJke + WmmmO3I2 <nl> - F0zo37i7L3bhQEZ0ZQKQUgi0 / 6iMweDHiVYQOTPvaLRfX9ptI6GJXiKjSgbwJ / BXufjpTjJ3Cj9B <nl> - ZPPrZe52 / lSqfR0grvPXdMIKX / UIKFIIzFVd0g / bmoGlu6GzwZTNVOAydTGRGmKy3nXiz0 + J2ZGQ <nl> - D0EbtFpKd71ng + CT516nDOeB0 / RSrFOyA8dEJvt55cs0YFAQexvba9dHq198aMpunUEDEO5rmXte <nl> - JajCq + TA81yc477OMUxkHl6AovWDfgzWyoxVjr7gvkkHD6MkQXpYHYTqWBLI4bft75PelAgxAgMB <nl> - AAGjggM7MIIDNzAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnBraS5n <nl> - dmEuZXMwEgYDVR0TAQH / BAgwBgEB / wIBAjCCAjQGA1UdIASCAiswggInMIICIwYKKwYBBAG / VQIB <nl> - ADCCAhMwggHoBggrBgEFBQcCAjCCAdoeggHWAEEAdQB0AG8AcgBpAGQAYQBkACAAZABlACAAQwBl <nl> - AHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAFIAYQDtAHoAIABkAGUAIABsAGEAIABHAGUAbgBlAHIA <nl> - YQBsAGkAdABhAHQAIABWAGEAbABlAG4AYwBpAGEAbgBhAC4ADQAKAEwAYQAgAEQAZQBjAGwAYQBy <nl> - AGEAYwBpAPMAbgAgAGQAZQAgAFAAcgDhAGMAdABpAGMAYQBzACAAZABlACAAQwBlAHIAdABpAGYA <nl> - aQBjAGEAYwBpAPMAbgAgAHEAdQBlACAAcgBpAGcAZQAgAGUAbAAgAGYAdQBuAGMAaQBvAG4AYQBt <nl> - AGkAZQBuAHQAbwAgAGQAZQAgAGwAYQAgAHAAcgBlAHMAZQBuAHQAZQAgAEEAdQB0AG8AcgBpAGQA <nl> - YQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAHMAZQAgAGUAbgBjAHUAZQBu <nl> - AHQAcgBhACAAZQBuACAAbABhACAAZABpAHIAZQBjAGMAaQDzAG4AIAB3AGUAYgAgAGgAdAB0AHAA <nl> - OgAvAC8AdwB3AHcALgBwAGsAaQAuAGcAdgBhAC4AZQBzAC8AYwBwAHMwJQYIKwYBBQUHAgEWGWh0 <nl> - dHA6Ly93d3cucGtpLmd2YS5lcy9jcHMwHQYDVR0OBBYEFHs100DSHHgZZu90ECjcPk + yeAT8MIGV <nl> - BgNVHSMEgY0wgYqAFHs100DSHHgZZu90ECjcPk + yeAT8oWykajBoMQswCQYDVQQGEwJFUzEfMB0G <nl> - A1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScwJQYDVQQDEx5S <nl> - b290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmGCBDtF5WgwDQYJKoZIhvcNAQEFBQADggEBACRh <nl> - TvW1yEICKrNcda3FbcrnlD + laJWIwVTAEGmiEi8YPyVQqHxK6sYJ2fR1xkDar1CdPaUWu20xxsdz <nl> - Ckj + IHLtb8zog2EWRpABlUt9jppSCS / 2bxzkoXHPjCpaF3ODR00PNvsETUlR4hTJZGH71BTg9J63 <nl> - NI8KJr2XXPR5OkowGcytT6CYirQxlyric21 + eLj4iIlPsSKRZEv1UN4D2 + XFducTZnV + ZfsBn5OH <nl> - iJ35Rld8TWCvmHMTI6QgkYH60GFmuH3Rr9ZvHmw96RH9qfmCIoaZM3Fa6hlXPZHNqcCjbgcTpsnt <nl> - + GijnsNacgmHKNHEc8RzGF9QdRYxn7fofMM = <nl> mmmmmmEND CERTIFICATEmmm - - <nl> - <nl> - A - Trust - nQual - 03 <nl> - = = = = = = = = = = = = = = = = <nl> mmmmmmBEGIN CERTIFICATEmmm - - <nl> - MIIDzzCCAregAwIBAgIDAWweMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJBVDFIMEYGA1UE <nl> - Cgw / QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBpbSBlbGVrdHIuIERhdGVudmVy <nl> - a2VociBHbWJIMRkwFwYDVQQLDBBBLVRydXN0LW5RdWFsLTAzMRkwFwYDVQQDDBBBLVRydXN0LW5R <nl> - dWFsLTAzMB4XDTA1MDgxNzIyMDAwMFoXDTE1MDgxNzIyMDAwMFowgY0xCzAJBgNVBAYTAkFUMUgw <nl> - RgYDVQQKDD9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGltIGVsZWt0ci4gRGF0 <nl> - ZW52ZXJrZWhyIEdtYkgxGTAXBgNVBAsMEEEtVHJ1c3QtblF1YWwtMDMxGTAXBgNVBAMMEEEtVHJ1 <nl> - c3QtblF1YWwtMDMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtPWFuA / OQO8BBC4SA <nl> - zewqo51ru27CQoT3URThoKgtUaNR8t4j8DRE / 5TrzAUjlUC5B3ilJfYKvUWG6Nm9wASOhURh73 + n <nl> - yfrBJcyFLGM / BWBzSQXgYHiVEEvc + RFZznF / QJuKqiTfC0Li21a8StKlDJu3Qz7dg9MmEALP6iPE <nl> - SU7l0 + m0iKsMrmKS1GWH2WrX9IWf5DMiJaXlyDO6w8dB3F / GaswADm0yqLaHNgBid5seHzTLkDx4 <nl> - iHQF63n1k3Flyp3HaxgtPVxO59X4PzF9j4fsCiIvI + n + u33J4PTs63zEsMMtYrWacdaxaujs2e3V <nl> - cuy + VwHOBVWf3tFgiBCzAgMBAAGjNjA0MA8GA1UdEwEB / wQFMAMBAf8wEQYDVR0OBAoECERqlWdV <nl> - eRFPMA4GA1UdDwEB / wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAVdRU0VlIXLOThaq / Yy / kgM40 <nl> - ozRiPvbY7meIMQQDbwvUB / tOdQ / TLtPAF8fGKOwGDREkDg6lXb + MshOWcdzUzg4NCmgybLlBMRmr <nl> - sQd7TZjTXLDR8KdCoLXEjq / + 8T / 0709GAHbrAvv5ndJAlseIOrifEXnzgGWovR / TeIGgUUw3tKZd <nl> - JXDRZslo + S4RFGjxVJgIrCaSD96JntT6s3kr0qN51OyLrIdTaEJMUVF0HhsnLuP1Hyl0Te2v9 + GS <nl> - mYHovjrHF1D2t8b8m7CKa9aIA5GPBnc6hQLdmNVDeD / GMBWsm2vLV7eJUYs66MmEDNuxUCAKGkq6 <nl> - ahq97BvIxYSazQ = = <nl> mmmmmmEND CERTIFICATEmmm - - <nl> - <nl> TWCA Root Certification Authority <nl> = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> mmm - - BEGIN CERTIFICATEmmm - - <nl> PDCBBpEi6lmt2hkuIsKNuYyH4Ga8cyNfIWRjgEj1oDwYPZTISEEdQLpe / v5WOaHIz16eGWRGENoX <nl> kbcFgKyLmZJ956LYBws2J + dIeWCKw9cTXPhyQN9Ky8 + ZAAoACxGV2lZFA4gKn2fQ1XmxqI1AbQ3C <nl> ekD6819kR5LLU7m7Wc5P / dAVUwHY3 + vZ5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz + Ys63su <nl> mmm - - END CERTIFICATEmmm - - <nl> + <nl> + TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H5 <nl> + = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> + mmm - - BEGIN CERTIFICATEmmm - - <nl> + MIIEJzCCAw + gAwIBAgIHAI4X / iQggTANBgkqhkiG9w0BAQsFADCBsTELMAkGA1UEBhMCVFIxDzAN <nl> + BgNVBAcMBkFua2FyYTFNMEsGA1UECgxEVMOcUktUUlVTVCBCaWxnaSDEsGxldGnFn2ltIHZlIEJp <nl> + bGnFn2ltIEfDvHZlbmxpxJ9pIEhpem1ldGxlcmkgQS7Fni4xQjBABgNVBAMMOVTDnFJLVFJVU1Qg <nl> + RWxla3Ryb25payBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSBINTAeFw0xMzA0MzAw <nl> + ODA3MDFaFw0yMzA0MjgwODA3MDFaMIGxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMU0w <nl> + SwYDVQQKDERUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnE <nl> + n2kgSGl6bWV0bGVyaSBBLsWeLjFCMEAGA1UEAww5VMOcUktUUlVTVCBFbGVrdHJvbmlrIFNlcnRp <nl> + ZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIEg1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB <nl> + CgKCAQEApCUZ4WWe60ghUEoI5RHwWrom / 4NZzkQqL / 7hzmAD / I0Dpe3 / a6i6zDQGn1k19uwsu537 <nl> + jVJp45wnEFPzpALFp / kRGml1bsMdi9GYjZOHp3GXDSHHmflS0yxjXVW86B8BSLlg / kJK9siArs1m <nl> + ep5Fimh34khon6La8eHBEJ / rPCmBp + EyCNSgBbGM + 42WAA4 + Jd9ThiI7 / PS98wl + d + yG6w8z5UNP <nl> + 9FR1bSmZLmZaQ9 / LXMrI5Tjxfjs1nQ / 0xVqhzPMggCTTV + wVunUlm + hkS7M0hO8EuPbJbKoCPrZV <nl> + 4jI3X / xml1 / N1p7HIL9Nxqw / dV8c7TKcfGkAaZHjIxhT6QIDAQABo0IwQDAdBgNVHQ4EFgQUVpkH <nl> + HtOsDGlktAxQR95DLL4gwPswDgYDVR0PAQH / BAQDAgEGMA8GA1UdEwEB / wQFMAMBAf8wDQYJKoZI <nl> + hvcNAQELBQADggEBAJ5FdnsXSDLyOIspve6WSk6BGLFRRyDN0GSxDsnZAdkJzsiZ3GglE9Rc8qPo <nl> + BP5yCccLqh0lVX6Wmle3usURehnmp349hQ71 + S4pL + f5bFgWV1Al9j4uPqrtd3GqqpmWRgqujuwq <nl> + URawXs3qZwQcWDD1YIq9pr1N5Za0 / EKJAWv2cMhQOQwt1WbZyNKzMrcbGW3LM / nfpeYVhDfwwvJl <nl> + lpKQd / Ct9JDpEXjXk4nAPQu6KfTomZ1yju2dL + 6SfaHx / 126M2CFYv4HAqGEVka + lgqaE9chTLd8 <nl> + B59OTj + RdPsnnRHM3eaxynFNExc5JsUpISuTKWqW + qtB4Uu2NQvAmxU = <nl> + mmm - - END CERTIFICATEmmm - - <nl> + <nl> + TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H6 <nl> + = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> + mmm - - BEGIN CERTIFICATEmmm - - <nl> + MIIEJjCCAw6gAwIBAgIGfaHyZeyKMA0GCSqGSIb3DQEBCwUAMIGxMQswCQYDVQQGEwJUUjEPMA0G <nl> + A1UEBwwGQW5rYXJhMU0wSwYDVQQKDERUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmls <nl> + acWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjFCMEAGA1UEAww5VMOcUktUUlVTVCBF <nl> + bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIEg2MB4XDTEzMTIxODA5 <nl> + MDQxMFoXDTIzMTIxNjA5MDQxMFowgbExCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmExTTBL <nl> + BgNVBAoMRFTDnFJLVFJVU1QgQmlsZ2kgxLBsZXRpxZ9pbSB2ZSBCaWxpxZ9pbSBHw7x2ZW5sacSf <nl> + aSBIaXptZXRsZXJpIEEuxZ4uMUIwQAYDVQQDDDlUw5xSS1RSVVNUIEVsZWt0cm9uaWsgU2VydGlm <nl> + aWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLEgSDYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK <nl> + AoIBAQCdsGjW6L0UlqMACprx9MfMkU1xeHe59yEmFXNRFpQJRwXiM / VomjX / 3EsvMsew7eKC5W / a <nl> + 2uqsxgbPJQ1BgfbBOCK9 + bGlprMBvD9QFyv26WZV1DOzXPhDIHiTVRZwGTLmiddk671IUP320EED <nl> + wnS3 / faAz1vFq6TWlRKb55cTMgPp1KtDWxbtMyJkKbbSk60vbNg9tvYdDjTu0n2pVQ8g9P0pu5Fb <nl> + HH3GQjhtQiht1AH7zYiXSX6484P4tZgvsycLSF5W506jM7NE1qXyGJTtHB6plVxiSvgNZ1GpryHV <nl> + + DKdeboaX + UEVU0TRv / yz3THGmNtwx8XEsMeED5gCLMxAgMBAAGjQjBAMB0GA1UdDgQWBBTdVRcT <nl> + 9qzoSCHK77Wv0QAy7Z6MtTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH / BAUwAwEB / zANBgkqhkiG <nl> + 9w0BAQsFAAOCAQEAb1gNl0OqFlQ + v6nfkkU / hQu7VtMMUszIv3ZnXuaqs6fvuay0EBQNdH49ba3R <nl> + fdCaqaXKGDsCQC4qnFAUi / 5XfldcEQlLNkVS9z2sFP1E34uXI9TDwe7UU5X + LEr + DXCqu4svLcsy <nl> + o4LyVN / Y8t3XSHLuSqMplsNEzm61kod2pLv0kmzOLBQJZo6NrRa1xxsJYTvjIKIDgI6tflEATseW <nl> + hvtDmHd9KMeP2Cpu54Rvl0EpABZeTeIT6lnAY2c6RPuY / ATTMHKm9ocJV612ph1jmv3XZch4gyt1 <nl> + O6VbuA1df74jrlZVlFjvH4GMKrLN5ptjnhi85WsGtAuYSyher4hYyw = = <nl> + mmm - - END CERTIFICATEmmm - - <nl> + <nl> + Certinomis - Root CA <nl> + = = = = = = = = = = = = = = = = = = = = <nl> + mmm - - BEGIN CERTIFICATEmmm - - <nl> + MIIFkjCCA3qgAwIBAgIBATANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJGUjETMBEGA1UEChMK <nl> + Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxHTAbBgNVBAMTFENlcnRpbm9taXMg <nl> + LSBSb290IENBMB4XDTEzMTAyMTA5MTcxOFoXDTMzMTAyMTA5MTcxOFowWjELMAkGA1UEBhMCRlIx <nl> + EzARBgNVBAoTCkNlcnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMR0wGwYDVQQDExRD <nl> + ZXJ0aW5vbWlzIC0gUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANTMCQos <nl> + P5L2fxSeC5yaah1AMGT9qt8OHgZbn1CF6s2Nq0Nn3rD6foCWnoR4kkjW4znuzuRZWJflLieY6pOo <nl> + d5tK8O90gC3rMB + 12ceAnGInkYjwSond3IjmFPnVAy / / ldu9n + ws + hQVWZUKxkd8aRi5pwP5ynap <nl> + z8dvtF4F / u7BUrJ1Mofs7SlmO / NKFoL21prbcpjp3vDFTKWrteoB4owuZH9kb / 2jJZOLyKIOSY00 <nl> + 8B / sWEUuNKqEUL3nskoTuLAPrjhdsKkb5nPJWqHZZkCqqU2mNAKthH6yI8H7KsZn9DS2sJVqM09x <nl> + RLWtwHkziOC / 7aOgFLScCbAK42C + + PhmiM1b8XcF4LVzbsF9Ri6OSyemzTUK / eVNfaoqoynHWmgE <nl> + 6OXWk6RiwsXm9E / G + Z8ajYJJGYrKWUM66A0ywfRMEwNvbqY / kXPLynNvEiCL7sCCeN5LLsJJwx3t <nl> + FvYk9CcbXFcx3FXuqB5vbKziRcxXV4p1VxngtViZSTYxPDMBbRZKzbgqg4SGm / lg0h9tkQPTYKbV <nl> + PZrdd5A9NaSfD171UkRpucC63M9933zZxKyGIjK8e2uR73r4F2iw4lNVYC2vPsKD2NkJK / DAZNuH <nl> + i5HMkesE / Xa0lZrmFAYb1TQdvtj / dBxThZngWVJKYe2InmtJiUZ + IFrZ50rlau7SZRFDAgMBAAGj <nl> + YzBhMA4GA1UdDwEB / wQEAwIBBjAPBgNVHRMBAf8EBTADAQH / MB0GA1UdDgQWBBTvkUz1pcMw6C8I <nl> + 6tNxIqSSaHh02TAfBgNVHSMEGDAWgBTvkUz1pcMw6C8I6tNxIqSSaHh02TANBgkqhkiG9w0BAQsF <nl> + AAOCAgEAfj1U2iJdGlg + O1QnurrMyOMaauo + + RLrVl89UM7g6kgmJs95Vn6RHJk / 0KGRHCwPT5iV <nl> + WVO90CLYiF2cN / z7ZMF4jIuaYAnq1fohX9B0ZedQxb8uuQsLrbWwF6YSjNRieOpWauwK0kDDPAUw <nl> + Pk2Ut59KA9N9J0u2 / kTO + hkzGm2kQtHdzMjI1xZSg081lLMSVX3l4kLr5JyTCcBMWwerx20RoFAX <nl> + lCOotQqSD7J6wWAsOMwaplv / 8gzjqh8c3LigkyfeY + N / IZ865Z764BNqdeuWXGKRlI5nU7aJ + BIJ <nl> + y29SWwNyhlCVCNSNh4YVH5Uk2KRvms6knZtt0rJ2BobGVgjF6wnaNsIbW0G + YSrjcOa4pvi2WsS9 <nl> + Iff / ql + hbHY5ZtbqTFXhADObE5hjyW / QASAJN1LnDE8 + zbz1X5YnpyACleAu6AdBBR8Vbtaw5Bng <nl> + DwKTACdyxYvRVB9dSsNAl35VpnzBMwQUAR1JIGkLGZOdblgi90AMRgwjY / M50n92Uaf0yKHxDHYi <nl> + I0ZSKS3io0EHVmmY0gUJvGnHWmHNj4FgFU2A3ZDifcRQ8ow7bkrHxuaAKzyBvBGAFhAn1 / DNP3nM <nl> + cyrDflOR1m749fPH0FFNjkulW + YZFzvWgQncItzujrnEj1PhZ7szuIgVRs / taTX / dQ1G885x4cVr <nl> + hkIGuUE = <nl> + mmm - - END CERTIFICATEmmm - - <nl> + <nl> + OISTE WISeKey Global Root GB CA <nl> + = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> + mmm - - BEGIN CERTIFICATEmmm - - <nl> + MIIDtTCCAp2gAwIBAgIQdrEgUnTwhYdGs / gjGvbCwDANBgkqhkiG9w0BAQsFADBtMQswCQYDVQQG <nl> + EwJDSDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNl <nl> + ZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQiBDQTAeFw0xNDEyMDExNTAw <nl> + MzJaFw0zOTEyMDExNTEwMzFaMG0xCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYD <nl> + VQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEds <nl> + b2JhbCBSb290IEdCIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Be3HEokKtaX <nl> + scriHvt9OO + Y9bI5mE4nuBFde9IllIiCFSZqGzG7qFshISvYD06fWvGxWuR51jIjK + FTzJlFXHtP <nl> + rby / h0oLS5daqPZI7H17Dc0hBt + eFf1Biki3IPShehtX1F1Q / 7pn2COZH8g / 497 / b1t3sWtuuMlk <nl> + 9 + HKQUYOKXHQuSP8yYFfTvdv37 + ErXNku7dCjmn21HYdfp2nuFeKUWdy19SouJVUQHMD9ur06 / 4o <nl> + Qnc / nSMbsrY9gBQHTC5P99UKFg29ZkM3fiNDecNAhvVMKdqOmq0NpQSHiB6F4 + lT1ZvIiwNjeOvg <nl> + GUpuuy9rM2RYk61pv48b74JIxwIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH / BAUwAwEB <nl> + / zAdBgNVHQ4EFgQUNQ / INmNe4qPs + TtmFc5RUuORmj0wEAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZI <nl> + hvcNAQELBQADggEBAEBM + 4eymYGQfp3FsLAmzYh7KzKNbrghcViXfa43FK8 + 5 / ea4n32cZiZBKpD <nl> + dHij40lhPnOMTZTg + XHEthYOU3gf1qKHLwI5gSk8rxWYITD + KJAAjNHhy / peyP34EEY7onhCkRd0 <nl> + VQreUGdNZtGn / / 3ZwLWoo4rOZvUPQ82nK1d7Y0Zqqi5S2PTt4W2tKZB4SLrhI6qjiey1q5bAtEui <nl> + HZeeevJuQHHfaPFlTc58Bd9TZaml8LGXBHAVRgOY1NK / VLSgWH1Sb9pWJmLU2NuJMW8c8CLC02Ic <nl> + Nc1MaRVUGpCY3useX8p3x8uOPUNpnJpY0CQ73xtAln41rYHHTnG6iBM = <nl> + mmm - - END CERTIFICATEmmm - - <nl> + <nl> + Certification Authority of WoSign G2 <nl> + = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> + mmm - - BEGIN CERTIFICATEmmm - - <nl> + MIIDfDCCAmSgAwIBAgIQayXaioidfLwPBbOxemFFRDANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQG <nl> + EwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxLTArBgNVBAMTJENlcnRpZmljYXRpb24g <nl> + QXV0aG9yaXR5IG9mIFdvU2lnbiBHMjAeFw0xNDExMDgwMDU4NThaFw00NDExMDgwMDU4NThaMFgx <nl> + CzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRlZDEtMCsGA1UEAxMkQ2VydGlm <nl> + aWNhdGlvbiBBdXRob3JpdHkgb2YgV29TaWduIEcyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB <nl> + CgKCAQEAvsXEoCKASU + / 2YcRxlPhuw + 9YH + v9oIOH9ywjj2X4FA8jzrvZjtFB5sg + OPXJYY1kBai <nl> + XW8wGQiHC38Gsp1ij96vkqVg1CuAmlI / 9ZqD6TRay9nVYlzmDuDfBpgOgHzKtB0TiGsOqCR3A9Du <nl> + W / PKaZE1OVbFbeP3PU9ekzgkyhjpJMuSA93MHD0JcOQg5PGurLtzaaNjOg9FD6FKmsLRY6zLEPg9 <nl> + 5k4ot + vElbGs / V6r + kHLXZ1L3PR8du9nfwB6jdKgGlxNIuG12t12s9R23164i5jIFFTMaxeSt + BK <nl> + v0mUYQs4kI9dJGwlezt52eJ + na2fmKEG / HgUYFf47oB3sQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMC <nl> + AQYwDwYDVR0TAQH / BAUwAwEB / zAdBgNVHQ4EFgQU + mCp62XF3RYUCE4MD42b4Pdkr2cwDQYJKoZI <nl> + hvcNAQELBQADggEBAFfDejaCnI2Y4qtAqkePx6db7XznPWZaOzG73 / MWM5H8fHulwqZm46qwtyeY <nl> + P0nXYGdnPzZPSsvxFPpahygc7Y9BMsaV + X3avXtbwrAh449G3CE4Q3RM + zD4F3LBMvzIkRfEzFg3 <nl> + TgvMWvchNSiDbGAtROtSjFA9tWwS1 / oJu2yySrHFieT801LYYRf + epSEj3m2M1m6D8QL4nCgS3gu <nl> + + sif / a + RZQp4OBXllxcU3fngLDT4ONCEIgDAFFEYKwLcMFrw6AF8NTojrwjkr6qOKEJJLvD1mTS + <nl> + 7Q9LGOHSJDy7XUe3IfKN0QqZjuNuPq1w4I + 5ysxugTH2e5x6eeRncRg = <nl> + mmm - - END CERTIFICATEmmm - - <nl> + <nl> + CA WoSign ECC Root <nl> + = = = = = = = = = = = = = = = = = = <nl> + mmm - - BEGIN CERTIFICATEmmm - - <nl> + MIICCTCCAY + gAwIBAgIQaEpYcIBr8I8C + vbe6LCQkDAKBggqhkjOPQQDAzBGMQswCQYDVQQGEwJD <nl> + TjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxGzAZBgNVBAMTEkNBIFdvU2lnbiBFQ0MgUm9v <nl> + dDAeFw0xNDExMDgwMDU4NThaFw00NDExMDgwMDU4NThaMEYxCzAJBgNVBAYTAkNOMRowGAYDVQQK <nl> + ExFXb1NpZ24gQ0EgTGltaXRlZDEbMBkGA1UEAxMSQ0EgV29TaWduIEVDQyBSb290MHYwEAYHKoZI <nl> + zj0CAQYFK4EEACIDYgAE4f2OuEMkq5Z7hcK6C62N4DrjJLnSsb6IOsq / Srj57ywvr1FQPEd1bPiU <nl> + t5v8KB7FVMxjnRZLU8HnIKvNrCXSf4 / CwVqCXjCLelTOA7WRf6qU0NGKSMyCBSah1VES1ns2o0Iw <nl> + QDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH / BAUwAwEB / zAdBgNVHQ4EFgQUqv3VWqP2h4syhf3R <nl> + MluARZPzA7gwCgYIKoZIzj0EAwMDaAAwZQIxAOSkhLCB1T2wdKyUpOgOPQB0TKGXa / kNUTyh2Tv0 <nl> + Daupn75OcsqF1NnstTJFGG + rrQIwfcf3aWMvoeGY7xMQ0Xk / 0f7qO3 / eVvSQsRUR2LIiFdAvwyYu <nl> + a / GRspBl9JrmkO5K <nl> + mmm - - END CERTIFICATEmmm - - <nl> + <nl> + SZAFIR ROOT CA2 <nl> + = = = = = = = = = = = = = = = <nl> + mmm - - BEGIN CERTIFICATEmmm - - <nl> + MIIDcjCCAlqgAwIBAgIUPopdB + xV0jLVt + O2XwHrLdzk1uQwDQYJKoZIhvcNAQELBQAwUTELMAkG <nl> + A1UEBhMCUEwxKDAmBgNVBAoMH0tyYWpvd2EgSXpiYSBSb3psaWN6ZW5pb3dhIFMuQS4xGDAWBgNV <nl> + BAMMD1NaQUZJUiBST09UIENBMjAeFw0xNTEwMTkwNzQzMzBaFw0zNTEwMTkwNzQzMzBaMFExCzAJ <nl> + BgNVBAYTAlBMMSgwJgYDVQQKDB9LcmFqb3dhIEl6YmEgUm96bGljemVuaW93YSBTLkEuMRgwFgYD <nl> + VQQDDA9TWkFGSVIgUk9PVCBDQTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3vD5Q <nl> + qEvNQLXOYeeWyrSh2gwisPq1e3YAd4wLz32ohswmUeQgPYUM1ljj5 / QqGJ3a0a4m7utT3PSQ1hNK <nl> + DJA8w / Ta0o4NkjrcsbH / ON7Dui1fgLkCvUqdGw + 0w8LBZwPd3BucPbOw3gAeqDRHu5rr / gsUvTaE <nl> + 2g0gv / pby6kWIK05YO4vdbbnl5z5Pv1 + TW9NL + + IDWr63fE9biCloBK0TXC5ztdyO4mTp4CEHCdJ <nl> + ckm1 / zuVnsHMyAHs6A6KCpbns6aH5db5BSsNl0BwPLqsdVqc1U2dAgrSS5tmS0YHF2Wtn2yIANwi <nl> + ieDhZNRnvDF5YTy7ykHNXGoAyDw4jlivAgMBAAGjQjBAMA8GA1UdEwEB / wQFMAMBAf8wDgYDVR0P <nl> + AQH / BAQDAgEGMB0GA1UdDgQWBBQuFqlKGLXLzPVvUPMjX / hd56zwyDANBgkqhkiG9w0BAQsFAAOC <nl> + AQEAtXP4A9xZWx126aMqe5Aosk3AM0 + qmrHUuOQn / 6mWmc5G4G18TKI4pAZw8PRBEew / R40 / cof5 <nl> + O / 2kbytTAOD / OblqBw7rHRz2onKQy4I9EYKL0rufKq8h5mOGnXkZ7 / e7DDWQw4rtTw / 1zBLZpD67 <nl> + oPwglV9PJi8RI4NOdQcPv5vRtB3pEAT + ymCPoky4rc / hkA / NrgrHXXu3UNLUYfrVFdvXn4dRVOul <nl> + 4 + vJhaAlIDf7js4MNIThPIGyd05DpYhfhmehPea0XGG2Ptv + tyjFogeutcrKjSoS75ftwjCkySp6 <nl> + + / NNIxuZMzSgLvWpCz / UXeHPhJ / iGcJfitYgHuNztw = = <nl> + mmm - - END CERTIFICATEmmm - - <nl> + <nl> + Certum Trusted Network CA 2 <nl> + = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> + mmm - - BEGIN CERTIFICATEmmm - - <nl> + MIIF0jCCA7qgAwIBAgIQIdbQSk8lD8kyN / yqXhKN6TANBgkqhkiG9w0BAQ0FADCBgDELMAkGA1UE <nl> + BhMCUEwxIjAgBgNVBAoTGVVuaXpldG8gVGVjaG5vbG9naWVzIFMuQS4xJzAlBgNVBAsTHkNlcnR1 <nl> + bSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEkMCIGA1UEAxMbQ2VydHVtIFRydXN0ZWQgTmV0d29y <nl> + ayBDQSAyMCIYDzIwMTExMDA2MDgzOTU2WhgPMjA0NjEwMDYwODM5NTZaMIGAMQswCQYDVQQGEwJQ <nl> + TDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENl <nl> + cnRpZmljYXRpb24gQXV0aG9yaXR5MSQwIgYDVQQDExtDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENB <nl> + IDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC9 + Xj45tWADGSdhhuWZGc / IjoedQF9 <nl> + 7 / tcZ4zJzFxrqZHmuULlIEub2pt7uZld2ZuAS9eEQCsn0 + i6MLs + CRqnSZXvK0AkwpfHp + 6bJe + o <nl> + CgCXhVqqndwpyeI1B + twTUrWwbNWuKFBOJvR + zF / j + Bf4bE / D44WSWDXBo0Y + aomEKsq09DRZ40b <nl> + Rr5HMNUuctHFY9rnY3lEfktjJImGLjQ / KUxSiyqnwOKRKIm5wFv5HdnnJ63 / mgKXwcZQkpsCLL2p <nl> + uTRZCr + ESv / f / rOf69me4Jgj7KZrdxYq28ytOxykh9xGc14ZYmhFV + SQgkK7QtbwYeDBoz1mo130 <nl> + GO6IyY0XRSmZMnUCMe4pJshrAua1YkV / NxVaI2iJ1D7eTiew8EAMvE0Xy02isx7QBlrd9pPPV3WZ <nl> + 9fqGGmd4s7 + W / jTcvedSVuWz5XV710GRBdxdaeOVDUO5 / IOWOZV7bIBaTxNyxtd9KXpEulKkKtVB <nl> + Rgkg / iKgtlswjbyJDNXXcPiHUv3a76xRLgezTv7QCdpw75j6VuZt27VXS9zlLCUVyJ4ueE742pye <nl> + hizKV / Ma5ciSixqClnrDvFASadgOWkaLOusm + iPJtrCBvkIApPjW / jAux9JG9uWOdf3yzLnQh1vM <nl> + BhBgu4M1t15n3kfsmUjxpKEV / q2MYo45VU85FrmxY53 / twIDAQABo0IwQDAPBgNVHRMBAf8EBTAD <nl> + AQH / MB0GA1UdDgQWBBS2oVQ5AsOgP46KvPrU + Bym0ToO / TAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZI <nl> + hvcNAQENBQADggIBAHGlDs7k6b8 / ONWJWsQCYftMxRQXLYtPU2sQF / xlhMcQSZDe28cmk4gmb3DW <nl> + Al45oPePq5a1pRNcgRRtDoGCERuKTsZPpd1iHkTfCVn0W3cLN + mLIMb4Ck4uWBzrM9DPhmDJ2vuA <nl> + L55MYIR4PSFk1vtBHxgP58l1cb29XN40hz5BsA72udY / CROWFC / emh1auVbONTqwX3BNXuMp8SMo <nl> + clm2q8KMZiYcdywmdjWLKKdpoPk79SPdhRB0yZADVpHnr7pH1BKXESLjokmUbOe3lEu6LaTaM4tM <nl> + pkT / WjzGHWTYtTHkpjx6qFcL2 + 1hGsvxznN3Y6SHb0xRONbkX8eftoEq5IVIeVheO / jbAoJnwTnb <nl> + w3RLPTYe + SmTiGhbqEQZIfCn6IENLOiTNrQ3ssqwGyZ6miUfmpqAnksqP / ujmv5zMnHCnsZy4Ypo <nl> + J / HkD7TETKVhk / iXEAcqMCWpuchxuO9ozC1 + 9eB + D4Kob7a6bINDd82Kkhehnlt4Fj1F4jNy3eFm <nl> + ypnTycUm / Q1oBEauttmbjL4ZvrHG8hnjXALKLNhvSgfZyTXaQHXyxKcZb55CEJh15pWLYLztxRLX <nl> + is7VmFxWlgPF7ncGNf / P5O4 / E2Hu29othfDNrp2yGAlFw5Khchf8R7agCyzxxN5DaAhqXzvwdmP7 <nl> + zAYspsbiDrW5viSP <nl> + mmm - - END CERTIFICATEmmm - - <nl> + <nl> + Hellenic Academic and Research Institutions RootCA 2015 <nl> + = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> + mmm - - BEGIN CERTIFICATEmmm - - <nl> + MIIGCzCCA / OgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcT <nl> + BkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0 <nl> + aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA + BgNVBAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNl <nl> + YXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIwMTUwHhcNMTUwNzA3MTAxMTIxWhcNNDAwNjMwMTAx <nl> + MTIxWjCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMg <nl> + QWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA + BgNV <nl> + BAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIw <nl> + MTUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDC + Kk / G4n8PDwEXT2QNrCROnk8Zlrv <nl> + bTkBSRq0t89 / TSNTt5AA4xMqKKYx8ZEA4yjsriFBzh / a / X0SWwGDD7mwX5nh8hKDgE0GPt + sr + eh <nl> + iGsxr / CL0BgzuNtFajT0AoAkKAoCFZVedioNmToUW / bLy1O8E00BiDeUJRtCvCLYjqOWXjrZMts + <nl> + 6PAQZe104S + nfK8nNLspfZu2zwnI5dMK / IhlZXQK3HMcXM1AsRzUtoSMTFDPaI6oWa7CJ06CojXd <nl> + FPQf / 7J31Ycvqm59JCfnxssm5uX + Zwdj2EUN3TpZZTlYepKZcj2chF6IIbjV9Cz82XBST3i4vTwr <nl> + i5WY9bPRaM8gFH5MXF / ni + X1NYEZN9cRCLdmvtNKzoNXADrDgfgXy5I2XdGj2HUb4Ysn6npIQf1F <nl> + GQatJ5lOwXBH3bWfgVMS5bGMSF0xQxfjjMZ6Y5ZLKTBOhE5iGV48zpeQpX8B653g + IuJ3SWYPZK2 <nl> + fu / Z8VFRfS0myGlZYeCsargqNhEEelC9MoS + L9xy1dcdFkfkR2YgP / SWxa + OAXqlD3pk9Q0Yh9mu <nl> + iNX6hME6wGkoLfINaFGq46V3xqSQDqE3izEjR8EJCOtu93ib14L8hCCZSRm2Ekax + 0VVFqmjZayc <nl> + Bw / qa9wfLgZy7IaIEuQt218FL + TwA9MmM + eAws1CoRc0CwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD <nl> + AQH / MA4GA1UdDwEB / wQEAwIBBjAdBgNVHQ4EFgQUcRVnyMjJvXVdctA4GGqd83EkVAswDQYJKoZI <nl> + hvcNAQELBQADggIBAHW7bVRLqhBYRjTyYtcWNl0IXtVsyIe9tC5G8jH4fOpCtZMWVdyhDBKg2mF + <nl> + D1hYc2Ryx + hFjtyp8iY / xnmMsVMIM4GwVhO + 5lFc2JsKT0ucVlMC6U / 2DWDqTUJV6HwbISHTGzrM <nl> + d / K4kPFox / la / vot9L / J9UUbzjgQKjeKeaO04wlshYaT / 4mWJ3iBj2fjRnRUjtkNaeJK9E10A / + y <nl> + d + 2VZ5fkscWrv2oj6NSU4kQoYsRL4vDY4ilrGnB + JGGTe08DMiUNRSQrlrRGar9KC / eaj8GsGsVn <nl> + 82800vpzY4zvFrCopEYq + OsS7HK07 / grfoxSwIuEVPkvPuNVqNxmsdnhX9izjFk0WaSrT2y7Hxjb <nl> + davYy5LNlDhhDgcGH0tGEPEVvo2FXDtKK4F5D7Rpn0lQl033DlZdwJVqwjbDG2jJ9SrcR5q + ss7F <nl> + Jej6A7na + RZukYT1HCjI / CbM1xyQVqdfbzoEvM14iQuODy + jqk + iGxI9FghAD / FGTNeqewjBCvVt <nl> + J94Cj8rDtSvK6evIIVM4pcw72Hc3MKJP2W / R8kCtQXoXxdZKNYm3QdV8hn9VTYNKpXMgwDqvkPGa <nl> + JI7ZjnHKe7iG2rKPmT4dEw0SEe7Uq / DpFXYC5ODfqiAeW2GFZECpkJcNrVPSWh2HagCXZWK0vm9q <nl> + p / UsQu0yrbYhnr68 <nl> + mmm - - END CERTIFICATEmmm - - <nl> + <nl> + Hellenic Academic and Research Institutions ECC RootCA 2015 <nl> + = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> + mmm - - BEGIN CERTIFICATEmmm - - <nl> + MIICwzCCAkqgAwIBAgIBADAKBggqhkjOPQQDAjCBqjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0 <nl> + aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9u <nl> + cyBDZXJ0LiBBdXRob3JpdHkxRDBCBgNVBAMTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJj <nl> + aCBJbnN0aXR1dGlvbnMgRUNDIFJvb3RDQSAyMDE1MB4XDTE1MDcwNzEwMzcxMloXDTQwMDYzMDEw <nl> + MzcxMlowgaoxCzAJBgNVBAYTAkdSMQ8wDQYDVQQHEwZBdGhlbnMxRDBCBgNVBAoTO0hlbGxlbmlj <nl> + IEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUQwQgYD <nl> + VQQDEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIEVDQyBSb290 <nl> + Q0EgMjAxNTB2MBAGByqGSM49AgEGBSuBBAAiA2IABJKgQehLgoRc4vgxEZmGZE4JJS + dQS8KrjVP <nl> + dJWyUWRrjWvmP3CV8AVER6ZyOFB2lQJajq4onvktTpnvLEhvTCUp6NFxW98dwXU3tNf6e3pCnGoK <nl> + Vlp8aQuqgAkkbH7BRqNCMEAwDwYDVR0TAQH / BAUwAwEB / zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O <nl> + BBYEFLQiC4KZJAEOnLvkDv2 / + 5cgk5kqMAoGCCqGSM49BAMCA2cAMGQCMGfOFmI4oqxiRaeplSTA <nl> + GiecMjvAwNW6qef4BENThe5SId6d9SWDPp5YSy / XZxMOIQIwBeF1Ad5o7SofTUwJCA3sS61kFyjn <nl> + dc5FZXIhF8siQQ6ME5g4mlRtm8rifOoCWCKR <nl> + mmm - - END CERTIFICATEmmm - - <nl> + <nl> + Certplus Root CA G1 <nl> + = = = = = = = = = = = = = = = = = = = <nl> + mmm - - BEGIN CERTIFICATEmmm - - <nl> + MIIFazCCA1OgAwIBAgISESBVg + QtPlRWhS2DN7cs3EYRMA0GCSqGSIb3DQEBDQUAMD4xCzAJBgNV <nl> + BAYTAkZSMREwDwYDVQQKDAhDZXJ0cGx1czEcMBoGA1UEAwwTQ2VydHBsdXMgUm9vdCBDQSBHMTAe <nl> + Fw0xNDA1MjYwMDAwMDBaFw0zODAxMTUwMDAwMDBaMD4xCzAJBgNVBAYTAkZSMREwDwYDVQQKDAhD <nl> + ZXJ0cGx1czEcMBoGA1UEAwwTQ2VydHBsdXMgUm9vdCBDQSBHMTCCAiIwDQYJKoZIhvcNAQEBBQAD <nl> + ggIPADCCAgoCggIBANpQh7bauKk + nWT6VjOaVj0W5QOVsjQcmm1iBdTYj + eJZJ + 622SLZOZ5KmHN <nl> + r49aiZFluVj8tANfkT8tEBXgfs + 8 / H9DZ6itXjYj2JizTfNDnjl8KvzsiNWI7nC9hRYt6kuJPKNx <nl> + Qv4c / dMcLRC4hlTqQ7jbxofaqK6AJc96Jh2qkbBIb6613p7Y1 / oA / caP0FG7Yn2ksYyy / yARujVj <nl> + BYZHYEMzkPZHogNPlk2dT8Hq6pyi / jQu3rfKG3akt62f6ajUeD94 / vI4CTYd0hYCyOwqaK / 1jpTv <nl> + LRN6HkJKHRUxrgwEV / xhc / MxVoYxgKDEEW4wduOU8F8ExKyHcomYxZ3MVwia9Az8fXoFOvpHgDm2 <nl> + z4QTd28n6v + WZxcIbekN1iNQMLAVdBM + 5S / / Ds3EC0pd8NgAM0lm66EYfFkuPSi5YXHLtaW6uOrc <nl> + 4nBvCGrch2c0798wct3zyT8j / zXhviEpIDCB5BmlIOklynMxdCm + 4kLV87ImZsdo / Rmz5yCTmehd <nl> + 4F6H50boJZwKKSTUzViGUkAksnsPmBIgJPaQbEfIDbsYIC7Z / fyL8inqh3SV4EJQeIQEQWGw9CEj <nl> + jy3LKCHyamz0GqbFFLQ3ZU + V / YDI + HLlJWvEYLF7bY5KinPOWftwenMGE9nTdDckQQoRb5fc5 + R + <nl> + ob0V8rqHDz1oihYHAgMBAAGjYzBhMA4GA1UdDwEB / wQEAwIBBjAPBgNVHRMBAf8EBTADAQH / MB0G <nl> + A1UdDgQWBBSowcCbkahDFXxdBie0KlHYlwuBsTAfBgNVHSMEGDAWgBSowcCbkahDFXxdBie0KlHY <nl> + lwuBsTANBgkqhkiG9w0BAQ0FAAOCAgEAnFZvAX7RvUz1isbwJh / k4DgYzDLDKTudQSk0YcbX8ACh <nl> + 66Ryj5QXvBMsdbRX7gp8CXrc1cqh0DQT + Hern + X + 2B50ioUHj3 / MeXrKls3N / U / 7 / SMNkPX0XtPG <nl> + YX2eEeAC7gkE2Qfdpoq3DIMku4NQkv5gdRE + 2J2winq14J2by5BSS7CTKtQ + FjPlnsZlFT5kOwQ / <nl> + 2wyPX1wdaR + v8 + khjPPvl / aatxm2hHSco1S1cE5j2FddUyGbQJJD + tZ3VTNPZNX70Cxqjm0lpu + F <nl> + 6ALEUz65noe8zDUa3qHpimOHZR4RKttjd5cUvpoUmRGywO6wT / gUITJDT5 + rosuoD6o7BlXGEilX <nl> + CNQ314cnrUlZp5GrRHpejXDbl85IULFzk / bwg2D5zfHhMf1bfHEhYxQUqq / F3pN + aLHsIqKqkHWe <nl> + tUNy6mSjhEv9DKgma3GX7lZjZuhCVPnHHd / Qj1vfyDBviP4NxDMcU6ij / UgQ8uQKTuEVV / xuZDDC <nl> + VRHc6qnNSlSsKWNEz0pAoNZoWRsz + e86i9sgktxChL8Bq4fA1SCC28a5g4VCXA9DO2pJNdWY9BW / <nl> + + mGBDAkgGNLQFwzLSABQ6XaCjGTXOqAHVcweMcDvOrRl + + O / QmueD6i9a5jc2NvLi6Td11n0bt3 + <nl> + qsOR0C5CB8AMTVPNJLFMWx5R9N / pkvo = <nl> + mmm - - END CERTIFICATEmmm - - <nl> + <nl> + Certplus Root CA G2 <nl> + = = = = = = = = = = = = = = = = = = = <nl> + mmm - - BEGIN CERTIFICATEmmm - - <nl> + MIICHDCCAaKgAwIBAgISESDZkc6uo + jF5 / / pAq / Pc7xVMAoGCCqGSM49BAMDMD4xCzAJBgNVBAYT <nl> + AkZSMREwDwYDVQQKDAhDZXJ0cGx1czEcMBoGA1UEAwwTQ2VydHBsdXMgUm9vdCBDQSBHMjAeFw0x <nl> + NDA1MjYwMDAwMDBaFw0zODAxMTUwMDAwMDBaMD4xCzAJBgNVBAYTAkZSMREwDwYDVQQKDAhDZXJ0 <nl> + cGx1czEcMBoGA1UEAwwTQ2VydHBsdXMgUm9vdCBDQSBHMjB2MBAGByqGSM49AgEGBSuBBAAiA2IA <nl> + BM0PW1aC3 / BFGtat93nwHcmsltaeTpwftEIRyoa / bfuFo8XlGVzX7qY / aWfYeOKmycTbLXku54uN <nl> + Am8xIk0G42ByRZ0OQneezs / lf4WbGOT8zC5y0xaTTsqZY1yhBSpsBqNjMGEwDgYDVR0PAQH / BAQD <nl> + AgEGMA8GA1UdEwEB / wQFMAMBAf8wHQYDVR0OBBYEFNqDYwJ5jtpMxjwjFNiPwyCrKGBZMB8GA1Ud <nl> + IwQYMBaAFNqDYwJ5jtpMxjwjFNiPwyCrKGBZMAoGCCqGSM49BAMDA2gAMGUCMHD + sAvZ94OX7PNV <nl> + HdTcswYO / jOYnYs5kGuUIe22113WTNchp + e / IQ8rzfcq3IUHnQIxAIYUFuXcsGXCwI4Un78kFmjl <nl> + vPl5adytRSv3tjFzzAalU5ORGpOucGpnutee5WEaXw = = <nl> + mmm - - END CERTIFICATEmmm - - <nl> + <nl> + OpenTrust Root CA G1 <nl> + = = = = = = = = = = = = = = = = = = = = <nl> + mmm - - BEGIN CERTIFICATEmmm - - <nl> + MIIFbzCCA1egAwIBAgISESCzkFU5fX82bWTCp59rY45nMA0GCSqGSIb3DQEBCwUAMEAxCzAJBgNV <nl> + BAYTAkZSMRIwEAYDVQQKDAlPcGVuVHJ1c3QxHTAbBgNVBAMMFE9wZW5UcnVzdCBSb290IENBIEcx <nl> + MB4XDTE0MDUyNjA4NDU1MFoXDTM4MDExNTAwMDAwMFowQDELMAkGA1UEBhMCRlIxEjAQBgNVBAoM <nl> + CU9wZW5UcnVzdDEdMBsGA1UEAwwUT3BlblRydXN0IFJvb3QgQ0EgRzEwggIiMA0GCSqGSIb3DQEB <nl> + AQUAA4ICDwAwggIKAoICAQD4eUbalsUwXopxAy1wpLuwxQjczeY1wICkES3d5oeuXT2R0odsN7fa <nl> + Yp6bwiTXj / HbpqbfRm9RpnHLPhsxZ2L3EVs0J9V5ToybWL0iEA1cJwzdMOWo010hOHQX / uMftk87 <nl> + ay3bfWAfjH1MBcLrARYVmBSO0ZB3Ij / swjm4eTrwSSTilZHcYTSSjFR077F9jAHiOH3BX2pfJLKO <nl> + YheteSCtqx234LSWSE9mQxAGFiQD4eCcjsZGT44ameGPuY4zbGneWK2gDqdkVBFpRGZPTBKnjix9 <nl> + xNRbxQA0MMHZmf4yzgeEtE7NCv82TWLxp2NX5Ntqp66 / K7nJ5rInieV + mhxNaMbBGN4zK1FGSxyO <nl> + 9z0M + Yo0FMT7MzUj8czxKselu7Cizv5Ta01BG2Yospb6p64KTrk5M0ScdMGTHPjgniQlQ / GbI4Kq <nl> + 3ywgsNw2TgOzfALU5nsaqocTvz6hdLubDuHAk5 / XpGbKuxs74zD0M1mKB3IDVedzagMxbm + WG + Oi <nl> + n6 + Sx + 31QrclTDsTBM8clq8cIqPQqwWyTBIjUtz9GVsnnB47ev1CI9sjgBPwvFEVVJSmdz7QdFG9 <nl> + URQIOTfLHzSpMJ1ShC5VkLG631UAC9hWLbFJSXKAqWLXwPYYEQRVzXR7z2FwefR7LFxckvzluFqr <nl> + TJOVoSfupb7PcSNCupt2LQIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH / BAUwAwEB <nl> + / zAdBgNVHQ4EFgQUl0YhVyE12jZVx / PxN3DlCPaTKbYwHwYDVR0jBBgwFoAUl0YhVyE12jZVx / Px <nl> + N3DlCPaTKbYwDQYJKoZIhvcNAQELBQADggIBAB3dAmB84DWn5ph76kTOZ0BP8pNuZtQ5iSas000E <nl> + PLuHIT839HEl2ku6q5aCgZG27dmxpGWX4m9kWaSW7mDKHyP7Rbr / jyTwyqkxf3kfgLMtMrpkZ2Cv <nl> + uVnN35pJ06iCsfmYlIrM4LvgBBuZYLFGZdwIorJGnkSI6pN + VxbSFXJfLkur1J1juONI5f6ELlgK <nl> + n0Md / rcYkoZDSw6cMoYsYPXpSOqV7XAp8dUv / TW0V8 / bhUiZucJvbI / NeJWsZCj9VrDDb8O + WVLh <nl> + X4SPgPL0DTatdrOjteFkdjpY3H1PXlZs5VVZV6Xf8YpmMIzUUmI4d7S + KNfKNsSbBfD4Fdvb8e80 <nl> + nR14SohWZ25g / 4 / Ii + GOvUKpMwpZQhISKvqxnUOOBZuZ2mKtVzazHbYNeS2WuOvyDEsMpZTGMKcm <nl> + GS3tTAZQMPH9WD25SxdfGbRqhFS0OE85og2WaMMolP3tLR9Ka0OWLpABEPs4poEL0L9109S5zvE / <nl> + bw4cHjdx5RiHdRk / ULlepEU0rbDK5uUTdg8xFKmOLZTW1YVNcxVPS / KyPu1svf0OnWZzsD2097 + o <nl> + 4BGkxK51CUpjAEggpsadCwmKtODmzj7HPiY46SvepghJAwSQiumPv + i2tCqjI40cHLI5kqiPAlxA <nl> + OXXUc0ECd97N4EOH1uS6SsNsEn / + KuYj1oxx <nl> + mmm - - END CERTIFICATEmmm - - <nl> + <nl> + OpenTrust Root CA G2 <nl> + = = = = = = = = = = = = = = = = = = = = <nl> + mmm - - BEGIN CERTIFICATEmmm - - <nl> + MIIFbzCCA1egAwIBAgISESChaRu / vbm9UpaPI + hIvyYRMA0GCSqGSIb3DQEBDQUAMEAxCzAJBgNV <nl> + BAYTAkZSMRIwEAYDVQQKDAlPcGVuVHJ1c3QxHTAbBgNVBAMMFE9wZW5UcnVzdCBSb290IENBIEcy <nl> + MB4XDTE0MDUyNjAwMDAwMFoXDTM4MDExNTAwMDAwMFowQDELMAkGA1UEBhMCRlIxEjAQBgNVBAoM <nl> + CU9wZW5UcnVzdDEdMBsGA1UEAwwUT3BlblRydXN0IFJvb3QgQ0EgRzIwggIiMA0GCSqGSIb3DQEB <nl> + AQUAA4ICDwAwggIKAoICAQDMtlelM5QQgTJT32F + D3Y5z1zCU3UdSXqWON2ic2rxb95eolq5cSG + <nl> + Ntmh / LzubKh8NBpxGuga2F8ORAbtp + Dz0mEL4DKiltE48MLaARf85KxP6O6JHnSrT78eCbY2albz <nl> + 4e6WiWYkBuTNQjpK3eCasMSCRbP + yatcfD7J6xcvDH1urqWPyKwlCm / 61UWY0jUJ9gNDlP7ZvyCV <nl> + eYCYitmJNbtRG6Q3ffyZO6v / v6wNj0OxmXsWEH4db0fEFY8ElggGQgT4hNYdvJGmQr5J1WqIP7wt <nl> + UdGejeBSzFfdNTVY27SPJIjki9 / ca1TSgSuyzpJLHB9G + h3Ykst2Z7UJmQnlrBcUVXDGPKBWCgOz <nl> + 3GIZ38i1MH / 1PCZ1Eb3XG7OHngevZXHloM8apwkQHZOJZlvoPGIytbU6bumFAYueQ4xncyhZW + vj <nl> + 3CzMpSZyYhK05pyDRPZRpOLAeiRXyg6lPzq1O4vldu5w5pLeFlwoW5cZJ5L + epJUzpM5ChaHvGOz <nl> + 9bGTXOBut9Dq + WIyiET7vycotjCVXRIouZW + j1MY5aIYFuJWpLIsEPUdN6b4t / bQWVyJ98LVtZR0 <nl> + 0dX + G7bw5tYee9I8y6jj9RjzIR9u701oBnstXW5DiabA + aC / gh7PU3 + 06yzbXfZqfUAkBXKJOAGT <nl> + y3HCOV0GEfZvePg3DTmEJwIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH / BAUwAwEB <nl> + / zAdBgNVHQ4EFgQUajn6QiL35okATV59M4PLuG53hq8wHwYDVR0jBBgwFoAUajn6QiL35okATV59 <nl> + M4PLuG53hq8wDQYJKoZIhvcNAQENBQADggIBAJjLq0A85TMCl38th6aP1F5Kr7ge57tx + 4BkJamz <nl> + Gj5oXScmp7oq4fBXgwpkTx4idBvpkF / wrM / / T2h6OKQQbA2xx6R3gBi2oihEdqc0nXGEL8pZ0keI <nl> + mUEiyTCYYW49qKgFbdEfwFFEVn8nNQLdXpgKQuswv42hm1GqO + qTRmTFAHneIWv2V6CG1wZy7HBG <nl> + S4tz3aAhdT7cHcCP009zHIXZ / n9iyJVvttN7jLpTwm + bREx50B1ws9efAvSyB7DH5fitIw6mVskp <nl> + EndI2S9G / Tvw / HRwkqWOOAgfZDC2t0v7NqwQjqBSM2OdAzVWxWm9xiNaJ5T2pBL4LTM8oValX9YZ <nl> + 6e18CL13zSdkzJTaTkZQh + D5wVOAHrut + 0dSixv9ovneDiK3PTNZbNTe9ZUGMg1RGUFcPk8G97kr <nl> + gCf2o6p6fAbhQ8MTOWIaNr3gKC6UAuQpLmBVrkA9sHSSXvAgZJY / X0VdiLWK2gKgW0VU3jg9CcCo <nl> + SmVGFvyqv1ROTVu + OEO3KMqLM6oaJbolXCkvW0pujOotnCr2BXbgd5eAiN1nE28daCSLT7d0geX0 <nl> + YJ96Vdc + N9oWaz53rK4YcJUIeSkDiv7BO7M / Gg + kO14fWKGVyasvc0rQLW6aWQ9VGHgtPFGml4vm <nl> + u7JwqkwR3v98KzfUetF3NI / n + UL3PIEMS1IK <nl> + mmm - - END CERTIFICATEmmm - - <nl> + <nl> + OpenTrust Root CA G3 <nl> + = = = = = = = = = = = = = = = = = = = = <nl> + mmm - - BEGIN CERTIFICATEmmm - - <nl> + MIICITCCAaagAwIBAgISESDm + Ez8JLC + BUCs2oMbNGA / MAoGCCqGSM49BAMDMEAxCzAJBgNVBAYT <nl> + AkZSMRIwEAYDVQQKDAlPcGVuVHJ1c3QxHTAbBgNVBAMMFE9wZW5UcnVzdCBSb290IENBIEczMB4X <nl> + DTE0MDUyNjAwMDAwMFoXDTM4MDExNTAwMDAwMFowQDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCU9w <nl> + ZW5UcnVzdDEdMBsGA1UEAwwUT3BlblRydXN0IFJvb3QgQ0EgRzMwdjAQBgcqhkjOPQIBBgUrgQQA <nl> + IgNiAARK7liuTcpm3gY6oxH84Bjwbhy6LTAMidnW7ptzg6kjFYwvWYpa3RTqnVkrQ7cG7DK2uu5B <nl> + ta1doYXM6h0UZqNnfkbilPPntlahFVmhTzeXuSIevRHr9LIfXsMUmuXZl5mjYzBhMA4GA1UdDwEB <nl> + / wQEAwIBBjAPBgNVHRMBAf8EBTADAQH / MB0GA1UdDgQWBBRHd8MUi2I5DMlv4VBN0BBY3JWIbTAf <nl> + BgNVHSMEGDAWgBRHd8MUi2I5DMlv4VBN0BBY3JWIbTAKBggqhkjOPQQDAwNpADBmAjEAj6jcnboM <nl> + BBf6Fek9LykBl7 + BFjNAk2z8 + e2AcG + qj9uEwov1NcoG3GRvaBbhj5G5AjEA2Euly8LQCGzpGPta <nl> + 3U1fJAuwACEl74 + nBCZx4nxp5V2a + EEfOzmTk51V6s2N8fvB <nl> + mmm - - END CERTIFICATEmmm - - <nl> + <nl> + ISRG Root X1 <nl> + = = = = = = = = = = = = <nl> + mmm - - BEGIN CERTIFICATEmmm - - <nl> + MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAwTzELMAkGA1UE <nl> + BhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2VhcmNoIEdyb3VwMRUwEwYDVQQD <nl> + EwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQG <nl> + EwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMT <nl> + DElTUkcgUm9vdCBYMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54r <nl> + Vygch77ct984kIxuPOZXoHj3dcKi / vVqbvYATyjb3miGbESTtrFj / RQSa78f0uoxmyF + 0TM8ukj1 <nl> + 3Xnfs7j / EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4 + 3mX6UA5 / TR5d8mUgjU + g4rk8K <nl> + b4Mu0UlXjIB0ttov0DiNewNwIRt18jA8 + o + u3dpjq + sWT8KOEUt + zwvo / 7V3LvSye0rgTBIlDHCN <nl> + Aymg4VMk7BPZ7hm / ELNKjD + Jo2FR3qyHB5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ <nl> + 4Q7e2RCOFvu396j3x + UCB5iPNgiV5 + I3lg02dZ77DnKxHZu8A / lJBdiB3QW0KtZB6awBdpUKD9jf <nl> + 1b0SHzUvKBds0pjBqAlkd25HN7rOrFleaJ1 / ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWnOlFu <nl> + hjuefXKnEgV4We0 + UXgVCwOPjdAvBbI + e0ocS3MFEvzG6uBQE3xDk3SzynTnjh8BCNAw1FtxNrQH <nl> + usEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbwqHyGO0aoSCqI3Haadr8faqU9GY / r <nl> + OPNk3sgrDQoo / / fb4hVC1CLQJ13hef4Y53CIrU7m2Ys6xt0nUW7 / vGT1M0NPAgMBAAGjQjBAMA4G <nl> + A1UdDwEB / wQEAwIBBjAPBgNVHRMBAf8EBTADAQH / MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY <nl> + 9umbbjANBgkqhkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu + ILlaS / V9lZL <nl> + ubhzEFnTIZd + 50xx + 7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe + GnY + EgPbk6ZGQ3BebYhtF8GaV <nl> + 0nxvwuo77x / Py9auJ / GpsMiu / X1 + mvoiBOv / 2X / qkSsisRcOj / KKNFtY2PwByVS5uCbMiogziUwt <nl> + hDyC3 + 6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5ORAzI4JMPJ + GslWYHb4phowim57iaztXOoJw <nl> + TdwJx4nLCgdNbOhdjsnvzqvHu7UrTkXWStAmzOVyyghqpZXjFaH3pO3JLF + l + / + sKAIuvtd7u + Nx <nl> + e5AW0wdeRlN8NwdCjNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4 + 63SM1N95R1NbdWhscdCb + ZA <nl> + JzVcoyi3B43njTOQ5yOf + 1CceWxG1bQVs5ZufpsMljq4Ui0 / 1lvh + wjChP4kqKOJ2qxq4RgqsahD <nl> + YVvTH9w7jXbyLeiNdd8XM2w9U / t7y0Ff / 9yi0GE44Za4rF2LN9d11TPAmRGunUHBcnWEvgJBQl9n <nl> + JEiU0Zsnvgc / ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57demyPxgcYxn / eR44 / KJ4EBs + lVDR3veyJ <nl> + m + kXQ99b21 / + jh5Xos1AnX5iItreGCc = <nl> + mmm - - END CERTIFICATEmmm - - <nl> + <nl> + AC RAIZ FNMT - RCM <nl> + = = = = = = = = = = = = = = = = <nl> + mmm - - BEGIN CERTIFICATEmmm - - <nl> + MIIFgzCCA2ugAwIBAgIPXZONMGc2yAYdGsdUhGkHMA0GCSqGSIb3DQEBCwUAMDsxCzAJBgNVBAYT <nl> + AkVTMREwDwYDVQQKDAhGTk1ULVJDTTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTTAeFw0wODEw <nl> + MjkxNTU5NTZaFw0zMDAxMDEwMDAwMDBaMDsxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJD <nl> + TTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC <nl> + ggIBALpxgHpMhm5 / yBNtwMZ9HACXjywMI7sQmkCpGreHiPibVmr75nuOi5KOpyVdWRHbNi63URcf <nl> + qQgfBBckWKo3Shjf5TnUV / 3XwSyRAZHiItQDwFj8d0fsjz50Q7qsNI1NOHZnjrDIbzAzWHFctPVr <nl> + btQBULgTfmxKo0nRIBnuvMApGGWn3v7v3QqQIecaZ5JCEJhfTzC8PhxFtBDXaEAUwED653cXeuYL <nl> + j2VbPNmaUtu1vZ5Gzz3rkQUCwJaydkxNEJY7kvqcfw + Z374jNUUeAlz + taibmSXaXvMiwzn15Cou <nl> + 08YfxGyqxRxqAQVKL9LFwag0Jl1mpdICIfkYtwb1TplvqKtMUejPUBjFd8g5CSxJkjKZqLsXF3mw <nl> + WsXmo8RZZUc1g16p6DULmbvkzSDGm0oGObVo / CK67lWMK07q87Hj / LaZmtVC + nFNCM + HHmpxffnT <nl> + tOmlcYF7wk5HlqX2doWjKI / pgG6BU6VtX7hI + cL5NqYuSf + 4lsKMB7ObiFj86xsc3i1w4peSMKGJ <nl> + 47xVqCfWS + 2QrYv6YyVZLag13cqXM7zlzced0ezvXg5KkAYmY6252TUtB7p2ZSysV4999AeU14EC <nl> + ll2jB0nVetBX + RvnU0Z1qrB5QstocQjpYL05ac70r8NWQMetUqIJ5G + GR4of6ygnXYMgrwTJbFaa <nl> + i0b1AgMBAAGjgYMwgYAwDwYDVR0TAQH / BAUwAwEB / zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE <nl> + FPd9xf3E6Jobd2Sn9R2gzL + HYJptMD4GA1UdIAQ3MDUwMwYEVR0gADArMCkGCCsGAQUFBwIBFh1o <nl> + dHRwOi8vd3d3LmNlcnQuZm5tdC5lcy9kcGNzLzANBgkqhkiG9w0BAQsFAAOCAgEAB5BK3 / MjTvDD <nl> + nFFlm5wioooMhfNzKWtN / gHiqQxjAb8EZ6WdmF / 9ARP67Jpi6Yb + tmLSbkyU + 8B1RXxlDPiyN8 + s <nl> + D8 + Nb / kZ94 / sHvJwnvDKuO + 3 / 3Y3dlv2bojzr2IyIpMNOmqOFGYMLVN0V2Ue1bLdI4E7pWYjJ2cJ <nl> + j + F3qkPNZVEI7VFY / uY5 + ctHhKQV8Xa7pO6kO8Rf77IzlhEYt8llvhjho6Tc + hj507wTmzl6NLrT <nl> + Qfv6MooqtyuGC2mDOL7Nii4LcK2NJpLuHvUBKwrZ1pebbuCoGRw6IYsMHkCtA + fdZn71uSANA + iW <nl> + + YJF1DngoABd15jmfZ5nc8OaKveri6E6FO80vFIOiZiaBECEHX5FaZNXzuvO + FB8TxxuBEOb + dY7 <nl> + Ixjp6o7RTUaN8Tvkasq6 + yO3m / qZASlaWFot4 / nUbQ4mrcFuNLwy + AwF + mWj2zs3gyLp1txyM / 1d <nl> + 8iC9djwj2ij3 + RvrWWTV3F9yfiD8zYm1kGdNYno / Tq0dwzn + evQoFt9B9kiABdcPUXmsEKvU7ANm <nl> + 5mqwujGSQkBqvjrTcuFqN1W8rB2Vt2lh8kORdOag0wokRqEIr9baRRmW1FMdW4R58MD3R + + Lj8UG <nl> + rp1MYp3 / RgT408m2ECVAdf4WqslKYIYvuu8wd + RU4riEmViAqhOLUTpPSPaLtrM = <nl> + mmm - - END CERTIFICATEmmm - - <nl> + <nl> + Amazon Root CA 1 <nl> + = = = = = = = = = = = = = = = = <nl> + mmm - - BEGIN CERTIFICATEmmm - - <nl> + MIIDQTCCAimgAwIBAgITBmyfz5m / jAo54vB4ikPmljZbyjANBgkqhkiG9w0BAQsFADA5MQswCQYD <nl> + VQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAxMB4XDTE1 <nl> + MDUyNjAwMDAwMFoXDTM4MDExNzAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpv <nl> + bjEZMBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC <nl> + ggEBALJ4gHHKeNXjca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgH <nl> + FzZM9O6II8c + 6zf1tRn4SWiw3te5djgdYZ6k / oI2peVKVuRF4fn9tBb6dNqcmzU5L / qwIFAGbHrQ <nl> + gLKm + a / sRxmPUDgH3KKHOVj4utWp + UhnMJbulHheb4mjUcAwhmahRWa6VOujw5H5SNz / 0egwLX0t <nl> + dHA114gk957EWW67c4cX8jJGKLhD + rcdqsq08p8kDi1L93FcXmn / 6pUCyziKrlA4b9v7LWIbxcce <nl> + VOF34GfID5yHI9Y / QCB / IIDEgEw + OyQmjgSubJrIqg0CAwEAAaNCMEAwDwYDVR0TAQH / BAUwAwEB <nl> + / zAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFIQYzIU07LwMlJQuCFmcx7IQTgoIMA0GCSqGSIb3 <nl> + DQEBCwUAA4IBAQCY8jdaQZChGsV2USggNiMOruYou6r4lK5IpDB / G / wkjUu0yKGX9rbxenDIU5PM <nl> + CCjjmCXPI6T53iHTfIUJrU6adTrCC2qJeHZERxhlbI1Bjjt / msv0tadQ1wUsN + gDS63pYaACbvXy <nl> + 8MWy7Vu33PqUXHeeE6V / Uq2V8viTO96LXFvKWlJbYK8U90vvo / ufQJVtMVT8QtPHRh8jrdkPSHCa <nl> + 2XV4cdFyQzR1bldZwgJcJmApzyMZFo6IQ6XU5MsI + yMRQ + hDKXJioaldXgjUkK642M4UwtBV8ob2 <nl> + xJNDd2ZhwLnoQdeXeGADbkpyrqXRfboQnoZsG4q5WTP468SQvvG5 <nl> + mmm - - END CERTIFICATEmmm - - <nl> + <nl> + Amazon Root CA 2 <nl> + = = = = = = = = = = = = = = = = <nl> + mmm - - BEGIN CERTIFICATEmmm - - <nl> + MIIFQTCCAymgAwIBAgITBmyf0pY1hp8KD + WGePhbJruKNzANBgkqhkiG9w0BAQwFADA5MQswCQYD <nl> + VQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAyMB4XDTE1 <nl> + MDUyNjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpv <nl> + bjEZMBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC <nl> + ggIBAK2Wny2cSkxKgXlRmeyKy2tgURO8TW0G / LAIjd0ZEGrHJgw12MBvIITplLGbhQPDW9tK6Mj4 <nl> + kHbZW0 / jTOgGNk3Mmqw9DJArktQGGWCsN0R5hYGCrVo34A3MnaZMUnbqQ523BNFQ9lXg1dKmSYXp <nl> + N + nKfq5clU1Imj + uIFptiJXZNLhSGkOQsL9sBbm2eLfq0OQ6PBJTYv9K8nu + NQWpEjTj82R0Yiw9 <nl> + AElaKP4yRLuH3WUnAnE72kr3H9rN9yFVkE8P7K6C4Z9r2UXTu / Bfh + 08LDmG2j / e7HJV63mjrdvd <nl> + fLC6HM783k81ds8P + HgfajZRRidhW + mez / CiVX18JYpvL7TFz4QuK / 0NURBs + 18bvBt + xa47mAEx <nl> + kv8LV / SasrlX6avvDXbR8O70zoan4G7ptGmh32n2M8ZpLpcTnqWHsFcQgTfJU7O7f / aS0ZzQGPSS <nl> + btqDT6ZjmUyl + 17vIWR6IF9sZIUVyzfpYgwLKhbcAS4y2j5L9Z469hdAlO + ekQiG + r5jqFoz7Mt0 <nl> + Q5X5bGlSNscpb / xVA1wf + 5 + 9R + vnSUeVC06JIglJ4PVhHvG / LopyboBZ / 1c6 + XUyo05f7O0oYtlN <nl> + c / LMgRdg7c3r3NunysV + Ar3yVAhU / bQtCSwXVEqY0VThUWcI0u1ufm8 / 0i2BWSlmy5A5lREedCf + <nl> + 3euvAgMBAAGjQjBAMA8GA1UdEwEB / wQFMAMBAf8wDgYDVR0PAQH / BAQDAgGGMB0GA1UdDgQWBBSw <nl> + DPBMMPQFWAJI / TPlUq9LhONmUjANBgkqhkiG9w0BAQwFAAOCAgEAqqiAjw54o + Ci1M3m9Zh6O + oA <nl> + A7CXDpO8Wqj2LIxyh6mx / H9z / WNxeKWHWc8w4Q0QshNabYL1auaAn6AFC2jkR2vHat + 2 / XcycuUY <nl> + + gn0oJMsXdKMdYV2ZZAMA3m3MSNjrXiDCYZohMr / + c8mmpJ5581LxedhpxfL86kSk5Nrp + gvU5LE <nl> + YFiwzAJRGFuFjWJZY7attN6a + yb3ACfAXVU3dJnJUH / jWS5E4ywl7uxMMne0nxrpS10gxdr9HIcW <nl> + xkPo1LsmmkVwXqkLN1PiRnsn / eBG8om3zEK2yygmbtmlyTrIQRNg91CMFa6ybRoVGld45pIq2WWQ <nl> + gj9sAq + uEjonljYE1x2igGOpm / HlurR8FLBOybEfdF849lHqm / osohHUqS0nGkWxr7JOcQ3AWEbW <nl> + aQbLU8uz / mtBzUF + fUwPfHJ5elnNXkoOrJupmHN5fLT0zLm4BwyydFy4x2 + IoZCn9Kr5v2c69BoV <nl> + Yh63n749sSmvZ6ES8lgQGVMDMBu4Gon2nL2XA46jCfMdiyHxtN / kHNGfZQIG6lzWE7OE76KlXIx3 <nl> + KadowGuuQNKotOrN8I1LOJwZmhsoVLiJkO / KdYE + HvJkJMcYr07 / R54H9jVlpNMKVv / 1F2Rs76gi <nl> + JUmTtt8AF9pYfl3uxRuw0dFfIRDH + fO6AgonB8Xx1sfT4PsJYGw = <nl> + mmm - - END CERTIFICATEmmm - - <nl> + <nl> + Amazon Root CA 3 <nl> + = = = = = = = = = = = = = = = = <nl> + mmm - - BEGIN CERTIFICATEmmm - - <nl> + MIIBtjCCAVugAwIBAgITBmyf1XSXNmY / Owua2eiedgPySjAKBggqhkjOPQQDAjA5MQswCQYDVQQG <nl> + EwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAzMB4XDTE1MDUy <nl> + NjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZ <nl> + MBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABCmXp8ZB <nl> + f8ANm + gBG1bG8lKlui2yEujSLtf6ycXYqm0fc4E7O5hrOXwzpcVOho6AF2hiRVd9RFgdszflZwjr <nl> + Zt6jQjBAMA8GA1UdEwEB / wQFMAMBAf8wDgYDVR0PAQH / BAQDAgGGMB0GA1UdDgQWBBSrttvXBp43 <nl> + rDCGB5Fwx5zEGbF4wDAKBggqhkjOPQQDAgNJADBGAiEA4IWSoxe3jfkrBqWTrBqYaGFy + uGh0Psc <nl> + eGCmQ5nFuMQCIQCcAu / xlJyzlvnrxir4tiz + OpAUFteMYyRIHN8wfdVoOw = = <nl> + mmm - - END CERTIFICATEmmm - - <nl> + <nl> + Amazon Root CA 4 <nl> + = = = = = = = = = = = = = = = = <nl> + mmm - - BEGIN CERTIFICATEmmm - - <nl> + MIIB8jCCAXigAwIBAgITBmyf18G7EEwpQ + Vxe3ssyBrBDjAKBggqhkjOPQQDAzA5MQswCQYDVQQG <nl> + EwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSA0MB4XDTE1MDUy <nl> + NjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZ <nl> + MBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgNDB2MBAGByqGSM49AgEGBSuBBAAiA2IABNKrijdPo1MN <nl> + / sGKe0uoe0ZLY7Bi9i0b2whxIdIA6GO9mif78DluXeo9pcmBqqNbIJhFXRbb / egQbeOc4OO9X4Ri <nl> + 83BkM6DLJC9wuoihKqB1 + IGuYgbEgds5bimwHvouXKNCMEAwDwYDVR0TAQH / BAUwAwEB / zAOBgNV <nl> + HQ8BAf8EBAMCAYYwHQYDVR0OBBYEFNPsxzplbszh2naaVvuc84ZtV + WBMAoGCCqGSM49BAMDA2gA <nl> + MGUCMDqLIfG9fhGt0O9Yli / W651 + kI0rz2ZVwyzjKKlwCkcO8DdZEv8tmZQoTipPNU0zWgIxAOp1 <nl> + AE47xDqUEpHJWEadIRNyp4iciuRMStuW1KyLa2tJElMzrdfkviT8tQp21KW8EA = = <nl> + mmm - - END CERTIFICATEmmm - - <nl> + <nl> + LuxTrust Global Root 2 <nl> + = = = = = = = = = = = = = = = = = = = = = = <nl> + mmm - - BEGIN CERTIFICATEmmm - - <nl> + MIIFwzCCA6ugAwIBAgIUCn6m30tEntpqJIWe5rgV0xZ / u7EwDQYJKoZIhvcNAQELBQAwRjELMAkG <nl> + A1UEBhMCTFUxFjAUBgNVBAoMDUx1eFRydXN0IFMuQS4xHzAdBgNVBAMMFkx1eFRydXN0IEdsb2Jh <nl> + bCBSb290IDIwHhcNMTUwMzA1MTMyMTU3WhcNMzUwMzA1MTMyMTU3WjBGMQswCQYDVQQGEwJMVTEW <nl> + MBQGA1UECgwNTHV4VHJ1c3QgUy5BLjEfMB0GA1UEAwwWTHV4VHJ1c3QgR2xvYmFsIFJvb3QgMjCC <nl> + AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANeFl78RmOnwYoNMPIf5U2o3C / IPPIfOb9wm <nl> + Kb3FibrJgz337spbxm1Jc7TJRqMbNBM / wYlFV / TZsfs2ZUv7COJIcRHIbjuend + JZTemhfY7RBi2 <nl> + xjcwYkSSl2l9QjAk5A0MiWtj3sXh306pFGxT4GHO9hcvHTy95iJMHZP1EMShduxq3sVs35a0VkBC <nl> + wGKSMKEtFZSg0iAGCW5qbeXrt77U8PEVfIvmTroTzEsnXpk8F12PgX8zPU / TPxvsXD / wPEx1bvKm <nl> + 1Z3aLQdjAsZy6ZS8TEmVT4hSyNvoaYL4zDRbIvCGp4m9SAptZoFtyMhk + wHh9OHe2Z7d21vUKpkm <nl> + FRseTJIpgp7VkoGSQXAZ96Tlk0u8d2cx3Rz9MXANF5kM + Qw5GSoXtTBxVdUPrljhPS80m8 + f9niF <nl> + wpN6cj5mj5wWEWCPnolvZ77gR1o7DJpni89Gxq44o / KnvObWhWszJHAiS8sIm7vI + AIpHb4gDEa / <nl> + a4ebsypmQjVGbKq6rfmYe + lQVRQxv7HaLe2ArWgk + 2mr2HETMOZns4dA / Yl + 8kPREd8vZS9kzl8U <nl> + ubG / Mb2HeFpZZYiq / FkySIbWTLkpS5XTdvN3JW1CHDiDTf2jX5t / Lax5Gw5CMZdjpPuKadUiDTSQ <nl> + MC6otOBttpSsvItO13D8xTiOZCXhTTmQzsmHhFhxAgMBAAGjgagwgaUwDwYDVR0TAQH / BAUwAwEB <nl> + / zBCBgNVHSAEOzA5MDcGByuBKwEBAQowLDAqBggrBgEFBQcCARYeaHR0cHM6Ly9yZXBvc2l0b3J5 <nl> + Lmx1eHRydXN0Lmx1MA4GA1UdDwEB / wQEAwIBBjAfBgNVHSMEGDAWgBT / GCh2 + UgFLKGu8SsbK7JT <nl> + + Et8szAdBgNVHQ4EFgQU / xgodvlIBSyhrvErGyuyU / hLfLMwDQYJKoZIhvcNAQELBQADggIBAGoZ <nl> + FO1uecEsh9QNcH7X9njJCwROxLHOk3D + sFTAMs2ZMGQXvw / l4jP9BzZAcg4atmpZ1gDlaCDdLnIN <nl> + H2pkMSCEfUmmWjfrRcmF9dTHF5kH5ptV5AzoqbTOjFu1EVzPig4N1qx3gf4ynCSecs5U89BvolbW <nl> + 7MM3LGVYvlcAGvI1 + ut7MV3CwRI9loGIlonBWVx65n9wNOeD4rHh4bhY79SV5GCc8JaXcozrhAIu <nl> + ZY + kt9J / Z93I055cqqmkoCUUBpvsT34tC38ddfEz2O3OuHVtPlu5mB0xDVbYQw8wkbIEa91WvpWA <nl> + VWe + 2M2D2RjuLg + GLZKecBPs3lHJQ3gCpU3I + V / EkVhGFndadKpAvAefMLmx9xIX3eP / JEAdemrR <nl> + TxgKqpAd60Ae36EeRJIQmvKN4dFLRp7oRUKX6kWZ8 + xm1QL68qZKJKrezrnK + T + Tb / mjuuqlPpmt <nl> + / f97mfVl7vBZKGfXkJWkE4SphMHozs51k2MavDzq1WQfLSoSOcbDWjLtR5EWDrw4wVDej8oqkDQc <nl> + 7kGUnF4ZLvhFSZl0kbAEb + MEWrGrKqv + x9CWttrhSmQGbmBNvUJO / 3jaJMobtNeWOWyu8Q6qp31I <nl> + iyBMz2TWuJdGsE7RKlY6oJO9r4Ak4Ap + 58rVyuiFVdw2KuGUaJPHZnJED4AhMmwlxyOAgwrr <nl> + mmm - - END CERTIFICATEmmm - - <nl> | Merge pull request from wsnipex / openssl | xbmc/xbmc | 0d045d00d5eb42488fea7fe6a95c0b3bd96c2cf7 | 2017-03-28T07:44:31Z |
mmm a / dbms / tests / queries / 0_stateless / 00682_empty_parts_merge . reference <nl> ppp b / dbms / tests / queries / 0_stateless / 00682_empty_parts_merge . reference <nl> <nl> + * * * Vertical merge * * * <nl> + 2 2 <nl> mmm a / dbms / tests / queries / 0_stateless / 00682_empty_parts_merge . sh <nl> ppp b / dbms / tests / queries / 0_stateless / 00682_empty_parts_merge . sh <nl> $ { CLICKHOUSE_CLIENT } - - query = " SELECT * FROM test . ordinary " <nl> $ { CLICKHOUSE_CLIENT } - - query = " DROP TABLE test . ordinary " <nl> <nl> <nl> + $ { CLICKHOUSE_CLIENT } - - query = " SELECT ' * * * Vertical merge * * * ' " <nl> + <nl> + $ { CLICKHOUSE_CLIENT } - - query = " DROP TABLE IF EXISTS test . vertical " <nl> + $ { CLICKHOUSE_CLIENT } - - query = " CREATE TABLE test . vertical ( k UInt32 , v UInt32 ) ENGINE MergeTree ORDER BY k \ <nl> + SETTINGS enable_vertical_merge_algorithm = 1 , \ <nl> + vertical_merge_algorithm_min_rows_to_activate = 0 , \ <nl> + vertical_merge_algorithm_min_columns_to_activate = 0 " <nl> + <nl> + $ { CLICKHOUSE_CLIENT } - - query = " INSERT INTO test . vertical ( k , v ) VALUES ( 1 , 1 ) " <nl> + $ { CLICKHOUSE_CLIENT } - - query = " INSERT INTO test . vertical ( k , v ) VALUES ( 2 , 2 ) " <nl> + <nl> + $ { CLICKHOUSE_CLIENT } - - query = " ALTER TABLE test . vertical DELETE WHERE k = 1 " <nl> + wait_for_mutation " vertical " " mutation_3 . txt " <nl> + <nl> + $ { CLICKHOUSE_CLIENT } - - query = " OPTIMIZE TABLE test . vertical PARTITION tuple ( ) FINAL " <nl> + $ { CLICKHOUSE_CLIENT } - - query = " SELECT * FROM test . vertical " <nl> + <nl> + $ { CLICKHOUSE_CLIENT } - - query = " DROP TABLE test . vertical " <nl> + <nl> + <nl> $ { CLICKHOUSE_CLIENT } - - query = " DROP TABLE IF EXISTS test . summing " <nl> $ { CLICKHOUSE_CLIENT } - - query = " CREATE TABLE test . summing ( k UInt32 , v UInt32 ) ENGINE SummingMergeTree ORDER BY k " <nl> <nl> | add test for vertical merge of empty parts [ # CLICKHOUSE - 3913 ] | ClickHouse/ClickHouse | cc2f10c1cc546029a31f99f7634ddc50bd357219 | 2018-08-23T12:15:30Z |
mmm a / tools / internal_ci / helper_scripts / prepare_build_windows . bat <nl> ppp b / tools / internal_ci / helper_scripts / prepare_build_windows . bat <nl> set DOTNET_CLI_TELEMETRY_OPTOUT = true <nl> <nl> git submodule update - - init | | goto : error <nl> <nl> + goto : EOF <nl> + <nl> : error <nl> - popd <nl> exit / b 1 <nl> | Goto : EOF | grpc/grpc | 751d152e2c5d73ad138616a4aab4e17a83a29ce9 | 2020-09-15T23:05:36Z |
mmm a / imgui . cpp <nl> ppp b / imgui . cpp <nl> void ImGuiTextEditState : : OnKeyPressed ( int key ) <nl> { <nl> stb_textedit_key ( this , & StbState , key ) ; <nl> CursorFollow = true ; <nl> + SelectedAllMouseLock = true ; <nl> CursorAnimReset ( ) ; <nl> } <nl> <nl> | InputText : when keys are being input while mouse is dragging , disable mouse drag until button release ( ) | ocornut/imgui | 4bfd5cd95f04bc9f5a27a5013e8007d85db8457e | 2015-12-11T22:20:16Z |
mmm a / Marlin / Marlin_main . cpp <nl> ppp b / Marlin / Marlin_main . cpp <nl> inline void gcode_M907 ( ) { <nl> inline void gcode_M999 ( ) { <nl> Running = true ; <nl> lcd_reset_alert_level ( ) ; <nl> - gcode_LastN = Stopped_gcode_LastN ; <nl> + / / gcode_LastN = Stopped_gcode_LastN ; <nl> FlushSerialRequestResend ( ) ; <nl> } <nl> <nl> | Continue from the line following the M999 ( PR ) | MarlinFirmware/Marlin | 9d8cc24abf8d0cb70465f8d7790fff1cd57a1f2d | 2015-08-08T13:08:02Z |
mmm a / CMakeLists . txt <nl> ppp b / CMakeLists . txt <nl> add_dependencies ( buildtests_cxx golden_file_test ) <nl> add_dependencies ( buildtests_cxx grpc_cli ) <nl> add_dependencies ( buildtests_cxx grpc_tool_test ) <nl> add_dependencies ( buildtests_cxx grpclb_api_test ) <nl> + add_dependencies ( buildtests_cxx grpclb_end2end_test ) <nl> add_dependencies ( buildtests_cxx grpclb_test ) <nl> add_dependencies ( buildtests_cxx health_service_end2end_test ) <nl> if ( _gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX ) <nl> target_link_libraries ( grpclb_api_test <nl> endif ( gRPC_BUILD_TESTS ) <nl> if ( gRPC_BUILD_TESTS ) <nl> <nl> + add_executable ( grpclb_end2end_test <nl> + $ { _gRPC_PROTO_GENS_DIR } / src / proto / grpc / lb / v1 / load_balancer . pb . cc <nl> + $ { _gRPC_PROTO_GENS_DIR } / src / proto / grpc / lb / v1 / load_balancer . grpc . pb . cc <nl> + $ { _gRPC_PROTO_GENS_DIR } / src / proto / grpc / lb / v1 / load_balancer . pb . h <nl> + $ { _gRPC_PROTO_GENS_DIR } / src / proto / grpc / lb / v1 / load_balancer . grpc . pb . h <nl> + test / cpp / end2end / grpclb_end2end_test . cc <nl> + third_party / googletest / googletest / src / gtest - all . cc <nl> + third_party / googletest / googlemock / src / gmock - all . cc <nl> + ) <nl> + <nl> + protobuf_generate_grpc_cpp ( <nl> + src / proto / grpc / lb / v1 / load_balancer . proto <nl> + ) <nl> + <nl> + target_include_directories ( grpclb_end2end_test <nl> + PRIVATE $ { CMAKE_CURRENT_SOURCE_DIR } <nl> + PRIVATE $ { CMAKE_CURRENT_SOURCE_DIR } / include <nl> + PRIVATE $ { BORINGSSL_ROOT_DIR } / include <nl> + PRIVATE $ { PROTOBUF_ROOT_DIR } / src <nl> + PRIVATE $ { BENCHMARK_ROOT_DIR } / include <nl> + PRIVATE $ { ZLIB_ROOT_DIR } <nl> + PRIVATE $ { CMAKE_CURRENT_BINARY_DIR } / third_party / zlib <nl> + PRIVATE $ { CARES_BUILD_INCLUDE_DIR } <nl> + PRIVATE $ { CARES_INCLUDE_DIR } <nl> + PRIVATE $ { CARES_PLATFORM_INCLUDE_DIR } <nl> + PRIVATE $ { CMAKE_CURRENT_BINARY_DIR } / third_party / cares / cares <nl> + PRIVATE $ { CMAKE_CURRENT_BINARY_DIR } / third_party / gflags / include <nl> + PRIVATE third_party / googletest / googletest / include <nl> + PRIVATE third_party / googletest / googletest <nl> + PRIVATE third_party / googletest / googlemock / include <nl> + PRIVATE third_party / googletest / googlemock <nl> + PRIVATE $ { _gRPC_PROTO_GENS_DIR } <nl> + ) <nl> + <nl> + target_link_libraries ( grpclb_end2end_test <nl> + $ { _gRPC_PROTOBUF_LIBRARIES } <nl> + $ { _gRPC_ALLTARGETS_LIBRARIES } <nl> + grpc + + _test_util <nl> + grpc_test_util <nl> + grpc + + <nl> + grpc <nl> + gpr_test_util <nl> + gpr <nl> + $ { _gRPC_GFLAGS_LIBRARIES } <nl> + ) <nl> + <nl> + endif ( gRPC_BUILD_TESTS ) <nl> + if ( gRPC_BUILD_TESTS ) <nl> + <nl> add_executable ( grpclb_test <nl> $ { _gRPC_PROTO_GENS_DIR } / src / proto / grpc / lb / v1 / load_balancer . pb . cc <nl> $ { _gRPC_PROTO_GENS_DIR } / src / proto / grpc / lb / v1 / load_balancer . grpc . pb . cc <nl> mmm a / Makefile <nl> ppp b / Makefile <nl> grpc_python_plugin : $ ( BINDIR ) / $ ( CONFIG ) / grpc_python_plugin <nl> grpc_ruby_plugin : $ ( BINDIR ) / $ ( CONFIG ) / grpc_ruby_plugin <nl> grpc_tool_test : $ ( BINDIR ) / $ ( CONFIG ) / grpc_tool_test <nl> grpclb_api_test : $ ( BINDIR ) / $ ( CONFIG ) / grpclb_api_test <nl> + grpclb_end2end_test : $ ( BINDIR ) / $ ( CONFIG ) / grpclb_end2end_test <nl> grpclb_test : $ ( BINDIR ) / $ ( CONFIG ) / grpclb_test <nl> health_service_end2end_test : $ ( BINDIR ) / $ ( CONFIG ) / health_service_end2end_test <nl> http2_client : $ ( BINDIR ) / $ ( CONFIG ) / http2_client <nl> buildtests_cxx : privatelibs_cxx \ <nl> $ ( BINDIR ) / $ ( CONFIG ) / grpc_cli \ <nl> $ ( BINDIR ) / $ ( CONFIG ) / grpc_tool_test \ <nl> $ ( BINDIR ) / $ ( CONFIG ) / grpclb_api_test \ <nl> + $ ( BINDIR ) / $ ( CONFIG ) / grpclb_end2end_test \ <nl> $ ( BINDIR ) / $ ( CONFIG ) / grpclb_test \ <nl> $ ( BINDIR ) / $ ( CONFIG ) / health_service_end2end_test \ <nl> $ ( BINDIR ) / $ ( CONFIG ) / http2_client \ <nl> buildtests_cxx : privatelibs_cxx \ <nl> $ ( BINDIR ) / $ ( CONFIG ) / grpc_cli \ <nl> $ ( BINDIR ) / $ ( CONFIG ) / grpc_tool_test \ <nl> $ ( BINDIR ) / $ ( CONFIG ) / grpclb_api_test \ <nl> + $ ( BINDIR ) / $ ( CONFIG ) / grpclb_end2end_test \ <nl> $ ( BINDIR ) / $ ( CONFIG ) / grpclb_test \ <nl> $ ( BINDIR ) / $ ( CONFIG ) / health_service_end2end_test \ <nl> $ ( BINDIR ) / $ ( CONFIG ) / http2_client \ <nl> test_cxx : buildtests_cxx <nl> $ ( Q ) $ ( BINDIR ) / $ ( CONFIG ) / grpc_tool_test | | ( echo test grpc_tool_test failed ; exit 1 ) <nl> $ ( E ) " [ RUN ] Testing grpclb_api_test " <nl> $ ( Q ) $ ( BINDIR ) / $ ( CONFIG ) / grpclb_api_test | | ( echo test grpclb_api_test failed ; exit 1 ) <nl> + $ ( E ) " [ RUN ] Testing grpclb_end2end_test " <nl> + $ ( Q ) $ ( BINDIR ) / $ ( CONFIG ) / grpclb_end2end_test | | ( echo test grpclb_end2end_test failed ; exit 1 ) <nl> $ ( E ) " [ RUN ] Testing grpclb_test " <nl> $ ( Q ) $ ( BINDIR ) / $ ( CONFIG ) / grpclb_test | | ( echo test grpclb_test failed ; exit 1 ) <nl> $ ( E ) " [ RUN ] Testing health_service_end2end_test " <nl> endif <nl> $ ( OBJDIR ) / $ ( CONFIG ) / test / cpp / grpclb / grpclb_api_test . o : $ ( GENDIR ) / src / proto / grpc / lb / v1 / load_balancer . pb . cc $ ( GENDIR ) / src / proto / grpc / lb / v1 / load_balancer . grpc . pb . cc <nl> <nl> <nl> + GRPCLB_END2END_TEST_SRC = \ <nl> + $ ( GENDIR ) / src / proto / grpc / lb / v1 / load_balancer . pb . cc $ ( GENDIR ) / src / proto / grpc / lb / v1 / load_balancer . grpc . pb . cc \ <nl> + test / cpp / end2end / grpclb_end2end_test . cc \ <nl> + <nl> + GRPCLB_END2END_TEST_OBJS = $ ( addprefix $ ( OBJDIR ) / $ ( CONFIG ) / , $ ( addsuffix . o , $ ( basename $ ( GRPCLB_END2END_TEST_SRC ) ) ) ) <nl> + ifeq ( $ ( NO_SECURE ) , true ) <nl> + <nl> + # You can ' t build secure targets if you don ' t have OpenSSL . <nl> + <nl> + $ ( BINDIR ) / $ ( CONFIG ) / grpclb_end2end_test : openssl_dep_error <nl> + <nl> + else <nl> + <nl> + <nl> + <nl> + <nl> + ifeq ( $ ( NO_PROTOBUF ) , true ) <nl> + <nl> + # You can ' t build the protoc plugins or protobuf - enabled targets if you don ' t have protobuf 3 . 0 . 0 + . <nl> + <nl> + $ ( BINDIR ) / $ ( CONFIG ) / grpclb_end2end_test : protobuf_dep_error <nl> + <nl> + else <nl> + <nl> + $ ( BINDIR ) / $ ( CONFIG ) / grpclb_end2end_test : $ ( PROTOBUF_DEP ) $ ( GRPCLB_END2END_TEST_OBJS ) $ ( LIBDIR ) / $ ( CONFIG ) / libgrpc + + _test_util . a $ ( LIBDIR ) / $ ( CONFIG ) / libgrpc_test_util . a $ ( LIBDIR ) / $ ( CONFIG ) / libgrpc + + . a $ ( LIBDIR ) / $ ( CONFIG ) / libgrpc . a $ ( LIBDIR ) / $ ( CONFIG ) / libgpr_test_util . a $ ( LIBDIR ) / $ ( CONFIG ) / libgpr . a <nl> + $ ( E ) " [ LD ] Linking $ @ " <nl> + $ ( Q ) mkdir - p ` dirname $ @ ` <nl> + $ ( Q ) $ ( LDXX ) $ ( LDFLAGS ) $ ( GRPCLB_END2END_TEST_OBJS ) $ ( LIBDIR ) / $ ( CONFIG ) / libgrpc + + _test_util . a $ ( LIBDIR ) / $ ( CONFIG ) / libgrpc_test_util . a $ ( LIBDIR ) / $ ( CONFIG ) / libgrpc + + . a $ ( LIBDIR ) / $ ( CONFIG ) / libgrpc . a $ ( LIBDIR ) / $ ( CONFIG ) / libgpr_test_util . a $ ( LIBDIR ) / $ ( CONFIG ) / libgpr . a $ ( LDLIBSXX ) $ ( LDLIBS_PROTOBUF ) $ ( LDLIBS ) $ ( LDLIBS_SECURE ) $ ( GTEST_LIB ) - o $ ( BINDIR ) / $ ( CONFIG ) / grpclb_end2end_test <nl> + <nl> + endif <nl> + <nl> + endif <nl> + <nl> + $ ( OBJDIR ) / $ ( CONFIG ) / src / proto / grpc / lb / v1 / load_balancer . o : $ ( LIBDIR ) / $ ( CONFIG ) / libgrpc + + _test_util . a $ ( LIBDIR ) / $ ( CONFIG ) / libgrpc_test_util . a $ ( LIBDIR ) / $ ( CONFIG ) / libgrpc + + . a $ ( LIBDIR ) / $ ( CONFIG ) / libgrpc . a $ ( LIBDIR ) / $ ( CONFIG ) / libgpr_test_util . a $ ( LIBDIR ) / $ ( CONFIG ) / libgpr . a <nl> + <nl> + $ ( OBJDIR ) / $ ( CONFIG ) / test / cpp / end2end / grpclb_end2end_test . o : $ ( LIBDIR ) / $ ( CONFIG ) / libgrpc + + _test_util . a $ ( LIBDIR ) / $ ( CONFIG ) / libgrpc_test_util . a $ ( LIBDIR ) / $ ( CONFIG ) / libgrpc + + . a $ ( LIBDIR ) / $ ( CONFIG ) / libgrpc . a $ ( LIBDIR ) / $ ( CONFIG ) / libgpr_test_util . a $ ( LIBDIR ) / $ ( CONFIG ) / libgpr . a <nl> + <nl> + deps_grpclb_end2end_test : $ ( GRPCLB_END2END_TEST_OBJS : . o = . dep ) <nl> + <nl> + ifneq ( $ ( NO_SECURE ) , true ) <nl> + ifneq ( $ ( NO_DEPS ) , true ) <nl> + - include $ ( GRPCLB_END2END_TEST_OBJS : . o = . dep ) <nl> + endif <nl> + endif <nl> + $ ( OBJDIR ) / $ ( CONFIG ) / test / cpp / end2end / grpclb_end2end_test . o : $ ( GENDIR ) / src / proto / grpc / lb / v1 / load_balancer . pb . cc $ ( GENDIR ) / src / proto / grpc / lb / v1 / load_balancer . grpc . pb . cc <nl> + <nl> + <nl> GRPCLB_TEST_SRC = \ <nl> $ ( GENDIR ) / src / proto / grpc / lb / v1 / load_balancer . pb . cc $ ( GENDIR ) / src / proto / grpc / lb / v1 / load_balancer . grpc . pb . cc \ <nl> test / cpp / grpclb / grpclb_test . cc \ <nl> mmm a / build . yaml <nl> ppp b / build . yaml <nl> targets : <nl> - grpc_test_util <nl> - grpc + + <nl> - grpc <nl> + - name : grpclb_end2end_test <nl> + gtest : true <nl> + build : test <nl> + language : c + + <nl> + src : <nl> + - src / proto / grpc / lb / v1 / load_balancer . proto <nl> + - test / cpp / end2end / grpclb_end2end_test . cc <nl> + deps : <nl> + - grpc + + _test_util <nl> + - grpc_test_util <nl> + - grpc + + <nl> + - grpc <nl> + - gpr_test_util <nl> + - gpr <nl> - name : grpclb_test <nl> gtest : false <nl> build : test <nl> mmm a / src / core / ext / filters / client_channel / lb_policy / grpclb / grpclb . c <nl> ppp b / src / core / ext / filters / client_channel / lb_policy / grpclb / grpclb . c <nl> static void lb_on_response_received_locked ( grpc_exec_ctx * exec_ctx , void * arg , <nl> " Received empty server list . Picks will stay pending until a " <nl> " response with > 0 servers is received " ) ; <nl> } <nl> - grpc_grpclb_destroy_serverlist ( glb_policy - > serverlist ) ; <nl> + grpc_grpclb_destroy_serverlist ( serverlist ) ; <nl> } <nl> } else { / * serverlist = = NULL * / <nl> gpr_log ( GPR_ERROR , " Invalid LB response received : ' % s ' . Ignoring . " , <nl> new file mode 100644 <nl> index 00000000000 . . 46d4f2d62c7 <nl> mmm / dev / null <nl> ppp b / src / proto / grpc / lb / v1 / BUILD <nl> <nl> + # Copyright 2017 , Google Inc . <nl> + # All rights reserved . <nl> + # <nl> + # Redistribution and use in source and binary forms , with or without <nl> + # modification , are permitted provided that the following conditions are <nl> + # met : <nl> + # <nl> + # * Redistributions of source code must retain the above copyright <nl> + # notice , this list of conditions and the following disclaimer . <nl> + # * Redistributions in binary form must reproduce the above <nl> + # copyright notice , this list of conditions and the following disclaimer <nl> + # in the documentation and / or other materials provided with the <nl> + # distribution . <nl> + # * Neither the name of Google Inc . nor the names of its <nl> + # contributors may be used to endorse or promote products derived from <nl> + # this software without specific prior written permission . <nl> + # <nl> + # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS <nl> + # " AS IS " AND ANY EXPRESS OR IMPLIED WARRANTIES , INCLUDING , BUT NOT <nl> + # LIMITED TO , THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR <nl> + # A PARTICULAR PURPOSE ARE DISCLAIMED . IN NO EVENT SHALL THE COPYRIGHT <nl> + # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT , INDIRECT , INCIDENTAL , <nl> + # SPECIAL , EXEMPLARY , OR CONSEQUENTIAL DAMAGES ( INCLUDING , BUT NOT <nl> + # LIMITED TO , PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES ; LOSS OF USE , <nl> + # DATA , OR PROFITS ; OR BUSINESS INTERRUPTION ) HOWEVER CAUSED AND ON ANY <nl> + # THEORY OF LIABILITY , WHETHER IN CONTRACT , STRICT LIABILITY , OR TORT <nl> + # ( INCLUDING NEGLIGENCE OR OTHERWISE ) ARISING IN ANY WAY OUT OF THE USE <nl> + # OF THIS SOFTWARE , EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE . <nl> + <nl> + licenses ( [ " notice " ] ) # 3 - clause BSD <nl> + <nl> + package ( default_visibility = [ " / / visibility : public " ] ) <nl> + <nl> + load ( " / / bazel : grpc_build_system . bzl " , " grpc_proto_library " ) <nl> + <nl> + grpc_proto_library ( <nl> + name = " load_balancer_proto " , <nl> + srcs = [ " load_balancer . proto " ] , <nl> + ) <nl> mmm a / test / core / end2end / fake_resolver . c <nl> ppp b / test / core / end2end / fake_resolver . c <nl> <nl> <nl> # include " test / core / end2end / fake_resolver . h " <nl> <nl> - # define GRPC_ARG_FAKE_RESOLVER_RESPONSE_GENERATOR \ <nl> - " grpc . fake_resolver . response_generator " <nl> - <nl> / / <nl> / / fake_resolver <nl> / / <nl> mmm a / test / core / end2end / fake_resolver . h <nl> ppp b / test / core / end2end / fake_resolver . h <nl> <nl> <nl> # include " test / core / util / test_config . h " <nl> <nl> + # define GRPC_ARG_FAKE_RESOLVER_RESPONSE_GENERATOR \ <nl> + " grpc . fake_resolver . response_generator " <nl> + <nl> void grpc_fake_resolver_init ( ) ; <nl> <nl> / / Instances of \ a grpc_fake_resolver_response_generator are passed to the <nl> mmm a / test / cpp / end2end / BUILD <nl> ppp b / test / cpp / end2end / BUILD <nl> cc_test ( <nl> " / / : grpc " , <nl> " / / : grpc + + " , <nl> " / / external : gtest " , <nl> + " / / src / proto / grpc / health / v1 : health_proto " , <nl> " / / src / proto / grpc / testing : echo_messages_proto " , <nl> " / / src / proto / grpc / testing : echo_proto " , <nl> " / / src / proto / grpc / testing / duplicate : echo_duplicate_proto " , <nl> - " / / src / proto / grpc / health / v1 : health_proto " , <nl> " / / test / core / util : gpr_test_util " , <nl> " / / test / core / util : grpc_test_util " , <nl> " / / test / cpp / util : test_util " , <nl> cc_test ( <nl> ] , <nl> ) <nl> <nl> + cc_test ( <nl> + name = " grpclb_end2end_test " , <nl> + srcs = [ " grpclb_end2end_test . cc " ] , <nl> + deps = [ <nl> + " : test_service_impl " , <nl> + " / / : gpr " , <nl> + " / / : grpc " , <nl> + " / / : grpc + + " , <nl> + " / / external : gtest " , <nl> + " / / src / proto / grpc / lb / v1 : load_balancer_proto " , <nl> + " / / src / proto / grpc / testing : echo_messages_proto " , <nl> + " / / src / proto / grpc / testing : echo_proto " , <nl> + " / / src / proto / grpc / testing / duplicate : echo_duplicate_proto " , <nl> + " / / test / core / end2end : fake_resolver " , <nl> + " / / test / core / util : gpr_test_util " , <nl> + " / / test / core / util : grpc_test_util " , <nl> + " / / test / cpp / util : test_util " , <nl> + ] , <nl> + ) <nl> + <nl> cc_test ( <nl> name = " proto_server_reflection_test " , <nl> srcs = [ " proto_server_reflection_test . cc " ] , <nl> new file mode 100644 <nl> index 00000000000 . . 8ebeba35225 <nl> mmm / dev / null <nl> ppp b / test / cpp / end2end / grpclb_end2end_test . cc <nl> <nl> + / * <nl> + * <nl> + * Copyright 2017 , Google Inc . <nl> + * All rights reserved . <nl> + * <nl> + * Redistribution and use in source and binary forms , with or without <nl> + * modification , are permitted provided that the following conditions are <nl> + * met : <nl> + * <nl> + * * Redistributions of source code must retain the above copyright <nl> + * notice , this list of conditions and the following disclaimer . <nl> + * * Redistributions in binary form must reproduce the above <nl> + * copyright notice , this list of conditions and the following disclaimer <nl> + * in the documentation and / or other materials provided with the <nl> + * distribution . <nl> + * * Neither the name of Google Inc . nor the names of its <nl> + * contributors may be used to endorse or promote products derived from <nl> + * this software without specific prior written permission . <nl> + * <nl> + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS <nl> + * " AS IS " AND ANY EXPRESS OR IMPLIED WARRANTIES , INCLUDING , BUT NOT <nl> + * LIMITED TO , THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR <nl> + * A PARTICULAR PURPOSE ARE DISCLAIMED . IN NO EVENT SHALL THE COPYRIGHT <nl> + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT , INDIRECT , INCIDENTAL , <nl> + * SPECIAL , EXEMPLARY , OR CONSEQUENTIAL DAMAGES ( INCLUDING , BUT NOT <nl> + * LIMITED TO , PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES ; LOSS OF USE , <nl> + * DATA , OR PROFITS ; OR BUSINESS INTERRUPTION ) HOWEVER CAUSED AND ON ANY <nl> + * THEORY OF LIABILITY , WHETHER IN CONTRACT , STRICT LIABILITY , OR TORT <nl> + * ( INCLUDING NEGLIGENCE OR OTHERWISE ) ARISING IN ANY WAY OUT OF THE USE <nl> + * OF THIS SOFTWARE , EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE . <nl> + * <nl> + * / <nl> + <nl> + # include < memory > <nl> + # include < mutex > <nl> + # include < sstream > <nl> + # include < thread > <nl> + <nl> + # include < grpc + + / channel . h > <nl> + # include < grpc + + / client_context . h > <nl> + # include < grpc + + / create_channel . h > <nl> + # include < grpc + + / server . h > <nl> + # include < grpc + + / server_builder . h > <nl> + # include < grpc / grpc . h > <nl> + # include < grpc / support / alloc . h > <nl> + # include < grpc / support / log . h > <nl> + # include < grpc / support / string_util . h > <nl> + # include < grpc / support / thd . h > <nl> + # include < grpc / support / time . h > <nl> + # include < gtest / gtest . h > <nl> + <nl> + extern " C " { <nl> + # include " src / core / lib / iomgr / sockaddr . h " <nl> + # include " test / core / end2end / fake_resolver . h " <nl> + } <nl> + <nl> + # include " test / core / util / port . h " <nl> + # include " test / core / util / test_config . h " <nl> + # include " test / cpp / end2end / test_service_impl . h " <nl> + <nl> + # include " src / proto / grpc / lb / v1 / load_balancer . grpc . pb . h " <nl> + # include " src / proto / grpc / testing / echo . grpc . pb . h " <nl> + <nl> + / / TODO ( dgq ) : Other scenarios in need of testing : <nl> + / / - Send a serverlist with faulty ip : port addresses ( port > 2 ^ 16 , etc ) . <nl> + / / - Test reception of invalid serverlist <nl> + / / - Test pinging <nl> + / / - Test against a non - LB server . <nl> + / / - Random LB server closing the stream unexpectedly . <nl> + / / - Test using DNS - resolvable names ( localhost ? ) <nl> + / / - Test handling of creation of faulty RR instance by having the LB return a <nl> + / / serverlist with non - existent backends after having initially returned a <nl> + / / valid one . <nl> + / / <nl> + / / Findings from end to end testing to be covered here : <nl> + / / - Handling of LB servers restart , including reconnection after backing - off <nl> + / / retries . <nl> + / / - Destruction of load balanced channel ( and therefore of grpclb instance ) <nl> + / / while : <nl> + / / 1 ) the internal LB call is still active . This should work by virtue <nl> + / / of the weak reference the LB call holds . The call should be terminated as <nl> + / / part of the grpclb shutdown process . <nl> + / / 2 ) the retry timer is active . Again , the weak reference it holds should <nl> + / / prevent a premature call to \ a glb_destroy . <nl> + / / - Restart of backend servers with no changes to serverlist . This exercises <nl> + / / the RR handover mechanism . <nl> + <nl> + using std : : chrono : : system_clock ; <nl> + <nl> + using grpc : : lb : : v1 : : LoadBalanceResponse ; <nl> + using grpc : : lb : : v1 : : LoadBalanceRequest ; <nl> + using grpc : : lb : : v1 : : LoadBalancer ; <nl> + <nl> + namespace grpc { <nl> + namespace testing { <nl> + namespace { <nl> + <nl> + template < typename ServiceType > <nl> + class CountedService : public ServiceType { <nl> + public : <nl> + int request_count ( ) { <nl> + std : : unique_lock < std : : mutex > lock ( mu_ ) ; <nl> + return request_count_ ; <nl> + } <nl> + <nl> + int response_count ( ) { <nl> + std : : unique_lock < std : : mutex > lock ( mu_ ) ; <nl> + return response_count_ ; <nl> + } <nl> + <nl> + void IncreaseResponseCount ( ) { <nl> + std : : unique_lock < std : : mutex > lock ( mu_ ) ; <nl> + + + response_count_ ; <nl> + } <nl> + void IncreaseRequestCount ( ) { <nl> + std : : unique_lock < std : : mutex > lock ( mu_ ) ; <nl> + + + request_count_ ; <nl> + } <nl> + <nl> + protected : <nl> + std : : mutex mu_ ; <nl> + <nl> + private : <nl> + int request_count_ = 0 ; <nl> + int response_count_ = 0 ; <nl> + } ; <nl> + <nl> + using BackendService = CountedService < TestServiceImpl > ; <nl> + using BalancerService = CountedService < LoadBalancer : : Service > ; <nl> + <nl> + class BackendServiceImpl : public BackendService { <nl> + public : <nl> + BackendServiceImpl ( ) { } <nl> + <nl> + Status Echo ( ServerContext * context , const EchoRequest * request , <nl> + EchoResponse * response ) override { <nl> + IncreaseRequestCount ( ) ; <nl> + const auto status = TestServiceImpl : : Echo ( context , request , response ) ; <nl> + IncreaseResponseCount ( ) ; <nl> + return status ; <nl> + } <nl> + } ; <nl> + <nl> + grpc : : string Ip4ToPackedString ( const char * ip_str ) { <nl> + struct in_addr ip4 ; <nl> + GPR_ASSERT ( inet_pton ( AF_INET , ip_str , & ip4 ) = = 1 ) ; <nl> + return grpc : : string ( reinterpret_cast < const char * > ( & ip4 ) , sizeof ( ip4 ) ) ; <nl> + } <nl> + <nl> + class BalancerServiceImpl : public BalancerService { <nl> + public : <nl> + using Stream = ServerReaderWriter < LoadBalanceResponse , LoadBalanceRequest > ; <nl> + using ResponseDelayPair = std : : pair < LoadBalanceResponse , int > ; <nl> + <nl> + BalancerServiceImpl ( ) : shutdown_ ( false ) { } <nl> + <nl> + Status BalanceLoad ( ServerContext * context , Stream * stream ) override { <nl> + LoadBalanceRequest request ; <nl> + stream - > Read ( & request ) ; <nl> + IncreaseRequestCount ( ) ; <nl> + gpr_log ( GPR_INFO , " LB : recv msg ' % s ' " , request . DebugString ( ) . c_str ( ) ) ; <nl> + <nl> + std : : vector < ResponseDelayPair > responses_and_delays ; <nl> + { <nl> + std : : unique_lock < std : : mutex > lock ( mu_ ) ; <nl> + responses_and_delays = responses_and_delays_ ; <nl> + } <nl> + <nl> + for ( const auto & response_and_delay : responses_and_delays ) { <nl> + if ( shutdown_ ) break ; <nl> + SendResponse ( stream , response_and_delay . first , response_and_delay . second ) ; <nl> + } <nl> + return Status : : OK ; <nl> + } <nl> + <nl> + void add_response ( const LoadBalanceResponse & response , int send_after_ms ) { <nl> + std : : unique_lock < std : : mutex > lock ( mu_ ) ; <nl> + responses_and_delays_ . push_back ( std : : make_pair ( response , send_after_ms ) ) ; <nl> + } <nl> + <nl> + void Shutdown ( ) { <nl> + std : : unique_lock < std : : mutex > lock ( mu_ ) ; <nl> + shutdown_ = true ; <nl> + } <nl> + <nl> + static LoadBalanceResponse BuildResponseForBackends ( <nl> + const std : : vector < int > & backend_ports ) { <nl> + LoadBalanceResponse response ; <nl> + for ( const int backend_port : backend_ports ) { <nl> + auto * server = response . mutable_server_list ( ) - > add_servers ( ) ; <nl> + server - > set_ip_address ( Ip4ToPackedString ( " 127 . 0 . 0 . 1 " ) ) ; <nl> + server - > set_port ( backend_port ) ; <nl> + } <nl> + return response ; <nl> + } <nl> + <nl> + private : <nl> + void SendResponse ( Stream * stream , const LoadBalanceResponse & response , <nl> + int delay_ms ) { <nl> + gpr_log ( GPR_INFO , " LB : sleeping for % d ms . . . " , delay_ms ) ; <nl> + gpr_sleep_until ( gpr_time_add ( gpr_now ( GPR_CLOCK_REALTIME ) , <nl> + gpr_time_from_millis ( delay_ms , GPR_TIMESPAN ) ) ) ; <nl> + gpr_log ( GPR_INFO , " LB : Woke up ! Sending response ' % s ' " , <nl> + response . DebugString ( ) . c_str ( ) ) ; <nl> + stream - > Write ( response ) ; <nl> + IncreaseResponseCount ( ) ; <nl> + } <nl> + <nl> + std : : vector < ResponseDelayPair > responses_and_delays_ ; <nl> + bool shutdown_ ; <nl> + } ; <nl> + <nl> + class GrpclbEnd2endTest : public : : testing : : Test { <nl> + protected : <nl> + GrpclbEnd2endTest ( int num_backends , int num_balancers ) <nl> + : server_host_ ( " localhost " ) , <nl> + num_backends_ ( num_backends ) , <nl> + num_balancers_ ( num_balancers ) { } <nl> + <nl> + void SetUp ( ) override { <nl> + response_generator_ = grpc_fake_resolver_response_generator_create ( ) ; <nl> + / / Start the backends . <nl> + for ( size_t i = 0 ; i < num_backends_ ; + + i ) { <nl> + backends_ . emplace_back ( new BackendServiceImpl ( ) ) ; <nl> + backend_servers_ . emplace_back ( ServerThread < BackendService > ( <nl> + " backend " , server_host_ , backends_ . back ( ) . get ( ) ) ) ; <nl> + } <nl> + / / Start the load balancers . <nl> + for ( size_t i = 0 ; i < num_balancers_ ; + + i ) { <nl> + balancers_ . emplace_back ( new BalancerServiceImpl ( ) ) ; <nl> + balancer_servers_ . emplace_back ( ServerThread < BalancerService > ( <nl> + " balancer " , server_host_ , balancers_ . back ( ) . get ( ) ) ) ; <nl> + } <nl> + ResetStub ( ) ; <nl> + std : : vector < AddressData > addresses ; <nl> + for ( size_t i = 0 ; i < balancer_servers_ . size ( ) ; + + i ) { <nl> + addresses . emplace_back ( AddressData { balancer_servers_ [ i ] . port_ , true , " " } ) ; <nl> + } <nl> + SetNextResolution ( addresses ) ; <nl> + } <nl> + <nl> + void TearDown ( ) override { <nl> + for ( size_t i = 0 ; i < backends_ . size ( ) ; + + i ) { <nl> + backend_servers_ [ i ] . Shutdown ( ) ; <nl> + } <nl> + for ( size_t i = 0 ; i < balancers_ . size ( ) ; + + i ) { <nl> + balancers_ [ i ] - > Shutdown ( ) ; <nl> + balancer_servers_ [ i ] . Shutdown ( ) ; <nl> + } <nl> + grpc_fake_resolver_response_generator_unref ( response_generator_ ) ; <nl> + } <nl> + <nl> + void ResetStub ( ) { <nl> + ChannelArguments args ; <nl> + args . SetPointer ( GRPC_ARG_FAKE_RESOLVER_RESPONSE_GENERATOR , <nl> + response_generator_ ) ; <nl> + std : : ostringstream uri ; <nl> + uri < < " test : / / / servername_not_used " ; <nl> + channel_ = <nl> + CreateCustomChannel ( uri . str ( ) , InsecureChannelCredentials ( ) , args ) ; <nl> + stub_ = grpc : : testing : : EchoTestService : : NewStub ( channel_ ) ; <nl> + } <nl> + <nl> + struct AddressData { <nl> + int port ; <nl> + bool is_balancer ; <nl> + grpc : : string balancer_name ; <nl> + } ; <nl> + <nl> + void SetNextResolution ( const std : : vector < AddressData > & address_data ) { <nl> + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT ; <nl> + grpc_lb_addresses * addresses = <nl> + grpc_lb_addresses_create ( address_data . size ( ) , nullptr ) ; <nl> + for ( size_t i = 0 ; i < address_data . size ( ) ; + + i ) { <nl> + char * lb_uri_str ; <nl> + gpr_asprintf ( & lb_uri_str , " ipv4 : 127 . 0 . 0 . 1 : % d " , address_data [ i ] . port ) ; <nl> + grpc_uri * lb_uri = grpc_uri_parse ( & exec_ctx , lb_uri_str , true ) ; <nl> + GPR_ASSERT ( lb_uri ! = nullptr ) ; <nl> + grpc_lb_addresses_set_address_from_uri ( <nl> + addresses , i , lb_uri , address_data [ i ] . is_balancer , <nl> + address_data [ i ] . balancer_name . c_str ( ) , nullptr ) ; <nl> + grpc_uri_destroy ( lb_uri ) ; <nl> + gpr_free ( lb_uri_str ) ; <nl> + } <nl> + grpc_arg fake_addresses = grpc_lb_addresses_create_channel_arg ( addresses ) ; <nl> + grpc_channel_args fake_result = { 1 , & fake_addresses } ; <nl> + grpc_fake_resolver_response_generator_set_response ( <nl> + & exec_ctx , response_generator_ , & fake_result ) ; <nl> + grpc_lb_addresses_destroy ( & exec_ctx , addresses ) ; <nl> + grpc_exec_ctx_finish ( & exec_ctx ) ; <nl> + } <nl> + <nl> + const std : : vector < int > GetBackendPorts ( ) const { <nl> + std : : vector < int > backend_ports ; <nl> + for ( const auto & bs : backend_servers_ ) { <nl> + backend_ports . push_back ( bs . port_ ) ; <nl> + } <nl> + return backend_ports ; <nl> + } <nl> + <nl> + void ScheduleResponseForBalancer ( size_t i , <nl> + const LoadBalanceResponse & response , <nl> + int delay_ms ) { <nl> + balancers_ . at ( i ) - > add_response ( response , delay_ms ) ; <nl> + } <nl> + <nl> + std : : vector < std : : pair < Status , EchoResponse > > SendRpc ( const string & message , <nl> + int num_rpcs , <nl> + int timeout_ms = 1000 ) { <nl> + std : : vector < std : : pair < Status , EchoResponse > > results ; <nl> + EchoRequest request ; <nl> + EchoResponse response ; <nl> + request . set_message ( message ) ; <nl> + for ( int i = 0 ; i < num_rpcs ; i + + ) { <nl> + ClientContext context ; <nl> + context . set_deadline ( grpc_timeout_milliseconds_to_deadline ( timeout_ms ) ) ; <nl> + Status status = stub_ - > Echo ( & context , request , & response ) ; <nl> + results . push_back ( std : : make_pair ( status , response ) ) ; <nl> + } <nl> + return results ; <nl> + } <nl> + <nl> + template < typename T > <nl> + struct ServerThread { <nl> + explicit ServerThread ( const grpc : : string & type , <nl> + const grpc : : string & server_host , T * service ) <nl> + : type_ ( type ) , service_ ( service ) { <nl> + port_ = grpc_pick_unused_port_or_die ( ) ; <nl> + gpr_log ( GPR_INFO , " starting % s server on port % d " , type_ . c_str ( ) , port_ ) ; <nl> + std : : mutex mu ; <nl> + std : : condition_variable cond ; <nl> + thread_ . reset ( new std : : thread ( <nl> + std : : bind ( & ServerThread : : Start , this , server_host , & mu , & cond ) ) ) ; <nl> + std : : unique_lock < std : : mutex > lock ( mu ) ; <nl> + cond . wait ( lock ) ; <nl> + gpr_log ( GPR_INFO , " % s server startup complete " , type_ . c_str ( ) ) ; <nl> + } <nl> + <nl> + void Start ( const grpc : : string & server_host , std : : mutex * mu , <nl> + std : : condition_variable * cond ) { <nl> + std : : ostringstream server_address ; <nl> + server_address < < server_host < < " : " < < port_ ; <nl> + ServerBuilder builder ; <nl> + builder . AddListeningPort ( server_address . str ( ) , <nl> + InsecureServerCredentials ( ) ) ; <nl> + builder . RegisterService ( service_ ) ; <nl> + server_ = builder . BuildAndStart ( ) ; <nl> + std : : lock_guard < std : : mutex > lock ( * mu ) ; <nl> + cond - > notify_one ( ) ; <nl> + } <nl> + <nl> + void Shutdown ( ) { <nl> + gpr_log ( GPR_INFO , " % s about to shutdown " , type_ . c_str ( ) ) ; <nl> + server_ - > Shutdown ( ) ; <nl> + thread_ - > join ( ) ; <nl> + gpr_log ( GPR_INFO , " % s shutdown completed " , type_ . c_str ( ) ) ; <nl> + } <nl> + <nl> + int port_ ; <nl> + grpc : : string type_ ; <nl> + std : : unique_ptr < Server > server_ ; <nl> + T * service_ ; <nl> + std : : unique_ptr < std : : thread > thread_ ; <nl> + } ; <nl> + <nl> + const grpc : : string kMessage_ = " Live long and prosper . " ; <nl> + const grpc : : string server_host_ ; <nl> + const size_t num_backends_ ; <nl> + const size_t num_balancers_ ; <nl> + std : : shared_ptr < Channel > channel_ ; <nl> + std : : unique_ptr < grpc : : testing : : EchoTestService : : Stub > stub_ ; <nl> + <nl> + std : : vector < std : : unique_ptr < BackendServiceImpl > > backends_ ; <nl> + std : : vector < std : : unique_ptr < BalancerServiceImpl > > balancers_ ; <nl> + <nl> + std : : vector < ServerThread < BackendService > > backend_servers_ ; <nl> + std : : vector < ServerThread < BalancerService > > balancer_servers_ ; <nl> + <nl> + grpc_fake_resolver_response_generator * response_generator_ ; <nl> + } ; <nl> + <nl> + class SingleBalancerTest : public GrpclbEnd2endTest { <nl> + public : <nl> + SingleBalancerTest ( ) : GrpclbEnd2endTest ( 4 , 1 ) { } <nl> + } ; <nl> + <nl> + TEST_F ( SingleBalancerTest , Vanilla ) { <nl> + ScheduleResponseForBalancer ( <nl> + 0 , BalancerServiceImpl : : BuildResponseForBackends ( GetBackendPorts ( ) ) , 0 ) ; <nl> + / / Start servers and send 100 RPCs per server . <nl> + const auto & statuses_and_responses = SendRpc ( kMessage_ , 100 * num_backends_ ) ; <nl> + <nl> + for ( const auto & status_and_response : statuses_and_responses ) { <nl> + EXPECT_TRUE ( status_and_response . first . ok ( ) ) ; <nl> + EXPECT_EQ ( status_and_response . second . message ( ) , kMessage_ ) ; <nl> + } <nl> + <nl> + / / Each backend should have gotten 100 requests . <nl> + for ( size_t i = 0 ; i < backends_ . size ( ) ; + + i ) { <nl> + EXPECT_EQ ( 100 , backend_servers_ [ i ] . service_ - > request_count ( ) ) ; <nl> + } <nl> + / / The balancer got a single request . <nl> + EXPECT_EQ ( 1 , balancer_servers_ [ 0 ] . service_ - > request_count ( ) ) ; <nl> + / / and sent a single response . <nl> + EXPECT_EQ ( 1 , balancer_servers_ [ 0 ] . service_ - > response_count ( ) ) ; <nl> + <nl> + / / Check LB policy name for the channel . <nl> + EXPECT_EQ ( " grpclb " , channel_ - > GetLoadBalancingPolicyName ( ) ) ; <nl> + } <nl> + <nl> + TEST_F ( SingleBalancerTest , InitiallyEmptyServerlist ) { <nl> + const int kServerlistDelayMs = 500 * grpc_test_slowdown_factor ( ) ; <nl> + const int kCallDeadlineMs = 1000 * grpc_test_slowdown_factor ( ) ; <nl> + <nl> + / / First response is an empty serverlist , sent right away . <nl> + ScheduleResponseForBalancer ( 0 , LoadBalanceResponse ( ) , 0 ) ; <nl> + / / Send non - empty serverlist only after kServerlistDelayMs <nl> + ScheduleResponseForBalancer ( <nl> + 0 , BalancerServiceImpl : : BuildResponseForBackends ( GetBackendPorts ( ) ) , <nl> + kServerlistDelayMs ) ; <nl> + <nl> + const auto t0 = system_clock : : now ( ) ; <nl> + / / Client will block : LB will initially send empty serverlist . <nl> + const auto & statuses_and_responses = <nl> + SendRpc ( kMessage_ , num_backends_ , kCallDeadlineMs ) ; <nl> + const auto ellapsed_ms = <nl> + std : : chrono : : duration_cast < std : : chrono : : milliseconds > ( <nl> + system_clock : : now ( ) - t0 ) ; <nl> + / / but eventually , the LB sends a serverlist update that allows the call to <nl> + / / proceed . The call delay must be larger than the delay in sending the <nl> + / / populated serverlist but under the call ' s deadline . <nl> + EXPECT_GT ( ellapsed_ms . count ( ) , kServerlistDelayMs ) ; <nl> + EXPECT_LT ( ellapsed_ms . count ( ) , kCallDeadlineMs ) ; <nl> + <nl> + / / Each backend should have gotten 1 request . <nl> + for ( size_t i = 0 ; i < backends_ . size ( ) ; + + i ) { <nl> + EXPECT_EQ ( 1 , backend_servers_ [ i ] . service_ - > request_count ( ) ) ; <nl> + } <nl> + for ( const auto & status_and_response : statuses_and_responses ) { <nl> + EXPECT_TRUE ( status_and_response . first . ok ( ) ) ; <nl> + EXPECT_EQ ( status_and_response . second . message ( ) , kMessage_ ) ; <nl> + } <nl> + <nl> + / / The balancer got a single request . <nl> + EXPECT_EQ ( 1 , balancer_servers_ [ 0 ] . service_ - > request_count ( ) ) ; <nl> + / / and sent two responses . <nl> + EXPECT_EQ ( 2 , balancer_servers_ [ 0 ] . service_ - > response_count ( ) ) ; <nl> + <nl> + / / Check LB policy name for the channel . <nl> + EXPECT_EQ ( " grpclb " , channel_ - > GetLoadBalancingPolicyName ( ) ) ; <nl> + } <nl> + <nl> + TEST_F ( SingleBalancerTest , RepeatedServerlist ) { <nl> + constexpr int kServerlistDelayMs = 100 ; <nl> + <nl> + / / Send a serverlist right away . <nl> + ScheduleResponseForBalancer ( <nl> + 0 , BalancerServiceImpl : : BuildResponseForBackends ( GetBackendPorts ( ) ) , 0 ) ; <nl> + / / . . . and the same one a bit later . <nl> + ScheduleResponseForBalancer ( <nl> + 0 , BalancerServiceImpl : : BuildResponseForBackends ( GetBackendPorts ( ) ) , <nl> + kServerlistDelayMs ) ; <nl> + <nl> + / / Send num_backends / 2 requests . <nl> + auto statuses_and_responses = SendRpc ( kMessage_ , num_backends_ / 2 ) ; <nl> + / / only the first half of the backends will receive them . <nl> + for ( size_t i = 0 ; i < backends_ . size ( ) ; + + i ) { <nl> + if ( i < backends_ . size ( ) / 2 ) <nl> + EXPECT_EQ ( 1 , backend_servers_ [ i ] . service_ - > request_count ( ) ) ; <nl> + else <nl> + EXPECT_EQ ( 0 , backend_servers_ [ i ] . service_ - > request_count ( ) ) ; <nl> + } <nl> + EXPECT_EQ ( statuses_and_responses . size ( ) , num_backends_ / 2 ) ; <nl> + for ( const auto & status_and_response : statuses_and_responses ) { <nl> + EXPECT_TRUE ( status_and_response . first . ok ( ) ) ; <nl> + EXPECT_EQ ( status_and_response . second . message ( ) , kMessage_ ) ; <nl> + } <nl> + <nl> + / / Wait for the ( duplicated ) serverlist update . <nl> + gpr_sleep_until ( gpr_time_add ( <nl> + gpr_now ( GPR_CLOCK_REALTIME ) , <nl> + gpr_time_from_millis ( kServerlistDelayMs * 1 . 1 , GPR_TIMESPAN ) ) ) ; <nl> + <nl> + / / Verify the LB has sent two responses . <nl> + EXPECT_EQ ( 2 , balancer_servers_ [ 0 ] . service_ - > response_count ( ) ) ; <nl> + <nl> + / / Some more calls to complete the total number of backends . <nl> + statuses_and_responses = SendRpc ( <nl> + kMessage_ , <nl> + num_backends_ / 2 + ( num_backends_ & 0x1 ) / * extra one if num_bes odd * / ) ; <nl> + / / Because a duplicated serverlist should have no effect , all backends must <nl> + / / have been hit once now . <nl> + for ( size_t i = 0 ; i < backends_ . size ( ) ; + + i ) { <nl> + EXPECT_EQ ( 1 , backend_servers_ [ i ] . service_ - > request_count ( ) ) ; <nl> + } <nl> + EXPECT_EQ ( statuses_and_responses . size ( ) , num_backends_ / 2 ) ; <nl> + for ( const auto & status_and_response : statuses_and_responses ) { <nl> + EXPECT_TRUE ( status_and_response . first . ok ( ) ) ; <nl> + EXPECT_EQ ( status_and_response . second . message ( ) , kMessage_ ) ; <nl> + } <nl> + <nl> + / / The balancer got a single request . <nl> + EXPECT_EQ ( 1 , balancer_servers_ [ 0 ] . service_ - > request_count ( ) ) ; <nl> + / / Check LB policy name for the channel . <nl> + EXPECT_EQ ( " grpclb " , channel_ - > GetLoadBalancingPolicyName ( ) ) ; <nl> + } <nl> + <nl> + } / / namespace <nl> + } / / namespace testing <nl> + } / / namespace grpc <nl> + <nl> + int main ( int argc , char * * argv ) { <nl> + grpc_init ( ) ; <nl> + grpc_test_init ( argc , argv ) ; <nl> + grpc_fake_resolver_init ( ) ; <nl> + : : testing : : InitGoogleTest ( & argc , argv ) ; <nl> + const auto result = RUN_ALL_TESTS ( ) ; <nl> + grpc_shutdown ( ) ; <nl> + return result ; <nl> + } <nl> mmm a / tools / run_tests / generated / sources_and_headers . json <nl> ppp b / tools / run_tests / generated / sources_and_headers . json <nl> <nl> " third_party " : false , <nl> " type " : " target " <nl> } , <nl> + { <nl> + " deps " : [ <nl> + " gpr " , <nl> + " gpr_test_util " , <nl> + " grpc " , <nl> + " grpc + + " , <nl> + " grpc + + _test_util " , <nl> + " grpc_test_util " <nl> + ] , <nl> + " headers " : [ <nl> + " src / proto / grpc / lb / v1 / load_balancer . grpc . pb . h " , <nl> + " src / proto / grpc / lb / v1 / load_balancer . pb . h " , <nl> + " src / proto / grpc / lb / v1 / load_balancer_mock . grpc . pb . h " <nl> + ] , <nl> + " is_filegroup " : false , <nl> + " language " : " c + + " , <nl> + " name " : " grpclb_end2end_test " , <nl> + " src " : [ <nl> + " test / cpp / end2end / grpclb_end2end_test . cc " <nl> + ] , <nl> + " third_party " : false , <nl> + " type " : " target " <nl> + } , <nl> { <nl> " deps " : [ <nl> " gpr " , <nl> mmm a / tools / run_tests / generated / tests . json <nl> ppp b / tools / run_tests / generated / tests . json <nl> <nl> " windows " <nl> ] <nl> } , <nl> + { <nl> + " args " : [ ] , <nl> + " ci_platforms " : [ <nl> + " linux " , <nl> + " mac " , <nl> + " posix " , <nl> + " windows " <nl> + ] , <nl> + " cpu_cost " : 1 . 0 , <nl> + " exclude_configs " : [ ] , <nl> + " exclude_iomgrs " : [ ] , <nl> + " flaky " : false , <nl> + " gtest " : true , <nl> + " language " : " c + + " , <nl> + " name " : " grpclb_end2end_test " , <nl> + " platforms " : [ <nl> + " linux " , <nl> + " mac " , <nl> + " posix " , <nl> + " windows " <nl> + ] <nl> + } , <nl> { <nl> " args " : [ ] , <nl> " ci_platforms " : [ <nl> new file mode 100644 <nl> index 00000000000 . . 0a10fc60e98 <nl> mmm / dev / null <nl> ppp b / vsprojects / vcxproj / test / grpclb_end2end_test / grpclb_end2end_test . vcxproj <nl> <nl> + < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> + < Project DefaultTargets = " Build " ToolsVersion = " 12 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> + < Import Project = " $ ( SolutionDir ) \ . . \ vsprojects \ packages \ grpc . dependencies . openssl . 1 . 0 . 204 . 1 \ build \ native \ grpc . dependencies . openssl . props " Condition = " Exists ( ' $ ( SolutionDir ) \ . . \ vsprojects \ packages \ grpc . dependencies . openssl . 1 . 0 . 204 . 1 \ build \ native \ 1 . 0 . 204 . 1 . props ' ) " / > <nl> + < ItemGroup Label = " ProjectConfigurations " > <nl> + < ProjectConfiguration Include = " Debug | Win32 " > <nl> + < Configuration > Debug < / Configuration > <nl> + < Platform > Win32 < / Platform > <nl> + < / ProjectConfiguration > <nl> + < ProjectConfiguration Include = " Debug | x64 " > <nl> + < Configuration > Debug < / Configuration > <nl> + < Platform > x64 < / Platform > <nl> + < / ProjectConfiguration > <nl> + < ProjectConfiguration Include = " Release | Win32 " > <nl> + < Configuration > Release < / Configuration > <nl> + < Platform > Win32 < / Platform > <nl> + < / ProjectConfiguration > <nl> + < ProjectConfiguration Include = " Release | x64 " > <nl> + < Configuration > Release < / Configuration > <nl> + < Platform > x64 < / Platform > <nl> + < / ProjectConfiguration > <nl> + < / ItemGroup > <nl> + < PropertyGroup Label = " Globals " > <nl> + < ProjectGuid > { 15BCAA4C - F569 - D5B8 - 50CF - F442CBC71902 } < / ProjectGuid > <nl> + < IgnoreWarnIntDirInTempDetected > true < / IgnoreWarnIntDirInTempDetected > <nl> + < IntDir > $ ( SolutionDir ) IntDir \ $ ( MSBuildProjectName ) \ < / IntDir > <nl> + < / PropertyGroup > <nl> + < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . Default . props " / > <nl> + < PropertyGroup Condition = " ' $ ( VisualStudioVersion ) ' = = ' 10 . 0 ' " Label = " Configuration " > <nl> + < PlatformToolset > v100 < / PlatformToolset > <nl> + < / PropertyGroup > <nl> + < PropertyGroup Condition = " ' $ ( VisualStudioVersion ) ' = = ' 11 . 0 ' " Label = " Configuration " > <nl> + < PlatformToolset > v110 < / PlatformToolset > <nl> + < / PropertyGroup > <nl> + < PropertyGroup Condition = " ' $ ( VisualStudioVersion ) ' = = ' 12 . 0 ' " Label = " Configuration " > <nl> + < PlatformToolset > v120 < / PlatformToolset > <nl> + < / PropertyGroup > <nl> + < PropertyGroup Condition = " ' $ ( VisualStudioVersion ) ' = = ' 14 . 0 ' " Label = " Configuration " > <nl> + < PlatformToolset > v140 < / PlatformToolset > <nl> + < / PropertyGroup > <nl> + < PropertyGroup Condition = " ' $ ( Configuration ) ' = = ' Debug ' " Label = " Configuration " > <nl> + < ConfigurationType > Application < / ConfigurationType > <nl> + < UseDebugLibraries > true < / UseDebugLibraries > <nl> + < CharacterSet > Unicode < / CharacterSet > <nl> + < / PropertyGroup > <nl> + < PropertyGroup Condition = " ' $ ( Configuration ) ' = = ' Release ' " Label = " Configuration " > <nl> + < ConfigurationType > Application < / ConfigurationType > <nl> + < UseDebugLibraries > false < / UseDebugLibraries > <nl> + < WholeProgramOptimization > true < / WholeProgramOptimization > <nl> + < CharacterSet > Unicode < / CharacterSet > <nl> + < / PropertyGroup > <nl> + < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . props " / > <nl> + < ImportGroup Label = " ExtensionSettings " > <nl> + < / ImportGroup > <nl> + < ImportGroup Label = " PropertySheets " > <nl> + < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> + < Import Project = " $ ( SolutionDir ) \ . . \ vsprojects \ cpptest . props " / > <nl> + < Import Project = " $ ( SolutionDir ) \ . . \ vsprojects \ global . props " / > <nl> + < Import Project = " $ ( SolutionDir ) \ . . \ vsprojects \ openssl . props " / > <nl> + < Import Project = " $ ( SolutionDir ) \ . . \ vsprojects \ protobuf . props " / > <nl> + < Import Project = " $ ( SolutionDir ) \ . . \ vsprojects \ winsock . props " / > <nl> + < Import Project = " $ ( SolutionDir ) \ . . \ vsprojects \ zlib . props " / > <nl> + < / ImportGroup > <nl> + < PropertyGroup Label = " UserMacros " / > <nl> + < PropertyGroup Condition = " ' $ ( Configuration ) ' = = ' Debug ' " > <nl> + < TargetName > grpclb_end2end_test < / TargetName > <nl> + < Linkage - grpc_dependencies_zlib > static < / Linkage - grpc_dependencies_zlib > <nl> + < Configuration - grpc_dependencies_zlib > Debug < / Configuration - grpc_dependencies_zlib > <nl> + < Linkage - grpc_dependencies_openssl > static < / Linkage - grpc_dependencies_openssl > <nl> + < Configuration - grpc_dependencies_openssl > Debug < / Configuration - grpc_dependencies_openssl > <nl> + < / PropertyGroup > <nl> + < PropertyGroup Condition = " ' $ ( Configuration ) ' = = ' Release ' " > <nl> + < TargetName > grpclb_end2end_test < / TargetName > <nl> + < Linkage - grpc_dependencies_zlib > static < / Linkage - grpc_dependencies_zlib > <nl> + < Configuration - grpc_dependencies_zlib > Release < / Configuration - grpc_dependencies_zlib > <nl> + < Linkage - grpc_dependencies_openssl > static < / Linkage - grpc_dependencies_openssl > <nl> + < Configuration - grpc_dependencies_openssl > Release < / Configuration - grpc_dependencies_openssl > <nl> + < / PropertyGroup > <nl> + < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> + < ClCompile > <nl> + < PrecompiledHeader > NotUsing < / PrecompiledHeader > <nl> + < WarningLevel > Level3 < / WarningLevel > <nl> + < Optimization > Disabled < / Optimization > <nl> + < PreprocessorDefinitions > WIN32 ; _DEBUG ; _LIB ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> + < SDLCheck > true < / SDLCheck > <nl> + < RuntimeLibrary > MultiThreadedDebug < / RuntimeLibrary > <nl> + < TreatWarningAsError > true < / TreatWarningAsError > <nl> + < DebugInformationFormat Condition = " $ ( Jenkins ) " > None < / DebugInformationFormat > <nl> + < MinimalRebuild Condition = " $ ( Jenkins ) " > false < / MinimalRebuild > <nl> + < / ClCompile > <nl> + < Link > <nl> + < SubSystem > Console < / SubSystem > <nl> + < GenerateDebugInformation Condition = " ! $ ( Jenkins ) " > true < / GenerateDebugInformation > <nl> + < GenerateDebugInformation Condition = " $ ( Jenkins ) " > false < / GenerateDebugInformation > <nl> + < / Link > <nl> + < / ItemDefinitionGroup > <nl> + <nl> + < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " > <nl> + < ClCompile > <nl> + < PrecompiledHeader > NotUsing < / PrecompiledHeader > <nl> + < WarningLevel > Level3 < / WarningLevel > <nl> + < Optimization > Disabled < / Optimization > <nl> + < PreprocessorDefinitions > WIN32 ; _DEBUG ; _LIB ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> + < SDLCheck > true < / SDLCheck > <nl> + < RuntimeLibrary > MultiThreadedDebug < / RuntimeLibrary > <nl> + < TreatWarningAsError > true < / TreatWarningAsError > <nl> + < DebugInformationFormat Condition = " $ ( Jenkins ) " > None < / DebugInformationFormat > <nl> + < MinimalRebuild Condition = " $ ( Jenkins ) " > false < / MinimalRebuild > <nl> + < / ClCompile > <nl> + < Link > <nl> + < SubSystem > Console < / SubSystem > <nl> + < GenerateDebugInformation Condition = " ! $ ( Jenkins ) " > true < / GenerateDebugInformation > <nl> + < GenerateDebugInformation Condition = " $ ( Jenkins ) " > false < / GenerateDebugInformation > <nl> + < / Link > <nl> + < / ItemDefinitionGroup > <nl> + <nl> + < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> + < ClCompile > <nl> + < PrecompiledHeader > NotUsing < / PrecompiledHeader > <nl> + < WarningLevel > Level3 < / WarningLevel > <nl> + < Optimization > MaxSpeed < / Optimization > <nl> + < PreprocessorDefinitions > WIN32 ; NDEBUG ; _LIB ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> + < FunctionLevelLinking > true < / FunctionLevelLinking > <nl> + < IntrinsicFunctions > true < / IntrinsicFunctions > <nl> + < SDLCheck > true < / SDLCheck > <nl> + < RuntimeLibrary > MultiThreaded < / RuntimeLibrary > <nl> + < TreatWarningAsError > true < / TreatWarningAsError > <nl> + < DebugInformationFormat Condition = " $ ( Jenkins ) " > None < / DebugInformationFormat > <nl> + < MinimalRebuild Condition = " $ ( Jenkins ) " > false < / MinimalRebuild > <nl> + < / ClCompile > <nl> + < Link > <nl> + < SubSystem > Console < / SubSystem > <nl> + < GenerateDebugInformation Condition = " ! $ ( Jenkins ) " > true < / GenerateDebugInformation > <nl> + < GenerateDebugInformation Condition = " $ ( Jenkins ) " > false < / GenerateDebugInformation > <nl> + < EnableCOMDATFolding > true < / EnableCOMDATFolding > <nl> + < OptimizeReferences > true < / OptimizeReferences > <nl> + < / Link > <nl> + < / ItemDefinitionGroup > <nl> + <nl> + < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " > <nl> + < ClCompile > <nl> + < PrecompiledHeader > NotUsing < / PrecompiledHeader > <nl> + < WarningLevel > Level3 < / WarningLevel > <nl> + < Optimization > MaxSpeed < / Optimization > <nl> + < PreprocessorDefinitions > WIN32 ; NDEBUG ; _LIB ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> + < FunctionLevelLinking > true < / FunctionLevelLinking > <nl> + < IntrinsicFunctions > true < / IntrinsicFunctions > <nl> + < SDLCheck > true < / SDLCheck > <nl> + < RuntimeLibrary > MultiThreaded < / RuntimeLibrary > <nl> + < TreatWarningAsError > true < / TreatWarningAsError > <nl> + < DebugInformationFormat Condition = " $ ( Jenkins ) " > None < / DebugInformationFormat > <nl> + < MinimalRebuild Condition = " $ ( Jenkins ) " > false < / MinimalRebuild > <nl> + < / ClCompile > <nl> + < Link > <nl> + < SubSystem > Console < / SubSystem > <nl> + < GenerateDebugInformation Condition = " ! $ ( Jenkins ) " > true < / GenerateDebugInformation > <nl> + < GenerateDebugInformation Condition = " $ ( Jenkins ) " > false < / GenerateDebugInformation > <nl> + < EnableCOMDATFolding > true < / EnableCOMDATFolding > <nl> + < OptimizeReferences > true < / OptimizeReferences > <nl> + < / Link > <nl> + < / ItemDefinitionGroup > <nl> + <nl> + < ItemGroup > <nl> + < ClCompile Include = " $ ( SolutionDir ) \ . . \ src \ proto \ grpc \ lb \ v1 \ load_balancer . pb . cc " > <nl> + < / ClCompile > <nl> + < ClInclude Include = " $ ( SolutionDir ) \ . . \ src \ proto \ grpc \ lb \ v1 \ load_balancer . pb . h " > <nl> + < / ClInclude > <nl> + < ClCompile Include = " $ ( SolutionDir ) \ . . \ src \ proto \ grpc \ lb \ v1 \ load_balancer . grpc . pb . cc " > <nl> + < / ClCompile > <nl> + < ClInclude Include = " $ ( SolutionDir ) \ . . \ src \ proto \ grpc \ lb \ v1 \ load_balancer . grpc . pb . h " > <nl> + < / ClInclude > <nl> + < ClCompile Include = " $ ( SolutionDir ) \ . . \ test \ cpp \ end2end \ grpclb_end2end_test . cc " > <nl> + < / ClCompile > <nl> + < / ItemGroup > <nl> + < ItemGroup > <nl> + < ProjectReference Include = " $ ( SolutionDir ) \ . . \ vsprojects \ vcxproj \ . \ grpc + + _test_util \ grpc + + _test_util . vcxproj " > <nl> + < Project > { 0BE77741 - 552A - 929B - A497 - 4EF7ECE17A64 } < / Project > <nl> + < / ProjectReference > <nl> + < ProjectReference Include = " $ ( SolutionDir ) \ . . \ vsprojects \ vcxproj \ . \ grpc_test_util \ grpc_test_util . vcxproj " > <nl> + < Project > { 17BCAFC0 - 5FDC - 4C94 - AEB9 - 95F3E220614B } < / Project > <nl> + < / ProjectReference > <nl> + < ProjectReference Include = " $ ( SolutionDir ) \ . . \ vsprojects \ vcxproj \ . \ grpc + + \ grpc + + . vcxproj " > <nl> + < Project > { C187A093 - A0FE - 489D - A40A - 6E33DE0F9FEB } < / Project > <nl> + < / ProjectReference > <nl> + < ProjectReference Include = " $ ( SolutionDir ) \ . . \ vsprojects \ vcxproj \ . \ grpc \ grpc . vcxproj " > <nl> + < Project > { 29D16885 - 7228 - 4C31 - 81ED - 5F9187C7F2A9 } < / Project > <nl> + < / ProjectReference > <nl> + < ProjectReference Include = " $ ( SolutionDir ) \ . . \ vsprojects \ vcxproj \ . \ gpr_test_util \ gpr_test_util . vcxproj " > <nl> + < Project > { EAB0A629 - 17A9 - 44DB - B5FF - E91A721FE037 } < / Project > <nl> + < / ProjectReference > <nl> + < ProjectReference Include = " $ ( SolutionDir ) \ . . \ vsprojects \ vcxproj \ . \ gpr \ gpr . vcxproj " > <nl> + < Project > { B23D3D1A - 9438 - 4EDA - BEB6 - 9A0A03D17792 } < / Project > <nl> + < / ProjectReference > <nl> + < / ItemGroup > <nl> + < ItemGroup > <nl> + < None Include = " packages . config " / > <nl> + < / ItemGroup > <nl> + < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . targets " / > <nl> + < ImportGroup Label = " ExtensionTargets " > <nl> + < Import Project = " $ ( SolutionDir ) \ . . \ vsprojects \ packages \ grpc . dependencies . zlib . redist . 1 . 2 . 8 . 10 \ build \ native \ grpc . dependencies . zlib . redist . targets " Condition = " Exists ( ' $ ( SolutionDir ) \ . . \ vsprojects \ packages \ grpc . dependencies . zlib . redist . 1 . 2 . 8 . 10 \ build \ native \ grpc . dependencies \ grpc . dependencies . zlib . targets ' ) " / > <nl> + < Import Project = " $ ( SolutionDir ) \ . . \ vsprojects \ packages \ grpc . dependencies . zlib . 1 . 2 . 8 . 10 \ build \ native \ grpc . dependencies . zlib . targets " Condition = " Exists ( ' $ ( SolutionDir ) \ . . \ vsprojects \ packages \ grpc . dependencies . zlib . 1 . 2 . 8 . 10 \ build \ native \ grpc . dependencies \ grpc . dependencies . zlib . targets ' ) " / > <nl> + < Import Project = " $ ( SolutionDir ) \ . . \ vsprojects \ packages \ grpc . dependencies . openssl . redist . 1 . 0 . 204 . 1 \ build \ native \ grpc . dependencies . openssl . redist . targets " Condition = " Exists ( ' $ ( SolutionDir ) \ . . \ vsprojects \ packages \ grpc . dependencies . openssl . redist . 1 . 0 . 204 . 1 \ build \ native \ grpc . dependencies \ grpc . dependencies . openssl . targets ' ) " / > <nl> + < Import Project = " $ ( SolutionDir ) \ . . \ vsprojects \ packages \ grpc . dependencies . openssl . 1 . 0 . 204 . 1 \ build \ native \ grpc . dependencies . openssl . targets " Condition = " Exists ( ' $ ( SolutionDir ) \ . . \ vsprojects \ packages \ grpc . dependencies . openssl . 1 . 0 . 204 . 1 \ build \ native \ grpc . dependencies \ grpc . dependencies . openssl . targets ' ) " / > <nl> + < / ImportGroup > <nl> + < Target Name = " EnsureNuGetPackageBuildImports " BeforeTargets = " PrepareForBuild " > <nl> + < PropertyGroup > <nl> + < ErrorText > This project references NuGet package ( s ) that are missing on this computer . Enable NuGet Package Restore to download them . For more information , see http : / / go . microsoft . com / fwlink / ? LinkID = 322105 . The missing file is { 0 } . < / ErrorText > <nl> + < / PropertyGroup > <nl> + < Error Condition = " ! Exists ( ' $ ( SolutionDir ) \ . . \ vsprojects \ packages \ grpc . dependencies . zlib . redist . 1 . 2 . 8 . 10 \ build \ native \ grpc . dependencies . zlib . redist . targets ' ) " Text = " $ ( [ System . String ] : : Format ( ' $ ( ErrorText ) ' , ' $ ( SolutionDir ) \ . . \ vsprojects \ packages \ grpc . dependencies . zlib . redist . 1 . 2 . 8 . 10 \ build \ native \ grpc . dependencies . zlib . redist . targets ' ) " / > <nl> + < Error Condition = " ! Exists ( ' $ ( SolutionDir ) \ . . \ vsprojects \ packages \ grpc . dependencies . zlib . 1 . 2 . 8 . 10 \ build \ native \ grpc . dependencies . zlib . targets ' ) " Text = " $ ( [ System . String ] : : Format ( ' $ ( ErrorText ) ' , ' $ ( SolutionDir ) \ . . \ vsprojects \ packages \ grpc . dependencies . zlib . 1 . 2 . 8 . 10 \ build \ native \ grpc . dependencies . zlib . targets ' ) " / > <nl> + < Error Condition = " ! Exists ( ' $ ( SolutionDir ) \ . . \ vsprojects \ packages \ grpc . dependencies . openssl . redist . 1 . 0 . 204 . 1 \ build \ native \ grpc . dependencies . openssl . redist . targets ' ) " Text = " $ ( [ System . String ] : : Format ( ' $ ( ErrorText ) ' , ' $ ( SolutionDir ) \ . . \ vsprojects \ packages \ grpc . dependencies . openssl . redist . 1 . 0 . 204 . 1 \ build \ native \ grpc . dependencies . openssl . redist . targets ' ) " / > <nl> + < Error Condition = " ! Exists ( ' $ ( SolutionDir ) \ . . \ vsprojects \ packages \ grpc . dependencies . openssl . 1 . 0 . 204 . 1 \ build \ native \ grpc . dependencies . openssl . props ' ) " Text = " $ ( [ System . String ] : : Format ( ' $ ( ErrorText ) ' , ' $ ( SolutionDir ) \ . . \ vsprojects \ packages \ grpc . dependencies . openssl . 1 . 0 . 204 . 1 \ build \ native \ grpc . dependencies . openssl . props ' ) " / > <nl> + < Error Condition = " ! Exists ( ' $ ( SolutionDir ) \ . . \ vsprojects \ packages \ grpc . dependencies . openssl . 1 . 0 . 204 . 1 \ build \ native \ grpc . dependencies . openssl . targets ' ) " Text = " $ ( [ System . String ] : : Format ( ' $ ( ErrorText ) ' , ' $ ( SolutionDir ) \ . . \ vsprojects \ packages \ grpc . dependencies . openssl . 1 . 0 . 204 . 1 \ build \ native \ grpc . dependencies . openssl . targets ' ) " / > <nl> + < / Target > <nl> + < / Project > <nl> + <nl> new file mode 100644 <nl> index 00000000000 . . 7b1ef956e08 <nl> mmm / dev / null <nl> ppp b / vsprojects / vcxproj / test / grpclb_end2end_test / grpclb_end2end_test . vcxproj . filters <nl> <nl> + < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> + < Project ToolsVersion = " 4 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> + < ItemGroup > <nl> + < ClCompile Include = " $ ( SolutionDir ) \ . . \ src \ proto \ grpc \ lb \ v1 \ load_balancer . proto " > <nl> + < Filter > src \ proto \ grpc \ lb \ v1 < / Filter > <nl> + < / ClCompile > <nl> + < ClCompile Include = " $ ( SolutionDir ) \ . . \ test \ cpp \ end2end \ grpclb_end2end_test . cc " > <nl> + < Filter > test \ cpp \ end2end < / Filter > <nl> + < / ClCompile > <nl> + < / ItemGroup > <nl> + <nl> + < ItemGroup > <nl> + < Filter Include = " src " > <nl> + < UniqueIdentifier > { 5ffc769b - 475b - 67a1 - b131 - 2af6f6103043 } < / UniqueIdentifier > <nl> + < / Filter > <nl> + < Filter Include = " src \ proto " > <nl> + < UniqueIdentifier > { 165c6d96 - aac0 - d0b0 - a1b4 - 9470159d683e } < / UniqueIdentifier > <nl> + < / Filter > <nl> + < Filter Include = " src \ proto \ grpc " > <nl> + < UniqueIdentifier > { 0b3a7ccc - ea48 - 092f - 75f1 - 866995a4ed04 } < / UniqueIdentifier > <nl> + < / Filter > <nl> + < Filter Include = " src \ proto \ grpc \ lb " > <nl> + < UniqueIdentifier > { 8f4e5440 - acec - c6e3 - 4a3d - c8ff6ed84e11 } < / UniqueIdentifier > <nl> + < / Filter > <nl> + < Filter Include = " src \ proto \ grpc \ lb \ v1 " > <nl> + < UniqueIdentifier > { 191ccb8f - 33fe - b990 - 20c1 - 87c04d15a7c2 } < / UniqueIdentifier > <nl> + < / Filter > <nl> + < Filter Include = " test " > <nl> + < UniqueIdentifier > { f501dace - 533d - 819c - ca99 - 9e0359bb67ef } < / UniqueIdentifier > <nl> + < / Filter > <nl> + < Filter Include = " test \ cpp " > <nl> + < UniqueIdentifier > { fcbf6f3b - 2707 - 4605 - d76e - f32b545c6531 } < / UniqueIdentifier > <nl> + < / Filter > <nl> + < Filter Include = " test \ cpp \ end2end " > <nl> + < UniqueIdentifier > { f70e20f4 - 442c - b400 - 758d - f13abf182438 } < / UniqueIdentifier > <nl> + < / Filter > <nl> + < / ItemGroup > <nl> + < / Project > <nl> + <nl> | Merge pull request from dgquintas / grpclb_new_test | grpc/grpc | cf7ea0f0892611a7ccc41a6b472ec460acc89e31 | 2017-05-02T08:14:57Z |
mmm a / scene / gui / rich_text_label . cpp <nl> ppp b / scene / gui / rich_text_label . cpp <nl> bool RichTextLabel : : search ( const String & p_string , bool p_from_selection ) { <nl> <nl> void RichTextLabel : : selection_copy ( ) { <nl> <nl> - if ( ! selection . enabled ) <nl> + if ( ! selection . active | | ! selection . enabled ) <nl> return ; <nl> <nl> String text ; <nl> mmm a / scene / gui / rich_text_label . h <nl> ppp b / scene / gui / rich_text_label . h <nl> class RichTextLabel : public Control { <nl> Item * to ; <nl> int to_char ; <nl> <nl> - bool active ; <nl> - bool enabled ; <nl> + bool active ; / / anything selected ? i . e . from , to , etc . valid ? <nl> + bool enabled ; / / allow selections ? <nl> } ; <nl> <nl> Selection selection ; <nl> | Fix crash in RichTextLabel : : selection_copy ( ) | godotengine/godot | 658fb0a0a9b27d93bfccc17f24e55726ec69b293 | 2017-12-10T15:08:24Z |
mmm a / tests / cpp - tests / Classes / ExtensionsTest / CocoStudioActionTimelineTest / ActionTimelineTestScene . cpp <nl> ppp b / tests / cpp - tests / Classes / ExtensionsTest / CocoStudioActionTimelineTest / ActionTimelineTestScene . cpp <nl> void TestChangePlaySection : : onEnter ( ) <nl> { <nl> ActionTimelineTestLayer : : onEnter ( ) ; <nl> <nl> - / / ActionTimelineNode * node = CSLoader : : createActionTimelineNode ( " ActionTimeline / DemoPlayer . csb " , 41 , 130 , true ) ; <nl> - / / action = node - > getActionTimeline ( ) ; <nl> - Node * node = CSLoader : : createNode ( " ActionTimeline / DemoPlayer . csb " ) ; <nl> - ActionTimeline * action = CSLoader : : createTimeline ( " ActionTimeline / DemoPlayer . csb " ) ; <nl> - <nl> - node - > runAction ( action ) ; <nl> - action - > gotoFrameAndPlay ( 41 , action - > getDuration ( ) , true ) ; <nl> + ActionTimelineNode * node = CSLoader : : createActionTimelineNode ( " ActionTimeline / DemoPlayer . csb " , 41 , 81 , true ) ; <nl> + action = node - > getActionTimeline ( ) ; <nl> <nl> node - > setScale ( 0 . 2f ) ; <nl> node - > setPosition ( VisibleRect : : center ( ) ) ; <nl> std : : string TestChangePlaySection : : title ( ) const <nl> void TestChangePlaySection : : onTouchesEnded ( const std : : vector < Touch * > & touches , Event * event ) <nl> { <nl> if ( action - > getStartFrame ( ) = = 0 ) <nl> - action - > gotoFrameAndPlay ( 70 , action - > getDuration ( ) , true ) ; <nl> + action - > gotoFrameAndPlay ( 41 , 81 , true ) ; <nl> else <nl> - action - > gotoFrameAndPlay ( 0 , 60 , true ) ; <nl> + action - > gotoFrameAndPlay ( 0 , 40 , true ) ; <nl> } <nl> <nl> / / TestFrameEvent <nl> void TestTimelineFrameEvent : : onEnter ( ) <nl> { <nl> ActionTimelineTestLayer : : onEnter ( ) ; <nl> <nl> - SpriteFrameCache : : getInstance ( ) - > addSpriteFramesWithFile ( " armature / Cowboy0 . plist " , " armature / Cowboy0 . png " ) ; <nl> - <nl> - ActionTimelineNode * node = CSLoader : : createActionTimelineNode ( " ActionTimeline / boy_1 . csb " , 0 , 60 , true ) ; <nl> + ActionTimelineNode * node = CSLoader : : createActionTimelineNode ( " ActionTimeline / DemoPlayer . csb " , 0 , 40 , true ) ; <nl> ActionTimeline * action = node - > getActionTimeline ( ) ; <nl> <nl> node - > setScale ( 0 . 2f ) ; <nl> void TestTimelinePerformance : : onEnter ( ) <nl> <nl> for ( int i = 0 ; i < 100 ; i + + ) <nl> { <nl> - / / ActionTimelineNode * node = CSLoader : : createActionTimelineNode ( " ActionTimeline / boy_1 . csb " , 41 , 130 , true ) ; <nl> - Node * node = CSLoader : : createNode ( " ActionTimeline / DemoPlayer . csb " ) ; <nl> - ActionTimeline * action = CSLoader : : createTimeline ( " ActionTimeline / DemoPlayer . csb " ) ; <nl> - <nl> - node - > runAction ( action ) ; <nl> - action - > gotoFrameAndPlay ( 41 , action - > getDuration ( ) , true ) ; <nl> + ActionTimelineNode * node = CSLoader : : createActionTimelineNode ( " ActionTimeline / DemoPlayer . csb " , 41 , 81 , true ) ; <nl> <nl> node - > setScale ( 0 . 1f ) ; <nl> node - > setPosition ( i * 2 , 100 ) ; <nl> | update timeline test | cocos2d/cocos2d-x | 2b7ead06de7adcaf7f75ac00e498625270e7e605 | 2014-12-04T08:49:43Z |
mmm a / lib / Sema / TypeCheckDecl . cpp <nl> ppp b / lib / Sema / TypeCheckDecl . cpp <nl> void TypeChecker : : validateWhereClauses ( ProtocolDecl * protocol , <nl> } <nl> } <nl> <nl> - void TypeChecker : : resolveInheritedProtocols ( ProtocolDecl * protocol ) { <nl> - for ( unsigned i : indices ( protocol - > getInherited ( ) ) ) <nl> - ( void ) protocol - > getInheritedType ( i ) ; <nl> - resolveTrailingWhereClause ( protocol ) ; <nl> - } <nl> - <nl> / / / check the inheritance clause of a type declaration or extension thereof . <nl> / / / <nl> / / / This routine validates all of the types in the parsed inheritance clause , <nl> void TypeChecker : : validateDecl ( ValueDecl * D ) { <nl> } <nl> } <nl> <nl> - / / Record inherited protocols . <nl> - resolveInheritedProtocols ( proto ) ; <nl> resolveTrailingWhereClause ( proto ) ; <nl> <nl> validateAttributes ( * this , D ) ; <nl> void TypeChecker : : validateDeclForNameLookup ( ValueDecl * D ) { <nl> <nl> ( void ) proto - > getFormalAccess ( ) ; <nl> <nl> - / / Record inherited protocols . <nl> - resolveInheritedProtocols ( proto ) ; <nl> resolveTrailingWhereClause ( proto ) ; <nl> <nl> for ( auto ATD : proto - > getAssociatedTypeMembers ( ) ) { <nl> static void finalizeType ( TypeChecker & TC , NominalTypeDecl * nominal ) { <nl> / / validation of protocols , but clients will assume that things <nl> / / like the requirement signature have been set . <nl> if ( auto PD = dyn_cast < ProtocolDecl > ( nominal ) ) { <nl> + ( void ) PD - > getInheritedProtocols ( ) ; <nl> if ( ! PD - > isRequirementSignatureComputed ( ) ) { <nl> TC . validateDecl ( PD ) ; <nl> } <nl> mmm a / lib / Sema / TypeChecker . h <nl> ppp b / lib / Sema / TypeChecker . h <nl> class TypeChecker final : public LazyResolver { <nl> GenericRequirementsCheckListener * listener = nullptr , <nl> SubstOptions options = None ) ; <nl> <nl> - / / / Resolve the inherited protocols of a given protocol . <nl> - void resolveInheritedProtocols ( ProtocolDecl * protocol ) ; <nl> - <nl> / / / Validate a protocol ' s where clause , along with the where clauses of <nl> / / / its associated types . <nl> void validateWhereClauses ( ProtocolDecl * protocol , <nl> | Eliminate TypeChecker : : resolveInheritedProtocols ( ) . | apple/swift | 1610a894a6cc5e0be085c315207b1cd545b8bcf3 | 2018-08-06T23:21:42Z |
mmm a / src / clustering / administration / log_transfer . cc <nl> ppp b / src / clustering / administration / log_transfer . cc <nl> log_server_business_card_t log_server_t : : get_business_card ( ) { <nl> void log_server_t : : handle_request ( <nl> signal_t * interruptor , <nl> int max_lines , <nl> - struct timespec min_timestamp , <nl> - struct timespec max_timestamp , <nl> + timespec min_timestamp , <nl> + timespec max_timestamp , <nl> log_server_business_card_t : : result_mailbox_t : : address_t cont ) { <nl> std : : string error ; <nl> try { <nl> void log_server_t : : handle_request ( <nl> std : : vector < log_message_t > fetch_log_file ( <nl> mailbox_manager_t * mm , <nl> const log_server_business_card_t & bcard , <nl> - int max_lines , struct timespec min_timestamp , struct timespec max_timestamp , <nl> + int max_lines , timespec min_timestamp , timespec max_timestamp , <nl> signal_t * interruptor ) THROWS_ONLY ( resource_lost_exc_t , std : : runtime_error , interrupted_exc_t ) { <nl> promise_t < boost : : variant < std : : vector < log_message_t > , std : : string > > promise ; <nl> log_server_business_card_t : : result_mailbox_t reply_mailbox ( <nl> mmm a / src / clustering / administration / real_reql_cluster_interface . cc <nl> ppp b / src / clustering / administration / real_reql_cluster_interface . cc <nl> std : : string deleted_table_error_message ( std : : map < namespace_id_t , name_string_t > <nl> rassert ( ! table_map . empty ( ) ) ; <nl> std : : string message ; <nl> for ( auto const & pair : table_map ) { <nl> - message + = strprintf ( " % s % s " , message . empty ( ) ? " " : " , " , <nl> + message + = strprintf ( " % s ` % s ` " , message . empty ( ) ? " " : " , " , <nl> pair . second . str ( ) . c_str ( ) ) ; <nl> } <nl> <nl> - return strprintf ( " The following table % s deleted during the operation : % s " , <nl> - table_map . size ( ) = = 1 ? " was " : " s were " , <nl> + return strprintf ( " % s deleted during the operation : % s " , <nl> + table_map . size ( ) = = 1 ? " This table was " : " These tables were " , <nl> message . c_str ( ) ) ; <nl> } <nl> <nl> mmm a / src / concurrency / watchable_map . hpp <nl> ppp b / src / concurrency / watchable_map . hpp <nl> class watchable_map_t : public home_thread_mixin_t { <nl> template < class key_t , class value_t > <nl> class watchable_map_var_t : public watchable_map_t < key_t , value_t > { <nl> public : <nl> - watchable_map_var_t ( ) { } ; <nl> - watchable_map_var_t ( std : : map < key_t , value_t > & & source ) ; <nl> + watchable_map_var_t ( ) { } <nl> + explicit watchable_map_var_t ( std : : map < key_t , value_t > & & source ) ; <nl> <nl> std : : map < key_t , value_t > get_all ( ) ; <nl> boost : : optional < value_t > get_key ( const key_t & key ) ; <nl> | fixing style | rethinkdb/rethinkdb | a61d074f4be7bc3410ef223f08084d9214086565 | 2014-10-29T23:25:13Z |
mmm a / drivers / nrex / regex . cpp <nl> ppp b / drivers / nrex / regex . cpp <nl> Error RegEx : : compile ( const String & p_pattern ) { <nl> <nl> int RegEx : : find ( const String & p_text , int p_start , int p_end ) const { <nl> <nl> - ERR_FAIL_COND_V ( ! exp . valid ( ) , false ) ; <nl> - ERR_FAIL_COND_V ( p_text . length ( ) < p_start , false ) ; <nl> - ERR_FAIL_COND_V ( p_text . length ( ) < p_end , false ) ; <nl> + ERR_FAIL_COND_V ( ! exp . valid ( ) , - 1 ) ; <nl> + ERR_FAIL_COND_V ( p_text . length ( ) < p_start , - 1 ) ; <nl> + ERR_FAIL_COND_V ( p_text . length ( ) < p_end , - 1 ) ; <nl> <nl> bool res = exp . match ( p_text . c_str ( ) , & captures [ 0 ] , p_start , p_end ) ; <nl> <nl> | Fixed incorrect failsafe return values | godotengine/godot | 69eff35cd5758aa4a6d299989342ae0e08894a8f | 2015-07-24T15:15:04Z |
new file mode 100644 <nl> index 00000000 . . b1c00443 <nl> mmm / dev / null <nl> ppp b / src / bindings / csharp / AlprNetGuiTest / AlprNetGuiTest . csproj <nl> <nl> + < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> + < Project ToolsVersion = " 4 . 0 " DefaultTargets = " Build " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> + < PropertyGroup > <nl> + < Configuration Condition = " ' $ ( Configuration ) ' = = ' ' " > Debug < / Configuration > <nl> + < Platform Condition = " ' $ ( Platform ) ' = = ' ' " > x86 < / Platform > <nl> + < ProductVersion > 8 . 0 . 30703 < / ProductVersion > <nl> + < SchemaVersion > 2 . 0 < / SchemaVersion > <nl> + < ProjectGuid > { C7863A14 - 55D2 - 4389 - 9072 - 04AA6E30AAD1 } < / ProjectGuid > <nl> + < OutputType > WinExe < / OutputType > <nl> + < AppDesignerFolder > Properties < / AppDesignerFolder > <nl> + < RootNamespace > AlprNetGuiTest < / RootNamespace > <nl> + < AssemblyName > AlprNetGuiTest < / AssemblyName > <nl> + < TargetFrameworkVersion > v4 . 0 < / TargetFrameworkVersion > <nl> + < TargetFrameworkProfile > Client < / TargetFrameworkProfile > <nl> + < FileAlignment > 512 < / FileAlignment > <nl> + < / PropertyGroup > <nl> + < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x86 ' " > <nl> + < PlatformTarget > x86 < / PlatformTarget > <nl> + < DebugSymbols > true < / DebugSymbols > <nl> + < DebugType > full < / DebugType > <nl> + < Optimize > false < / Optimize > <nl> + < OutputPath > bin \ Debug \ < / OutputPath > <nl> + < DefineConstants > DEBUG ; TRACE < / DefineConstants > <nl> + < ErrorReport > prompt < / ErrorReport > <nl> + < WarningLevel > 4 < / WarningLevel > <nl> + < / PropertyGroup > <nl> + < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x86 ' " > <nl> + < PlatformTarget > x86 < / PlatformTarget > <nl> + < DebugType > pdbonly < / DebugType > <nl> + < Optimize > true < / Optimize > <nl> + < OutputPath > bin \ Release \ < / OutputPath > <nl> + < DefineConstants > TRACE < / DefineConstants > <nl> + < ErrorReport > prompt < / ErrorReport > <nl> + < WarningLevel > 4 < / WarningLevel > <nl> + < / PropertyGroup > <nl> + < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " > <nl> + < DebugSymbols > true < / DebugSymbols > <nl> + < OutputPath > bin \ x64 \ Debug \ < / OutputPath > <nl> + < DefineConstants > DEBUG ; TRACE < / DefineConstants > <nl> + < DebugType > full < / DebugType > <nl> + < PlatformTarget > x64 < / PlatformTarget > <nl> + < CodeAnalysisLogFile > bin \ Debug \ openalprnet - windemo . exe . CodeAnalysisLog . xml < / CodeAnalysisLogFile > <nl> + < CodeAnalysisUseTypeNameInSuppression > true < / CodeAnalysisUseTypeNameInSuppression > <nl> + < CodeAnalysisModuleSuppressionsFile > GlobalSuppressions . cs < / CodeAnalysisModuleSuppressionsFile > <nl> + < ErrorReport > prompt < / ErrorReport > <nl> + < CodeAnalysisRuleSet > MinimumRecommendedRules . ruleset < / CodeAnalysisRuleSet > <nl> + < CodeAnalysisRuleSetDirectories > ; C : \ Program Files ( x86 ) \ Microsoft Visual Studio 10 . 0 \ Team Tools \ Static Analysis Tools \ \ Rule Sets < / CodeAnalysisRuleSetDirectories > <nl> + < CodeAnalysisIgnoreBuiltInRuleSets > true < / CodeAnalysisIgnoreBuiltInRuleSets > <nl> + < CodeAnalysisRuleDirectories > ; C : \ Program Files ( x86 ) \ Microsoft Visual Studio 10 . 0 \ Team Tools \ Static Analysis Tools \ FxCop \ \ Rules < / CodeAnalysisRuleDirectories > <nl> + < CodeAnalysisIgnoreBuiltInRules > true < / CodeAnalysisIgnoreBuiltInRules > <nl> + < / PropertyGroup > <nl> + < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " > <nl> + < OutputPath > bin \ x64 \ Release \ < / OutputPath > <nl> + < DefineConstants > TRACE < / DefineConstants > <nl> + < Optimize > true < / Optimize > <nl> + < DebugType > pdbonly < / DebugType > <nl> + < PlatformTarget > x64 < / PlatformTarget > <nl> + < CodeAnalysisLogFile > bin \ Release \ openalprnet - windemo . exe . CodeAnalysisLog . xml < / CodeAnalysisLogFile > <nl> + < CodeAnalysisUseTypeNameInSuppression > true < / CodeAnalysisUseTypeNameInSuppression > <nl> + < CodeAnalysisModuleSuppressionsFile > GlobalSuppressions . cs < / CodeAnalysisModuleSuppressionsFile > <nl> + < ErrorReport > prompt < / ErrorReport > <nl> + < CodeAnalysisRuleSet > MinimumRecommendedRules . ruleset < / CodeAnalysisRuleSet > <nl> + < CodeAnalysisRuleSetDirectories > ; C : \ Program Files ( x86 ) \ Microsoft Visual Studio 10 . 0 \ Team Tools \ Static Analysis Tools \ \ Rule Sets < / CodeAnalysisRuleSetDirectories > <nl> + < CodeAnalysisRuleDirectories > ; C : \ Program Files ( x86 ) \ Microsoft Visual Studio 10 . 0 \ Team Tools \ Static Analysis Tools \ FxCop \ \ Rules < / CodeAnalysisRuleDirectories > <nl> + < CodeAnalysisIgnoreBuiltInRules > true < / CodeAnalysisIgnoreBuiltInRules > <nl> + < / PropertyGroup > <nl> + < PropertyGroup > <nl> + < ApplicationIcon > appicon . ico < / ApplicationIcon > <nl> + < / PropertyGroup > <nl> + < ItemGroup > <nl> + < Reference Include = " System " / > <nl> + < Reference Include = " System . Core " / > <nl> + < Reference Include = " System . Xml . Linq " / > <nl> + < Reference Include = " System . Data . DataSetExtensions " / > <nl> + < Reference Include = " Microsoft . CSharp " / > <nl> + < Reference Include = " System . Data " / > <nl> + < Reference Include = " System . Deployment " / > <nl> + < Reference Include = " System . Drawing " / > <nl> + < Reference Include = " System . Windows . Forms " / > <nl> + < Reference Include = " System . Xml " / > <nl> + < / ItemGroup > <nl> + < ItemGroup > <nl> + < Compile Include = " Form1 . cs " > <nl> + < SubType > Form < / SubType > <nl> + < / Compile > <nl> + < Compile Include = " Form1 . Designer . cs " > <nl> + < DependentUpon > Form1 . cs < / DependentUpon > <nl> + < / Compile > <nl> + < Compile Include = " Program . cs " / > <nl> + < Compile Include = " Properties \ AssemblyInfo . cs " / > <nl> + < EmbeddedResource Include = " Form1 . resx " > <nl> + < DependentUpon > Form1 . cs < / DependentUpon > <nl> + < / EmbeddedResource > <nl> + < EmbeddedResource Include = " Properties \ Resources . resx " > <nl> + < Generator > ResXFileCodeGenerator < / Generator > <nl> + < LastGenOutput > Resources . Designer . cs < / LastGenOutput > <nl> + < SubType > Designer < / SubType > <nl> + < / EmbeddedResource > <nl> + < Compile Include = " Properties \ Resources . Designer . cs " > <nl> + < AutoGen > True < / AutoGen > <nl> + < DependentUpon > Resources . resx < / DependentUpon > <nl> + < DesignTime > True < / DesignTime > <nl> + < / Compile > <nl> + < None Include = " app . config " / > <nl> + < None Include = " Properties \ Settings . settings " > <nl> + < Generator > SettingsSingleFileGenerator < / Generator > <nl> + < LastGenOutput > Settings . Designer . cs < / LastGenOutput > <nl> + < / None > <nl> + < Compile Include = " Properties \ Settings . Designer . cs " > <nl> + < AutoGen > True < / AutoGen > <nl> + < DependentUpon > Settings . settings < / DependentUpon > <nl> + < DesignTimeSharedInput > True < / DesignTimeSharedInput > <nl> + < / Compile > <nl> + < / ItemGroup > <nl> + < ItemGroup > <nl> + < Content Include = " appicon . ico " / > <nl> + < / ItemGroup > <nl> + < ItemGroup > <nl> + < ProjectReference Include = " . . \ alprnet \ AlprNet . csproj " > <nl> + < Project > { f6106c0e - 0e89 - 4d2e - 89e6 - 19742d54b9f6 } < / Project > <nl> + < Name > AlprNet < / Name > <nl> + < / ProjectReference > <nl> + < / ItemGroup > <nl> + < Import Project = " $ ( MSBuildToolsPath ) \ Microsoft . CSharp . targets " / > <nl> + < ! - - To modify your build process , add your task inside one of the targets below and uncomment it . <nl> + Other similar extension points exist , see Microsoft . Common . targets . <nl> + < Target Name = " BeforeBuild " > <nl> + < / Target > <nl> + < Target Name = " AfterBuild " > <nl> + < / Target > <nl> + - - > <nl> + < / Project > <nl> \ No newline at end of file <nl> new file mode 100644 <nl> index 00000000 . . 4fb2ee73 <nl> mmm / dev / null <nl> ppp b / src / bindings / csharp / AlprNetGuiTest / Form1 . Designer . cs <nl> <nl> + namespace AlprNetGuiTest <nl> + { <nl> + partial class Form1 <nl> + { <nl> + / / / < summary > <nl> + / / / Required designer variable . <nl> + / / / < / summary > <nl> + private System . ComponentModel . IContainer components = null ; <nl> + <nl> + / / / < summary > <nl> + / / / Clean up any resources being used . <nl> + / / / < / summary > <nl> + / / / < param name = " disposing " > true if managed resources should be disposed ; otherwise , false . < / param > <nl> + protected override void Dispose ( bool disposing ) <nl> + { <nl> + if ( disposing & & ( components ! = null ) ) <nl> + { <nl> + components . Dispose ( ) ; <nl> + } <nl> + base . Dispose ( disposing ) ; <nl> + } <nl> + <nl> + # region Windows Form Designer generated code <nl> + <nl> + / / / < summary > <nl> + / / / Required method for Designer support - do not modify <nl> + / / / the contents of this method with the code editor . <nl> + / / / < / summary > <nl> + private void InitializeComponent ( ) <nl> + { <nl> + this . btnDetect = new System . Windows . Forms . Button ( ) ; <nl> + this . picLicensePlate = new System . Windows . Forms . PictureBox ( ) ; <nl> + this . picOriginal = new System . Windows . Forms . PictureBox ( ) ; <nl> + this . lbxPlates = new System . Windows . Forms . ListBox ( ) ; <nl> + this . label1 = new System . Windows . Forms . Label ( ) ; <nl> + this . label2 = new System . Windows . Forms . Label ( ) ; <nl> + this . label3 = new System . Windows . Forms . Label ( ) ; <nl> + this . openFileDialog = new System . Windows . Forms . OpenFileDialog ( ) ; <nl> + this . label4 = new System . Windows . Forms . Label ( ) ; <nl> + this . rbUSA = new System . Windows . Forms . RadioButton ( ) ; <nl> + this . rbEU = new System . Windows . Forms . RadioButton ( ) ; <nl> + ( ( System . ComponentModel . ISupportInitialize ) ( this . picLicensePlate ) ) . BeginInit ( ) ; <nl> + ( ( System . ComponentModel . ISupportInitialize ) ( this . picOriginal ) ) . BeginInit ( ) ; <nl> + this . SuspendLayout ( ) ; <nl> + / / <nl> + / / btnDetect <nl> + / / <nl> + this . btnDetect . Location = new System . Drawing . Point ( 830 , 25 ) ; <nl> + this . btnDetect . Name = " btnDetect " ; <nl> + this . btnDetect . Size = new System . Drawing . Size ( 291 , 37 ) ; <nl> + this . btnDetect . TabIndex = 0 ; <nl> + this . btnDetect . Text = " Detect License Plate " ; <nl> + this . btnDetect . UseVisualStyleBackColor = true ; <nl> + this . btnDetect . Click + = new System . EventHandler ( this . button1_Click ) ; <nl> + / / <nl> + / / picLicensePlate <nl> + / / <nl> + this . picLicensePlate . BorderStyle = System . Windows . Forms . BorderStyle . FixedSingle ; <nl> + this . picLicensePlate . Location = new System . Drawing . Point ( 827 , 403 ) ; <nl> + this . picLicensePlate . Name = " picLicensePlate " ; <nl> + this . picLicensePlate . Size = new System . Drawing . Size ( 294 , 123 ) ; <nl> + this . picLicensePlate . TabIndex = 1 ; <nl> + this . picLicensePlate . TabStop = false ; <nl> + / / <nl> + / / picOriginal <nl> + / / <nl> + this . picOriginal . BorderStyle = System . Windows . Forms . BorderStyle . FixedSingle ; <nl> + this . picOriginal . Location = new System . Drawing . Point ( 12 , 25 ) ; <nl> + this . picOriginal . Name = " picOriginal " ; <nl> + this . picOriginal . Size = new System . Drawing . Size ( 809 , 501 ) ; <nl> + this . picOriginal . TabIndex = 2 ; <nl> + this . picOriginal . TabStop = false ; <nl> + / / <nl> + / / lbxPlates <nl> + / / <nl> + this . lbxPlates . Font = new System . Drawing . Font ( " Consolas " , 8 . 25F , System . Drawing . FontStyle . Regular , System . Drawing . GraphicsUnit . Point , ( ( byte ) ( 0 ) ) ) ; <nl> + this . lbxPlates . FormattingEnabled = true ; <nl> + this . lbxPlates . Location = new System . Drawing . Point ( 827 , 81 ) ; <nl> + this . lbxPlates . Name = " lbxPlates " ; <nl> + this . lbxPlates . Size = new System . Drawing . Size ( 294 , 303 ) ; <nl> + this . lbxPlates . TabIndex = 3 ; <nl> + / / <nl> + / / label1 <nl> + / / <nl> + this . label1 . AutoSize = true ; <nl> + this . label1 . Location = new System . Drawing . Point ( 12 , 9 ) ; <nl> + this . label1 . Name = " label1 " ; <nl> + this . label1 . Size = new System . Drawing . Size ( 76 , 13 ) ; <nl> + this . label1 . TabIndex = 4 ; <nl> + this . label1 . Text = " Source Image : " ; <nl> + / / <nl> + / / label2 <nl> + / / <nl> + this . label2 . AutoSize = true ; <nl> + this . label2 . Location = new System . Drawing . Point ( 827 , 387 ) ; <nl> + this . label2 . Name = " label2 " ; <nl> + this . label2 . Size = new System . Drawing . Size ( 96 , 13 ) ; <nl> + this . label2 . TabIndex = 5 ; <nl> + this . label2 . Text = " License Plate ROI : " ; <nl> + / / <nl> + / / label3 <nl> + / / <nl> + this . label3 . AutoSize = true ; <nl> + this . label3 . Location = new System . Drawing . Point ( 827 , 65 ) ; <nl> + this . label3 . Name = " label3 " ; <nl> + this . label3 . Size = new System . Drawing . Size ( 124 , 13 ) ; <nl> + this . label3 . TabIndex = 6 ; <nl> + this . label3 . Text = " Matched License Plates : " ; <nl> + / / <nl> + / / openFileDialog <nl> + / / <nl> + this . openFileDialog . Filter = " Image files ( * . jpg , * . jpeg , * . jpe , * . jfif , * . png ) | * . jpg ; * . jpeg ; * . jpe ; * . jfif ; " + <nl> + " * . png | All files ( * . * ) | * . * " ; <nl> + / / <nl> + / / label4 <nl> + / / <nl> + this . label4 . AutoSize = true ; <nl> + this . label4 . Location = new System . Drawing . Point ( 827 , 9 ) ; <nl> + this . label4 . Name = " label4 " ; <nl> + this . label4 . Size = new System . Drawing . Size ( 44 , 13 ) ; <nl> + this . label4 . TabIndex = 7 ; <nl> + this . label4 . Text = " Region : " ; <nl> + / / <nl> + / / rbUSA <nl> + / / <nl> + this . rbUSA . AutoSize = true ; <nl> + this . rbUSA . Checked = true ; <nl> + this . rbUSA . Location = new System . Drawing . Point ( 878 , 7 ) ; <nl> + this . rbUSA . Name = " rbUSA " ; <nl> + this . rbUSA . Size = new System . Drawing . Size ( 40 , 17 ) ; <nl> + this . rbUSA . TabIndex = 8 ; <nl> + this . rbUSA . TabStop = true ; <nl> + this . rbUSA . Text = " US " ; <nl> + this . rbUSA . UseVisualStyleBackColor = true ; <nl> + / / <nl> + / / rbEU <nl> + / / <nl> + this . rbEU . AutoSize = true ; <nl> + this . rbEU . Location = new System . Drawing . Point ( 924 , 7 ) ; <nl> + this . rbEU . Name = " rbEU " ; <nl> + this . rbEU . Size = new System . Drawing . Size ( 40 , 17 ) ; <nl> + this . rbEU . TabIndex = 9 ; <nl> + this . rbEU . Text = " EU " ; <nl> + this . rbEU . UseVisualStyleBackColor = true ; <nl> + / / <nl> + / / Form1 <nl> + / / <nl> + this . AutoScaleDimensions = new System . Drawing . SizeF ( 6F , 13F ) ; <nl> + this . AutoScaleMode = System . Windows . Forms . AutoScaleMode . Font ; <nl> + this . BackColor = System . Drawing . Color . White ; <nl> + this . ClientSize = new System . Drawing . Size ( 1128 , 538 ) ; <nl> + this . Controls . Add ( this . rbEU ) ; <nl> + this . Controls . Add ( this . rbUSA ) ; <nl> + this . Controls . Add ( this . label4 ) ; <nl> + this . Controls . Add ( this . label3 ) ; <nl> + this . Controls . Add ( this . label2 ) ; <nl> + this . Controls . Add ( this . label1 ) ; <nl> + this . Controls . Add ( this . lbxPlates ) ; <nl> + this . Controls . Add ( this . picOriginal ) ; <nl> + this . Controls . Add ( this . picLicensePlate ) ; <nl> + this . Controls . Add ( this . btnDetect ) ; <nl> + this . FormBorderStyle = System . Windows . Forms . FormBorderStyle . FixedDialog ; <nl> + this . MaximizeBox = false ; <nl> + this . MinimizeBox = false ; <nl> + this . Name = " Form1 " ; <nl> + this . SizeGripStyle = System . Windows . Forms . SizeGripStyle . Hide ; <nl> + this . StartPosition = System . Windows . Forms . FormStartPosition . CenterScreen ; <nl> + this . Text = " OpenALPR - Net Demo " ; <nl> + this . Load + = new System . EventHandler ( this . Form1_Load ) ; <nl> + ( ( System . ComponentModel . ISupportInitialize ) ( this . picLicensePlate ) ) . EndInit ( ) ; <nl> + ( ( System . ComponentModel . ISupportInitialize ) ( this . picOriginal ) ) . EndInit ( ) ; <nl> + this . ResumeLayout ( false ) ; <nl> + this . PerformLayout ( ) ; <nl> + <nl> + } <nl> + <nl> + # endregion <nl> + <nl> + private System . Windows . Forms . Button btnDetect ; <nl> + private System . Windows . Forms . PictureBox picLicensePlate ; <nl> + private System . Windows . Forms . PictureBox picOriginal ; <nl> + private System . Windows . Forms . ListBox lbxPlates ; <nl> + private System . Windows . Forms . Label label1 ; <nl> + private System . Windows . Forms . Label label2 ; <nl> + private System . Windows . Forms . Label label3 ; <nl> + private System . Windows . Forms . OpenFileDialog openFileDialog ; <nl> + private System . Windows . Forms . Label label4 ; <nl> + private System . Windows . Forms . RadioButton rbUSA ; <nl> + private System . Windows . Forms . RadioButton rbEU ; <nl> + } <nl> + } <nl> + <nl> new file mode 100644 <nl> index 00000000 . . f0fec9a4 <nl> mmm / dev / null <nl> ppp b / src / bindings / csharp / AlprNetGuiTest / Form1 . cs <nl> <nl> + / * <nl> + * Copyright ( c ) 2015 OpenALPR Technology , Inc . <nl> + * <nl> + * This file is part of OpenALPR . <nl> + * <nl> + * OpenALPR is free software : you can redistribute it and / or modify <nl> + * it under the terms of the GNU Affero General Public License <nl> + * version 3 as published by the Free Software Foundation <nl> + * <nl> + * This program is distributed in the hope that it will be useful , <nl> + * but WITHOUT ANY WARRANTY ; without even the implied warranty of <nl> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE . See the <nl> + * GNU Affero General Public License for more details . <nl> + * <nl> + * You should have received a copy of the GNU Affero General Public License <nl> + * along with this program . If not , see < http : / / www . gnu . org / licenses / > . <nl> + * / <nl> + <nl> + using System ; <nl> + using System . Collections . Generic ; <nl> + using System . Drawing ; <nl> + using System . IO ; <nl> + using System . Linq ; <nl> + using System . Reflection ; <nl> + using System . Windows . Forms ; <nl> + using AlprNet ; <nl> + using AlprNet . Models ; <nl> + <nl> + namespace AlprNetGuiTest <nl> + { <nl> + public partial class Form1 : Form <nl> + { <nl> + public Form1 ( ) <nl> + { <nl> + InitializeComponent ( ) ; <nl> + } <nl> + <nl> + public static string AssemblyDirectory <nl> + { <nl> + get <nl> + { <nl> + var codeBase = Assembly . GetExecutingAssembly ( ) . CodeBase ; <nl> + var uri = new UriBuilder ( codeBase ) ; <nl> + var path = Uri . UnescapeDataString ( uri . Path ) ; <nl> + return Path . GetDirectoryName ( path ) ; <nl> + } <nl> + } <nl> + <nl> + public Rectangle boundingRectangle ( List < Point > points ) <nl> + { <nl> + / / Add checks here , if necessary , to make sure that points is not null , <nl> + / / and that it contains at least one ( or perhaps two ? ) elements <nl> + <nl> + var minX = points . Min ( p = > p . X ) ; <nl> + var minY = points . Min ( p = > p . Y ) ; <nl> + var maxX = points . Max ( p = > p . X ) ; <nl> + var maxY = points . Max ( p = > p . Y ) ; <nl> + <nl> + return new Rectangle ( new Point ( minX , minY ) , new Size ( maxX - minX , maxY - minY ) ) ; <nl> + } <nl> + <nl> + private static Image cropImage ( Image img , Rectangle cropArea ) <nl> + { <nl> + var bmpImage = new Bitmap ( img ) ; <nl> + return bmpImage . Clone ( cropArea , bmpImage . PixelFormat ) ; <nl> + } <nl> + <nl> + public static Bitmap combineImages ( List < Image > images ) <nl> + { <nl> + / / read all images into memory <nl> + Bitmap finalImage = null ; <nl> + <nl> + try <nl> + { <nl> + var width = 0 ; <nl> + var height = 0 ; <nl> + <nl> + foreach ( var bmp in images ) <nl> + { <nl> + width + = bmp . Width ; <nl> + height = bmp . Height > height ? bmp . Height : height ; <nl> + } <nl> + <nl> + / / create a bitmap to hold the combined image <nl> + finalImage = new Bitmap ( width , height ) ; <nl> + <nl> + / / get a graphics object from the image so we can draw on it <nl> + using ( var g = Graphics . FromImage ( finalImage ) ) <nl> + { <nl> + / / set background color <nl> + g . Clear ( Color . Black ) ; <nl> + <nl> + / / go through each image and draw it on the final image <nl> + var offset = 0 ; <nl> + foreach ( Bitmap image in images ) <nl> + { <nl> + g . DrawImage ( image , <nl> + new Rectangle ( offset , 0 , image . Width , image . Height ) ) ; <nl> + offset + = image . Width ; <nl> + } <nl> + } <nl> + <nl> + return finalImage ; <nl> + } <nl> + catch ( Exception ex ) <nl> + { <nl> + if ( finalImage ! = null ) <nl> + finalImage . Dispose ( ) ; <nl> + <nl> + throw ex ; <nl> + } <nl> + finally <nl> + { <nl> + / / clean up memory <nl> + foreach ( var image in images ) <nl> + { <nl> + image . Dispose ( ) ; <nl> + } <nl> + } <nl> + } <nl> + <nl> + private void button1_Click ( object sender , EventArgs e ) <nl> + { <nl> + if ( openFileDialog . ShowDialog ( this ) = = DialogResult . OK ) <nl> + { <nl> + processImageFile ( openFileDialog . FileName ) ; <nl> + } <nl> + } <nl> + <nl> + <nl> + private void processImageFile ( string fileName ) <nl> + { <nl> + resetControls ( ) ; <nl> + var region = rbUSA . Checked ? " us " : " eu " ; <nl> + String config_file = Path . Combine ( AssemblyDirectory , " openalpr . conf " ) ; <nl> + String runtime_data_dir = Path . Combine ( AssemblyDirectory , " runtime_data " ) ; <nl> + using ( var alpr = new Alpr ( region , config_file , runtime_data_dir ) ) <nl> + { <nl> + alpr . Initialize ( ) ; <nl> + <nl> + if ( ! alpr . IsLoaded ( ) ) <nl> + { <nl> + lbxPlates . Items . Add ( " Error initializing OpenALPR " ) ; <nl> + return ; <nl> + } <nl> + picOriginal . ImageLocation = fileName ; <nl> + picOriginal . Load ( ) ; <nl> + <nl> + var results = alpr . Recognize ( fileName ) ; <nl> + <nl> + var images = new List < Image > ( results . results . Count ( ) ) ; <nl> + var i = 1 ; <nl> + foreach ( var result in results . results ) <nl> + { <nl> + List < Point > points = new List < Point > ( ) ; <nl> + foreach ( Coordinate c in result . coordinates ) <nl> + points . Add ( new Point ( c . x , c . y ) ) ; <nl> + <nl> + var rect = boundingRectangle ( points ) ; <nl> + var img = Image . FromFile ( fileName ) ; <nl> + var cropped = cropImage ( img , rect ) ; <nl> + images . Add ( cropped ) ; <nl> + <nl> + lbxPlates . Items . Add ( " \ t \ t - - Plate # " + i + + + " - - " ) ; <nl> + foreach ( var plate in result . candidates ) <nl> + { <nl> + lbxPlates . Items . Add ( string . Format ( @ " { 0 } { 1 } % { 2 } " , <nl> + plate . plate . PadRight ( 12 ) , <nl> + plate . confidence . ToString ( " N1 " ) . PadLeft ( 8 ) , <nl> + plate . matches_template . ToString ( ) . PadLeft ( 8 ) ) ) ; <nl> + } <nl> + } <nl> + <nl> + if ( images . Any ( ) ) <nl> + { <nl> + picLicensePlate . Image = combineImages ( images ) ; <nl> + } <nl> + } <nl> + } <nl> + <nl> + private void resetControls ( ) <nl> + { <nl> + picOriginal . Image = null ; <nl> + picLicensePlate . Image = null ; <nl> + lbxPlates . Items . Clear ( ) ; <nl> + } <nl> + <nl> + private void Form1_Load ( object sender , EventArgs e ) <nl> + { <nl> + resetControls ( ) ; <nl> + } <nl> + } <nl> + } <nl> \ No newline at end of file <nl> new file mode 100644 <nl> index 00000000 . . 12048a9f <nl> mmm / dev / null <nl> ppp b / src / bindings / csharp / AlprNetGuiTest / Form1 . resx <nl> <nl> + < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> + < root > <nl> + < ! - - <nl> + Microsoft ResX Schema <nl> + <nl> + Version 2 . 0 <nl> + <nl> + The primary goals of this format is to allow a simple XML format <nl> + that is mostly human readable . The generation and parsing of the <nl> + various data types are done through the TypeConverter classes <nl> + associated with the data types . <nl> + <nl> + Example : <nl> + <nl> + . . . ado . net / XML headers & schema . . . <nl> + < resheader name = " resmimetype " > text / microsoft - resx < / resheader > <nl> + < resheader name = " version " > 2 . 0 < / resheader > <nl> + < resheader name = " reader " > System . Resources . ResXResourceReader , System . Windows . Forms , . . . < / resheader > <nl> + < resheader name = " writer " > System . Resources . ResXResourceWriter , System . Windows . Forms , . . . < / resheader > <nl> + < data name = " Name1 " > < value > this is my long string < / value > < comment > this is a comment < / comment > < / data > <nl> + < data name = " Color1 " type = " System . Drawing . Color , System . Drawing " > Blue < / data > <nl> + < data name = " Bitmap1 " mimetype = " application / x - microsoft . net . object . binary . base64 " > <nl> + < value > [ base64 mime encoded serialized . NET Framework object ] < / value > <nl> + < / data > <nl> + < data name = " Icon1 " type = " System . Drawing . Icon , System . Drawing " mimetype = " application / x - microsoft . net . object . bytearray . base64 " > <nl> + < value > [ base64 mime encoded string representing a byte array form of the . NET Framework object ] < / value > <nl> + < comment > This is a comment < / comment > <nl> + < / data > <nl> + <nl> + There are any number of " resheader " rows that contain simple <nl> + name / value pairs . <nl> + <nl> + Each data row contains a name , and value . The row also contains a <nl> + type or mimetype . Type corresponds to a . NET class that support <nl> + text / value conversion through the TypeConverter architecture . <nl> + Classes that don ' t support this are serialized and stored with the <nl> + mimetype set . <nl> + <nl> + The mimetype is used for serialized objects , and tells the <nl> + ResXResourceReader how to depersist the object . This is currently not <nl> + extensible . For a given mimetype the value must be set accordingly : <nl> + <nl> + Note - application / x - microsoft . net . object . binary . base64 is the format <nl> + that the ResXResourceWriter will generate , however the reader can <nl> + read any of the formats listed below . <nl> + <nl> + mimetype : application / x - microsoft . net . object . binary . base64 <nl> + value : The object must be serialized with <nl> + : System . Runtime . Serialization . Formatters . Binary . BinaryFormatter <nl> + : and then encoded with base64 encoding . <nl> + <nl> + mimetype : application / x - microsoft . net . object . soap . base64 <nl> + value : The object must be serialized with <nl> + : System . Runtime . Serialization . Formatters . Soap . SoapFormatter <nl> + : and then encoded with base64 encoding . <nl> + <nl> + mimetype : application / x - microsoft . net . object . bytearray . base64 <nl> + value : The object must be serialized into a byte array <nl> + : using a System . ComponentModel . TypeConverter <nl> + : and then encoded with base64 encoding . <nl> + - - > <nl> + < xsd : schema id = " root " xmlns = " " xmlns : xsd = " http : / / www . w3 . org / 2001 / XMLSchema " xmlns : msdata = " urn : schemas - microsoft - com : xml - msdata " > <nl> + < xsd : import namespace = " http : / / www . w3 . org / XML / 1998 / namespace " / > <nl> + < xsd : element name = " root " msdata : IsDataSet = " true " > <nl> + < xsd : complexType > <nl> + < xsd : choice maxOccurs = " unbounded " > <nl> + < xsd : element name = " metadata " > <nl> + < xsd : complexType > <nl> + < xsd : sequence > <nl> + < xsd : element name = " value " type = " xsd : string " minOccurs = " 0 " / > <nl> + < / xsd : sequence > <nl> + < xsd : attribute name = " name " use = " required " type = " xsd : string " / > <nl> + < xsd : attribute name = " type " type = " xsd : string " / > <nl> + < xsd : attribute name = " mimetype " type = " xsd : string " / > <nl> + < xsd : attribute ref = " xml : space " / > <nl> + < / xsd : complexType > <nl> + < / xsd : element > <nl> + < xsd : element name = " assembly " > <nl> + < xsd : complexType > <nl> + < xsd : attribute name = " alias " type = " xsd : string " / > <nl> + < xsd : attribute name = " name " type = " xsd : string " / > <nl> + < / xsd : complexType > <nl> + < / xsd : element > <nl> + < xsd : element name = " data " > <nl> + < xsd : complexType > <nl> + < xsd : sequence > <nl> + < xsd : element name = " value " type = " xsd : string " minOccurs = " 0 " msdata : Ordinal = " 1 " / > <nl> + < xsd : element name = " comment " type = " xsd : string " minOccurs = " 0 " msdata : Ordinal = " 2 " / > <nl> + < / xsd : sequence > <nl> + < xsd : attribute name = " name " type = " xsd : string " use = " required " msdata : Ordinal = " 1 " / > <nl> + < xsd : attribute name = " type " type = " xsd : string " msdata : Ordinal = " 3 " / > <nl> + < xsd : attribute name = " mimetype " type = " xsd : string " msdata : Ordinal = " 4 " / > <nl> + < xsd : attribute ref = " xml : space " / > <nl> + < / xsd : complexType > <nl> + < / xsd : element > <nl> + < xsd : element name = " resheader " > <nl> + < xsd : complexType > <nl> + < xsd : sequence > <nl> + < xsd : element name = " value " type = " xsd : string " minOccurs = " 0 " msdata : Ordinal = " 1 " / > <nl> + < / xsd : sequence > <nl> + < xsd : attribute name = " name " type = " xsd : string " use = " required " / > <nl> + < / xsd : complexType > <nl> + < / xsd : element > <nl> + < / xsd : choice > <nl> + < / xsd : complexType > <nl> + < / xsd : element > <nl> + < / xsd : schema > <nl> + < resheader name = " resmimetype " > <nl> + < value > text / microsoft - resx < / value > <nl> + < / resheader > <nl> + < resheader name = " version " > <nl> + < value > 2 . 0 < / value > <nl> + < / resheader > <nl> + < resheader name = " reader " > <nl> + < value > System . Resources . ResXResourceReader , System . Windows . Forms , Version = 4 . 0 . 0 . 0 , Culture = neutral , PublicKeyToken = b77a5c561934e089 < / value > <nl> + < / resheader > <nl> + < resheader name = " writer " > <nl> + < value > System . Resources . ResXResourceWriter , System . Windows . Forms , Version = 4 . 0 . 0 . 0 , Culture = neutral , PublicKeyToken = b77a5c561934e089 < / value > <nl> + < / resheader > <nl> + < metadata name = " openFileDialog . TrayLocation " type = " System . Drawing . Point , System . Drawing , Version = 4 . 0 . 0 . 0 , Culture = neutral , PublicKeyToken = b03f5f7f11d50a3a " > <nl> + < value > 17 , 17 < / value > <nl> + < / metadata > <nl> + < / root > <nl> \ No newline at end of file <nl> new file mode 100644 <nl> index 00000000 . . 6fe5bfe8 <nl> mmm / dev / null <nl> ppp b / src / bindings / csharp / AlprNetGuiTest / Program . cs <nl> <nl> + / * <nl> + * Copyright ( c ) 2015 OpenALPR Technology , Inc . <nl> + * <nl> + * This file is part of OpenALPR . <nl> + * <nl> + * OpenALPR is free software : you can redistribute it and / or modify <nl> + * it under the terms of the GNU Affero General Public License <nl> + * version 3 as published by the Free Software Foundation <nl> + * <nl> + * This program is distributed in the hope that it will be useful , <nl> + * but WITHOUT ANY WARRANTY ; without even the implied warranty of <nl> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE . See the <nl> + * GNU Affero General Public License for more details . <nl> + * <nl> + * You should have received a copy of the GNU Affero General Public License <nl> + * along with this program . If not , see < http : / / www . gnu . org / licenses / > . <nl> + * / <nl> + <nl> + using System ; <nl> + using System . Collections . Generic ; <nl> + using System . Linq ; <nl> + using System . Windows . Forms ; <nl> + <nl> + namespace AlprNetGuiTest <nl> + { <nl> + static class Program <nl> + { <nl> + / / / < summary > <nl> + / / / The main entry point for the application . <nl> + / / / < / summary > <nl> + [ STAThread ] <nl> + static void Main ( ) <nl> + { <nl> + Application . EnableVisualStyles ( ) ; <nl> + Application . SetCompatibleTextRenderingDefault ( false ) ; <nl> + Application . Run ( new Form1 ( ) ) ; <nl> + } <nl> + } <nl> + } <nl> new file mode 100644 <nl> index 00000000 . . 96663388 <nl> mmm / dev / null <nl> ppp b / src / bindings / csharp / AlprNetGuiTest / Properties / AssemblyInfo . cs <nl> <nl> + using System . Reflection ; <nl> + using System . Runtime . CompilerServices ; <nl> + using System . Runtime . InteropServices ; <nl> + <nl> + / / General Information about an assembly is controlled through the following <nl> + / / set of attributes . Change these attribute values to modify the information <nl> + / / associated with an assembly . <nl> + [ assembly : AssemblyTitle ( " openalprnet - windemo " ) ] <nl> + [ assembly : AssemblyDescription ( " " ) ] <nl> + [ assembly : AssemblyConfiguration ( " " ) ] <nl> + [ assembly : AssemblyCompany ( " " ) ] <nl> + [ assembly : AssemblyProduct ( " openalprnet - windemo " ) ] <nl> + [ assembly : AssemblyCopyright ( " Copyright © 2015 " ) ] <nl> + [ assembly : AssemblyTrademark ( " " ) ] <nl> + [ assembly : AssemblyCulture ( " " ) ] <nl> + <nl> + / / Setting ComVisible to false makes the types in this assembly not visible <nl> + / / to COM components . If you need to access a type in this assembly from <nl> + / / COM , set the ComVisible attribute to true on that type . <nl> + [ assembly : ComVisible ( false ) ] <nl> + <nl> + / / The following GUID is for the ID of the typelib if this project is exposed to COM <nl> + [ assembly : Guid ( " b1ab96ca - afe9 - 497d - 9aa0 - 74ace195dfca " ) ] <nl> + <nl> + / / Version information for an assembly consists of the following four values : <nl> + / / <nl> + / / Major Version <nl> + / / Minor Version <nl> + / / Build Number <nl> + / / Revision <nl> + / / <nl> + / / You can specify all the values or you can default the Build and Revision Numbers <nl> + / / by using the ' * ' as shown below : <nl> + / / [ assembly : AssemblyVersion ( " 1 . 0 . * " ) ] <nl> + [ assembly : AssemblyVersion ( " 1 . 0 . 0 . 0 " ) ] <nl> + [ assembly : AssemblyFileVersion ( " 1 . 0 . 0 . 0 " ) ] <nl> new file mode 100644 <nl> index 00000000 . . 7057aff2 <nl> mmm / dev / null <nl> ppp b / src / bindings / csharp / AlprNetGuiTest / Properties / Resources . Designer . cs <nl> <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm <nl> + / / < auto - generated > <nl> + / / This code was generated by a tool . <nl> + / / Runtime Version : 4 . 0 . 30319 . 42000 <nl> + / / <nl> + / / Changes to this file may cause incorrect behavior and will be lost if <nl> + / / the code is regenerated . <nl> + / / < / auto - generated > <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm <nl> + <nl> + namespace AlprNetGuiTest . Properties { <nl> + using System ; <nl> + <nl> + <nl> + / / / < summary > <nl> + / / / A strongly - typed resource class , for looking up localized strings , etc . <nl> + / / / < / summary > <nl> + / / This class was auto - generated by the StronglyTypedResourceBuilder <nl> + / / class via a tool like ResGen or Visual Studio . <nl> + / / To add or remove a member , edit your . ResX file then rerun ResGen <nl> + / / with the / str option , or rebuild your VS project . <nl> + [ global : : System . CodeDom . Compiler . GeneratedCodeAttribute ( " System . Resources . Tools . StronglyTypedResourceBuilder " , " 4 . 0 . 0 . 0 " ) ] <nl> + [ global : : System . Diagnostics . DebuggerNonUserCodeAttribute ( ) ] <nl> + [ global : : System . Runtime . CompilerServices . CompilerGeneratedAttribute ( ) ] <nl> + internal class Resources { <nl> + <nl> + private static global : : System . Resources . ResourceManager resourceMan ; <nl> + <nl> + private static global : : System . Globalization . CultureInfo resourceCulture ; <nl> + <nl> + [ global : : System . Diagnostics . CodeAnalysis . SuppressMessageAttribute ( " Microsoft . Performance " , " CA1811 : AvoidUncalledPrivateCode " ) ] <nl> + internal Resources ( ) { <nl> + } <nl> + <nl> + / / / < summary > <nl> + / / / Returns the cached ResourceManager instance used by this class . <nl> + / / / < / summary > <nl> + [ global : : System . ComponentModel . EditorBrowsableAttribute ( global : : System . ComponentModel . EditorBrowsableState . Advanced ) ] <nl> + internal static global : : System . Resources . ResourceManager ResourceManager { <nl> + get { <nl> + if ( object . ReferenceEquals ( resourceMan , null ) ) { <nl> + global : : System . Resources . ResourceManager temp = new global : : System . Resources . ResourceManager ( " AlprNetGuiTest . Properties . Resources " , typeof ( Resources ) . Assembly ) ; <nl> + resourceMan = temp ; <nl> + } <nl> + return resourceMan ; <nl> + } <nl> + } <nl> + <nl> + / / / < summary > <nl> + / / / Overrides the current thread ' s CurrentUICulture property for all <nl> + / / / resource lookups using this strongly typed resource class . <nl> + / / / < / summary > <nl> + [ global : : System . ComponentModel . EditorBrowsableAttribute ( global : : System . ComponentModel . EditorBrowsableState . Advanced ) ] <nl> + internal static global : : System . Globalization . CultureInfo Culture { <nl> + get { <nl> + return resourceCulture ; <nl> + } <nl> + set { <nl> + resourceCulture = value ; <nl> + } <nl> + } <nl> + } <nl> + } <nl> new file mode 100644 <nl> index 00000000 . . af7dbebb <nl> mmm / dev / null <nl> ppp b / src / bindings / csharp / AlprNetGuiTest / Properties / Resources . resx <nl> <nl> + < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> + < root > <nl> + < ! - - <nl> + Microsoft ResX Schema <nl> + <nl> + Version 2 . 0 <nl> + <nl> + The primary goals of this format is to allow a simple XML format <nl> + that is mostly human readable . The generation and parsing of the <nl> + various data types are done through the TypeConverter classes <nl> + associated with the data types . <nl> + <nl> + Example : <nl> + <nl> + . . . ado . net / XML headers & schema . . . <nl> + < resheader name = " resmimetype " > text / microsoft - resx < / resheader > <nl> + < resheader name = " version " > 2 . 0 < / resheader > <nl> + < resheader name = " reader " > System . Resources . ResXResourceReader , System . Windows . Forms , . . . < / resheader > <nl> + < resheader name = " writer " > System . Resources . ResXResourceWriter , System . Windows . Forms , . . . < / resheader > <nl> + < data name = " Name1 " > < value > this is my long string < / value > < comment > this is a comment < / comment > < / data > <nl> + < data name = " Color1 " type = " System . Drawing . Color , System . Drawing " > Blue < / data > <nl> + < data name = " Bitmap1 " mimetype = " application / x - microsoft . net . object . binary . base64 " > <nl> + < value > [ base64 mime encoded serialized . NET Framework object ] < / value > <nl> + < / data > <nl> + < data name = " Icon1 " type = " System . Drawing . Icon , System . Drawing " mimetype = " application / x - microsoft . net . object . bytearray . base64 " > <nl> + < value > [ base64 mime encoded string representing a byte array form of the . NET Framework object ] < / value > <nl> + < comment > This is a comment < / comment > <nl> + < / data > <nl> + <nl> + There are any number of " resheader " rows that contain simple <nl> + name / value pairs . <nl> + <nl> + Each data row contains a name , and value . The row also contains a <nl> + type or mimetype . Type corresponds to a . NET class that support <nl> + text / value conversion through the TypeConverter architecture . <nl> + Classes that don ' t support this are serialized and stored with the <nl> + mimetype set . <nl> + <nl> + The mimetype is used for serialized objects , and tells the <nl> + ResXResourceReader how to depersist the object . This is currently not <nl> + extensible . For a given mimetype the value must be set accordingly : <nl> + <nl> + Note - application / x - microsoft . net . object . binary . base64 is the format <nl> + that the ResXResourceWriter will generate , however the reader can <nl> + read any of the formats listed below . <nl> + <nl> + mimetype : application / x - microsoft . net . object . binary . base64 <nl> + value : The object must be serialized with <nl> + : System . Serialization . Formatters . Binary . BinaryFormatter <nl> + : and then encoded with base64 encoding . <nl> + <nl> + mimetype : application / x - microsoft . net . object . soap . base64 <nl> + value : The object must be serialized with <nl> + : System . Runtime . Serialization . Formatters . Soap . SoapFormatter <nl> + : and then encoded with base64 encoding . <nl> + <nl> + mimetype : application / x - microsoft . net . object . bytearray . base64 <nl> + value : The object must be serialized into a byte array <nl> + : using a System . ComponentModel . TypeConverter <nl> + : and then encoded with base64 encoding . <nl> + - - > <nl> + < xsd : schema id = " root " xmlns = " " xmlns : xsd = " http : / / www . w3 . org / 2001 / XMLSchema " xmlns : msdata = " urn : schemas - microsoft - com : xml - msdata " > <nl> + < xsd : element name = " root " msdata : IsDataSet = " true " > <nl> + < xsd : complexType > <nl> + < xsd : choice maxOccurs = " unbounded " > <nl> + < xsd : element name = " metadata " > <nl> + < xsd : complexType > <nl> + < xsd : sequence > <nl> + < xsd : element name = " value " type = " xsd : string " minOccurs = " 0 " / > <nl> + < / xsd : sequence > <nl> + < xsd : attribute name = " name " type = " xsd : string " / > <nl> + < xsd : attribute name = " type " type = " xsd : string " / > <nl> + < xsd : attribute name = " mimetype " type = " xsd : string " / > <nl> + < / xsd : complexType > <nl> + < / xsd : element > <nl> + < xsd : element name = " assembly " > <nl> + < xsd : complexType > <nl> + < xsd : attribute name = " alias " type = " xsd : string " / > <nl> + < xsd : attribute name = " name " type = " xsd : string " / > <nl> + < / xsd : complexType > <nl> + < / xsd : element > <nl> + < xsd : element name = " data " > <nl> + < xsd : complexType > <nl> + < xsd : sequence > <nl> + < xsd : element name = " value " type = " xsd : string " minOccurs = " 0 " msdata : Ordinal = " 1 " / > <nl> + < xsd : element name = " comment " type = " xsd : string " minOccurs = " 0 " msdata : Ordinal = " 2 " / > <nl> + < / xsd : sequence > <nl> + < xsd : attribute name = " name " type = " xsd : string " msdata : Ordinal = " 1 " / > <nl> + < xsd : attribute name = " type " type = " xsd : string " msdata : Ordinal = " 3 " / > <nl> + < xsd : attribute name = " mimetype " type = " xsd : string " msdata : Ordinal = " 4 " / > <nl> + < / xsd : complexType > <nl> + < / xsd : element > <nl> + < xsd : element name = " resheader " > <nl> + < xsd : complexType > <nl> + < xsd : sequence > <nl> + < xsd : element name = " value " type = " xsd : string " minOccurs = " 0 " msdata : Ordinal = " 1 " / > <nl> + < / xsd : sequence > <nl> + < xsd : attribute name = " name " type = " xsd : string " use = " required " / > <nl> + < / xsd : complexType > <nl> + < / xsd : element > <nl> + < / xsd : choice > <nl> + < / xsd : complexType > <nl> + < / xsd : element > <nl> + < / xsd : schema > <nl> + < resheader name = " resmimetype " > <nl> + < value > text / microsoft - resx < / value > <nl> + < / resheader > <nl> + < resheader name = " version " > <nl> + < value > 2 . 0 < / value > <nl> + < / resheader > <nl> + < resheader name = " reader " > <nl> + < value > System . Resources . ResXResourceReader , System . Windows . Forms , Version = 2 . 0 . 0 . 0 , Culture = neutral , PublicKeyToken = b77a5c561934e089 < / value > <nl> + < / resheader > <nl> + < resheader name = " writer " > <nl> + < value > System . Resources . ResXResourceWriter , System . Windows . Forms , Version = 2 . 0 . 0 . 0 , Culture = neutral , PublicKeyToken = b77a5c561934e089 < / value > <nl> + < / resheader > <nl> + < / root > <nl> \ No newline at end of file <nl> new file mode 100644 <nl> index 00000000 . . 14d21988 <nl> mmm / dev / null <nl> ppp b / src / bindings / csharp / AlprNetGuiTest / Properties / Settings . Designer . cs <nl> <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm <nl> + / / < auto - generated > <nl> + / / This code was generated by a tool . <nl> + / / Runtime Version : 4 . 0 . 30319 . 42000 <nl> + / / <nl> + / / Changes to this file may cause incorrect behavior and will be lost if <nl> + / / the code is regenerated . <nl> + / / < / auto - generated > <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm <nl> + <nl> + namespace AlprNetGuiTest . Properties { <nl> + <nl> + <nl> + [ global : : System . Runtime . CompilerServices . CompilerGeneratedAttribute ( ) ] <nl> + [ global : : System . CodeDom . Compiler . GeneratedCodeAttribute ( " Microsoft . VisualStudio . Editors . SettingsDesigner . SettingsSingleFileGenerator " , " 14 . 0 . 0 . 0 " ) ] <nl> + internal sealed partial class Settings : global : : System . Configuration . ApplicationSettingsBase { <nl> + <nl> + private static Settings defaultInstance = ( ( Settings ) ( global : : System . Configuration . ApplicationSettingsBase . Synchronized ( new Settings ( ) ) ) ) ; <nl> + <nl> + public static Settings Default { <nl> + get { <nl> + return defaultInstance ; <nl> + } <nl> + } <nl> + } <nl> + } <nl> new file mode 100644 <nl> index 00000000 . . 39645652 <nl> mmm / dev / null <nl> ppp b / src / bindings / csharp / AlprNetGuiTest / Properties / Settings . settings <nl> <nl> + < ? xml version = ' 1 . 0 ' encoding = ' utf - 8 ' ? > <nl> + < SettingsFile xmlns = " http : / / schemas . microsoft . com / VisualStudio / 2004 / 01 / settings " CurrentProfile = " ( Default ) " > <nl> + < Profiles > <nl> + < Profile Name = " ( Default ) " / > <nl> + < / Profiles > <nl> + < Settings / > <nl> + < / SettingsFile > <nl> new file mode 100644 <nl> index 00000000 . . 2f7cce78 <nl> mmm / dev / null <nl> ppp b / src / bindings / csharp / AlprNetGuiTest / app . config <nl> <nl> + < ? xml version = " 1 . 0 " ? > <nl> + < configuration > <nl> + < startup > < supportedRuntime version = " v4 . 0 " sku = " . NETFramework , Version = v4 . 0 , Profile = Client " / > < / startup > < / configuration > <nl> new file mode 100644 <nl> index 00000000 . . 681c3079 <nl> Binary files / dev / null and b / src / bindings / csharp / AlprNetGuiTest / appicon . ico differ <nl> new file mode 100644 <nl> index 00000000 . . 4a662e25 <nl> Binary files / dev / null and b / src / bindings / csharp / AlprNetGuiTest / appicon . png differ <nl> new file mode 100644 <nl> index 00000000 . . 6df479fe <nl> mmm / dev / null <nl> ppp b / src / bindings / csharp / AlprNetTest / AlprNetTest . csproj <nl> <nl> + < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> + < Project ToolsVersion = " 14 . 0 " DefaultTargets = " Build " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> + < Import Project = " $ ( MSBuildExtensionsPath ) \ $ ( MSBuildToolsVersion ) \ Microsoft . Common . props " Condition = " Exists ( ' $ ( MSBuildExtensionsPath ) \ $ ( MSBuildToolsVersion ) \ Microsoft . Common . props ' ) " / > <nl> + < PropertyGroup > <nl> + < Configuration Condition = " ' $ ( Configuration ) ' = = ' ' " > Debug < / Configuration > <nl> + < Platform Condition = " ' $ ( Platform ) ' = = ' ' " > AnyCPU < / Platform > <nl> + < ProjectGuid > { BA97FA53 - 9F76 - 42FD - 90A4 - E3BDBA3B66C3 } < / ProjectGuid > <nl> + < OutputType > Exe < / OutputType > <nl> + < AppDesignerFolder > Properties < / AppDesignerFolder > <nl> + < RootNamespace > AlprNetTest < / RootNamespace > <nl> + < AssemblyName > AlprNetTest < / AssemblyName > <nl> + < TargetFrameworkVersion > v3 . 0 < / TargetFrameworkVersion > <nl> + < FileAlignment > 512 < / FileAlignment > <nl> + < AutoGenerateBindingRedirects > true < / AutoGenerateBindingRedirects > <nl> + < TargetFrameworkProfile / > <nl> + < / PropertyGroup > <nl> + < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | AnyCPU ' " > <nl> + < PlatformTarget > AnyCPU < / PlatformTarget > <nl> + < DebugSymbols > true < / DebugSymbols > <nl> + < DebugType > full < / DebugType > <nl> + < Optimize > false < / Optimize > <nl> + < OutputPath > bin \ Debug \ < / OutputPath > <nl> + < DefineConstants > DEBUG ; TRACE < / DefineConstants > <nl> + < ErrorReport > prompt < / ErrorReport > <nl> + < WarningLevel > 4 < / WarningLevel > <nl> + < / PropertyGroup > <nl> + < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | AnyCPU ' " > <nl> + < PlatformTarget > AnyCPU < / PlatformTarget > <nl> + < DebugType > pdbonly < / DebugType > <nl> + < Optimize > true < / Optimize > <nl> + < OutputPath > bin \ Release \ < / OutputPath > <nl> + < DefineConstants > TRACE < / DefineConstants > <nl> + < ErrorReport > prompt < / ErrorReport > <nl> + < WarningLevel > 4 < / WarningLevel > <nl> + < / PropertyGroup > <nl> + < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " > <nl> + < DebugSymbols > true < / DebugSymbols > <nl> + < OutputPath > bin \ x64 \ Debug \ < / OutputPath > <nl> + < DefineConstants > DEBUG ; TRACE < / DefineConstants > <nl> + < DebugType > full < / DebugType > <nl> + < PlatformTarget > x64 < / PlatformTarget > <nl> + < ErrorReport > prompt < / ErrorReport > <nl> + < CodeAnalysisRuleSet > MinimumRecommendedRules . ruleset < / CodeAnalysisRuleSet > <nl> + < Prefer32Bit > true < / Prefer32Bit > <nl> + < / PropertyGroup > <nl> + < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " > <nl> + < OutputPath > bin \ x64 \ Release \ < / OutputPath > <nl> + < DefineConstants > TRACE < / DefineConstants > <nl> + < Optimize > true < / Optimize > <nl> + < DebugType > pdbonly < / DebugType > <nl> + < PlatformTarget > x64 < / PlatformTarget > <nl> + < ErrorReport > prompt < / ErrorReport > <nl> + < CodeAnalysisRuleSet > MinimumRecommendedRules . ruleset < / CodeAnalysisRuleSet > <nl> + < Prefer32Bit > true < / Prefer32Bit > <nl> + < / PropertyGroup > <nl> + < ItemGroup > <nl> + < Reference Include = " System " / > <nl> + < Reference Include = " System . Drawing " / > <nl> + < Reference Include = " System . Data " / > <nl> + < Reference Include = " System . Xml " / > <nl> + < / ItemGroup > <nl> + < ItemGroup > <nl> + < Compile Include = " Program . cs " / > <nl> + < Compile Include = " Properties \ AssemblyInfo . cs " / > <nl> + < / ItemGroup > <nl> + < ItemGroup > <nl> + < None Include = " App . config " / > <nl> + < / ItemGroup > <nl> + < ItemGroup > <nl> + < ProjectReference Include = " . . \ alprnet \ AlprNet . csproj " > <nl> + < Project > { f6106c0e - 0e89 - 4d2e - 89e6 - 19742d54b9f6 } < / Project > <nl> + < Name > AlprNet < / Name > <nl> + < / ProjectReference > <nl> + < / ItemGroup > <nl> + < Import Project = " $ ( MSBuildToolsPath ) \ Microsoft . CSharp . targets " / > <nl> + < ! - - To modify your build process , add your task inside one of the targets below and uncomment it . <nl> + Other similar extension points exist , see Microsoft . Common . targets . <nl> + < Target Name = " BeforeBuild " > <nl> + < / Target > <nl> + < Target Name = " AfterBuild " > <nl> + < / Target > <nl> + - - > <nl> + < / Project > <nl> \ No newline at end of file <nl> new file mode 100644 <nl> index 00000000 . . 343984d0 <nl> mmm / dev / null <nl> ppp b / src / bindings / csharp / AlprNetTest / App . config <nl> <nl> + < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> + < configuration > <nl> + < startup > <nl> + <nl> + < supportedRuntime version = " v2 . 0 . 50727 " / > < / startup > <nl> + < / configuration > <nl> new file mode 100644 <nl> index 00000000 . . 93c0b54e <nl> mmm / dev / null <nl> ppp b / src / bindings / csharp / AlprNetTest / Program . cs <nl> <nl> + using System ; <nl> + <nl> + <nl> + namespace AlprNetTest <nl> + { <nl> + class Program <nl> + { <nl> + static void Main ( string [ ] args ) <nl> + { <nl> + <nl> + / / Create the object <nl> + AlprNet . Alpr alpr = new AlprNet . Alpr ( " us " ) ; <nl> + <nl> + / / Initialize the OpenALPR runtime data . This must be called only once , and may take a few seconds to initialize <nl> + bool success = alpr . Initialize ( ) ; <nl> + <nl> + if ( ! success | | ! alpr . IsLoaded ( ) ) <nl> + { <nl> + Console . WriteLine ( " OpenALPR was not properly initialized . Exiting " ) ; <nl> + alpr . Dispose ( ) ; <nl> + return ; <nl> + } <nl> + <nl> + alpr . setTopN ( 10 ) ; <nl> + <nl> + AlprNet . Models . AlprResponse response = alpr . Recognize ( @ " c : \ projects \ openalpr - commercial \ image . jpg " ) ; <nl> + <nl> + Console . WriteLine ( " Analyzed an image that is { 0 } x { 1 } pixels " , response . img_width , response . img_height ) ; <nl> + Console . WriteLine ( " Detected { 0 } plates " , response . results . Count ) ; <nl> + <nl> + foreach ( AlprNet . Models . AlprResult result in response . results ) <nl> + { <nl> + Console . WriteLine ( " - { 0 } ( { 1 } % ) " , result . plate , result . confidence ) ; <nl> + <nl> + Console . WriteLine ( " Top N candidates : " ) ; <nl> + foreach ( AlprNet . Models . Candidate candidate in result . candidates ) <nl> + { <nl> + Console . WriteLine ( " - { 0 } ( { 1 } % ) " , candidate . plate , candidate . confidence ) ; <nl> + } <nl> + } <nl> + <nl> + / / Free the OpenALPR instance ' s memory . <nl> + alpr . Dispose ( ) ; <nl> + <nl> + Console . WriteLine ( " \ nPress any key to continue . . . " ) ; <nl> + Console . ReadKey ( ) ; <nl> + } <nl> + } <nl> + } <nl> new file mode 100644 <nl> index 00000000 . . 7432c813 <nl> mmm / dev / null <nl> ppp b / src / bindings / csharp / AlprNetTest / Properties / AssemblyInfo . cs <nl> <nl> + using System . Reflection ; <nl> + using System . Runtime . CompilerServices ; <nl> + using System . Runtime . InteropServices ; <nl> + <nl> + / / General Information about an assembly is controlled through the following <nl> + / / set of attributes . Change these attribute values to modify the information <nl> + / / associated with an assembly . <nl> + [ assembly : AssemblyTitle ( " AlprNetTest " ) ] <nl> + [ assembly : AssemblyDescription ( " " ) ] <nl> + [ assembly : AssemblyConfiguration ( " " ) ] <nl> + [ assembly : AssemblyCompany ( " " ) ] <nl> + [ assembly : AssemblyProduct ( " AlprNetTest " ) ] <nl> + [ assembly : AssemblyCopyright ( " Copyright © 2016 " ) ] <nl> + [ assembly : AssemblyTrademark ( " " ) ] <nl> + [ assembly : AssemblyCulture ( " " ) ] <nl> + <nl> + / / Setting ComVisible to false makes the types in this assembly not visible <nl> + / / to COM components . If you need to access a type in this assembly from <nl> + / / COM , set the ComVisible attribute to true on that type . <nl> + [ assembly : ComVisible ( false ) ] <nl> + <nl> + / / The following GUID is for the ID of the typelib if this project is exposed to COM <nl> + [ assembly : Guid ( " ba97fa53 - 9f76 - 42fd - 90a4 - e3bdba3b66c3 " ) ] <nl> + <nl> + / / Version information for an assembly consists of the following four values : <nl> + / / <nl> + / / Major Version <nl> + / / Minor Version <nl> + / / Build Number <nl> + / / Revision <nl> + / / <nl> + / / You can specify all the values or you can default the Build and Revision Numbers <nl> + / / by using the ' * ' as shown below : <nl> + / / [ assembly : AssemblyVersion ( " 1 . 0 . * " ) ] <nl> + [ assembly : AssemblyVersion ( " 1 . 0 . 0 . 0 " ) ] <nl> + [ assembly : AssemblyFileVersion ( " 1 . 0 . 0 . 0 " ) ] <nl> new file mode 100644 <nl> index 00000000 . . 9affcdb8 <nl> mmm / dev / null <nl> ppp b / src / bindings / csharp / alprnet / Alpr . cs <nl> <nl> + using System ; <nl> + using System . Runtime . InteropServices ; <nl> + using Newtonsoft . Json ; <nl> + <nl> + using AlprNet . Models ; <nl> + <nl> + namespace AlprNet <nl> + { <nl> + public class Alpr : IDisposable <nl> + { <nl> + private const int REALLY_BIG_PIXEL_WIDTH = 999999999 ; <nl> + private bool is_initialized = false ; <nl> + private string country ; <nl> + private string config_file ; <nl> + private string runtime_dir ; <nl> + private IntPtr native_instance ; <nl> + <nl> + / / / < summary > <nl> + / / / OpenALPR library constructor . The object must be initialized separately with a call to Initialize ( ) <nl> + / / / < / summary > <nl> + / / / < param name = " country " > Country used for recognition . It may be a single country ( e . g . , " us " ) or a comma separated list < / param > <nl> + / / / < param name = " config_file " > The path to the openalpr . conf file . Leave it blank to use the file in the current directory . < / param > <nl> + / / / < param name = " runtime_dir " > The path to the runtime_data directory . Leave it blank to use the runtime_data in the current directory < / param > <nl> + public Alpr ( string country , string config_file = " " , string runtime_dir = " " ) <nl> + { <nl> + this . country = country ; <nl> + this . config_file = config_file ; <nl> + this . runtime_dir = runtime_dir ; <nl> + } <nl> + <nl> + ~ Alpr ( ) <nl> + { <nl> + Dispose ( ) ; <nl> + } <nl> + <nl> + / / / < summary > <nl> + / / / Release the memory associated with OpenALPR when you are done using it <nl> + / / / < / summary > <nl> + public void Dispose ( ) <nl> + { <nl> + Dispose ( true ) ; <nl> + } <nl> + <nl> + protected virtual void Dispose ( bool disposing ) <nl> + { <nl> + <nl> + / / Deinitialize the library <nl> + if ( this . is_initialized ) <nl> + { <nl> + try <nl> + { <nl> + / / Destroy the native obj <nl> + openalpr_cleanup ( native_instance ) ; <nl> + } <nl> + catch ( System . DllNotFoundException ) <nl> + { <nl> + / / Ignore . The library couldn ' t possibly be loaded anyway <nl> + } <nl> + } <nl> + this . is_initialized = false ; <nl> + } <nl> + / / / < summary > <nl> + / / / Load the OpenALPR recognition data into memory . <nl> + / / / Initialization may take several seconds to load all of the various LP recognition data into memory <nl> + / / / < / summary > <nl> + / / / < returns > True if successful , false otherwise < / returns > <nl> + public bool Initialize ( ) <nl> + { <nl> + / / Initialize the library <nl> + <nl> + if ( is_initialized ) <nl> + { <nl> + / / Idempotent behavior <nl> + return true ; <nl> + } <nl> + <nl> + this . is_initialized = true ; <nl> + <nl> + try <nl> + { <nl> + native_instance = openalpr_init ( country , config_file , runtime_dir ) ; <nl> + } <nl> + catch ( System . DllNotFoundException ) <nl> + { <nl> + Console . WriteLine ( " Could not find / load native library ( libopenalprc . dll ) " ) ; <nl> + return false ; <nl> + } <nl> + <nl> + return IsLoaded ( ) ; <nl> + <nl> + <nl> + } <nl> + <nl> + / / / < summary > <nl> + / / / Verifies that the OpenALPR library has been initialized <nl> + / / / < / summary > <nl> + / / / < returns > true if the library is ready to use , false if it has not been initialized to read plates < / returns > <nl> + public bool IsLoaded ( ) <nl> + { <nl> + if ( ! this . is_initialized ) <nl> + return false ; <nl> + <nl> + try <nl> + { <nl> + return openalpr_is_loaded ( this . native_instance ) ! = 0 ; <nl> + } <nl> + catch ( System . DllNotFoundException ) <nl> + { <nl> + return false ; <nl> + } <nl> + } <nl> + <nl> + / / Checks if the instance can receive commands ( e . g . , is initialized ) <nl> + / / If not , it throws an exception <nl> + private void check_initialization ( ) <nl> + { <nl> + if ( ! IsLoaded ( ) ) <nl> + throw new InvalidOperationException ( " OpenALPR Library cannot execute this request since it has not been initialized . " ) ; <nl> + } <nl> + <nl> + / / / < summary > <nl> + / / / Recognizes an encoded image ( e . g . , JPG , PNG , etc ) from a file on disk <nl> + / / / < / summary > <nl> + / / / < param name = " filepath " > The path to the image file < / param > <nl> + / / / < returns > An AlprResponse object that contains the results of the recognition < / returns > <nl> + / / / < exception cref = " InvalidOperationException " > Thrown when the library has not been initialized < / exception > <nl> + public AlprResponse Recognize ( string filepath ) <nl> + { <nl> + return Recognize ( System . IO . File . ReadAllBytes ( filepath ) ) ; <nl> + } <nl> + <nl> + / / / < summary > <nl> + / / / Recognizes an encoded image ( e . g . , JPG , PNG , etc ) provided as an array of bytes <nl> + / / / < / summary > <nl> + / / / < param name = " image_bytes " > The raw bytes that compose the image < / param > <nl> + / / / < returns > An AlprResponse object that contains the results of the recognition < / returns > <nl> + / / / < exception cref = " InvalidOperationException " > Thrown when the library has not been initialized < / exception > <nl> + public AlprResponse Recognize ( byte [ ] image_bytes ) <nl> + { <nl> + check_initialization ( ) ; <nl> + <nl> + NativeROI roi ; <nl> + roi . x = 0 ; <nl> + roi . y = 0 ; <nl> + roi . width = REALLY_BIG_PIXEL_WIDTH ; <nl> + roi . height = REALLY_BIG_PIXEL_WIDTH ; <nl> + <nl> + IntPtr unmanagedArray = Marshal . AllocHGlobal ( image_bytes . Length ) ; <nl> + Marshal . Copy ( image_bytes , 0 , unmanagedArray , image_bytes . Length ) ; <nl> + <nl> + IntPtr resp_ptr = openalpr_recognize_encodedimage ( this . native_instance , unmanagedArray , image_bytes . Length , roi ) ; <nl> + <nl> + Marshal . FreeHGlobal ( unmanagedArray ) ; <nl> + <nl> + / / Commented out test JSON string <nl> + / / string json = @ " { " " version " " : 2 , " " data_type " " : " " alpr_results " " , " " epoch_time " " : 1476716853320 , " " img_width " " : 600 , " " img_height " " : 600 , " " processing_time_ms " " : 116 . 557533 , " " regions_of_interest " " : [ { " " x " " : 0 , " " y " " : 0 , " " width " " : 600 , " " height " " : 600 } ] , " " results " " : [ { " " plate " " : " " 627WWI " " , " " confidence " " : 94 . 338623 , " " matches_template " " : 1 , " " plate_index " " : 0 , " " region " " : " " wa " " , " " region_confidence " " : 82 , " " processing_time_ms " " : 50 . 445648 , " " requested_topn " " : 10 , " " coordinates " " : [ { " " x " " : 242 , " " y " " : 360 } , { " " x " " : 358 , " " y " " : 362 } , { " " x " " : 359 , " " y " " : 412 } , { " " x " " : 241 , " " y " " : 408 } ] , " " candidates " " : [ { " " plate " " : " " 627WWI " " , " " confidence " " : 94 . 338623 , " " matches_template " " : 1 } , { " " plate " " : " " 627WKI " " , " " confidence " " : 80 . 588486 , " " matches_template " " : 1 } , { " " plate " " : " " 627WI " " , " " confidence " " : 79 . 943542 , " " matches_template " " : 0 } , { " " plate " " : " " 627WVI " " , " " confidence " " : 79 . 348930 , " " matches_template " " : 1 } , { " " plate " " : " " 627WRI " " , " " confidence " " : 79 . 196785 , " " matches_template " " : 1 } , { " " plate " " : " " 627WNI " " , " " confidence " " : 79 . 165802 , " " matches_template " " : 1 } ] } ] } " ; <nl> + <nl> + string json = Marshal . PtrToStringAnsi ( resp_ptr ) ; <nl> + AlprResponse response = JsonConvert . DeserializeObject < AlprResponse > ( json ) ; <nl> + openalpr_free_response_string ( resp_ptr ) ; <nl> + <nl> + return response ; <nl> + } <nl> + <nl> + / / / < summary > <nl> + / / / Recognizes an image from a . NET Bitmap object <nl> + / / / < / summary > <nl> + / / / < param name = " bitmap " > The . NET Bitmap object to recognize < / param > <nl> + / / / < returns > An AlprResponse object that contains the results of the recognition < / returns > <nl> + / / / < exception cref = " InvalidOperationException " > Thrown when the library has not been initialized < / exception > <nl> + public AlprResponse Recognize ( System . Drawing . Image image ) <nl> + { <nl> + check_initialization ( ) ; <nl> + <nl> + System . Drawing . Bitmap clone = new System . Drawing . Bitmap ( image . Width , image . Height , System . Drawing . Imaging . PixelFormat . Format32bppRgb ) ; <nl> + using ( System . Drawing . Graphics gr = System . Drawing . Graphics . FromImage ( clone ) ) <nl> + { <nl> + gr . DrawImage ( image , new System . Drawing . Rectangle ( 0 , 0 , clone . Width , clone . Height ) ) ; <nl> + } <nl> + <nl> + System . Drawing . Imaging . BitmapData locked_bmp = clone . LockBits ( new System . Drawing . Rectangle ( 0 , 0 , clone . Width , clone . Height ) , <nl> + System . Drawing . Imaging . ImageLockMode . ReadWrite , clone . PixelFormat ) ; <nl> + byte [ ] raw_bytes = new byte [ locked_bmp . Stride * locked_bmp . Height ] ; <nl> + System . Runtime . InteropServices . Marshal . Copy ( locked_bmp . Scan0 , raw_bytes , 0 , raw_bytes . Length ) ; <nl> + clone . UnlockBits ( locked_bmp ) ; <nl> + <nl> + int bytes_per_pixel = System . Drawing . Image . GetPixelFormatSize ( clone . PixelFormat ) / 8 ; <nl> + <nl> + NativeROI roi ; <nl> + roi . x = 0 ; <nl> + roi . y = 0 ; <nl> + roi . width = image . Width ; <nl> + roi . height = image . Height ; <nl> + <nl> + IntPtr unmanagedArray = Marshal . AllocHGlobal ( raw_bytes . Length ) ; <nl> + Marshal . Copy ( raw_bytes , 0 , unmanagedArray , raw_bytes . Length ) ; <nl> + <nl> + IntPtr resp_ptr = openalpr_recognize_rawimage ( this . native_instance , unmanagedArray , bytes_per_pixel , image . Width , image . Height , roi ) ; <nl> + <nl> + Marshal . FreeHGlobal ( unmanagedArray ) ; <nl> + <nl> + string json = Marshal . PtrToStringAnsi ( resp_ptr ) ; <nl> + <nl> + AlprResponse response = JsonConvert . DeserializeObject < AlprResponse > ( json ) ; <nl> + <nl> + openalpr_free_response_string ( resp_ptr ) ; <nl> + <nl> + return response ; <nl> + } <nl> + <nl> + / / / < summary > <nl> + / / / Change the country used for analyzing plate data . This will load the new training data automatically <nl> + / / / < / summary > <nl> + / / / < param name = " country " > Country used for Recognition ( e . g . , " us " , " eu " , " au " , etc ) . Multiple values may be provided as comma - separated < / param > <nl> + / / / < exception cref = " InvalidOperationException " > Thrown when the library has not been initialized < / exception > <nl> + public void SetCountry ( string country ) <nl> + { <nl> + check_initialization ( ) ; <nl> + <nl> + openalpr_set_country ( this . native_instance , country ) ; <nl> + } <nl> + <nl> + / / / < summary > <nl> + / / / Applies a new prewarp configuration to this instance <nl> + / / / < / summary > <nl> + / / / < param name = " prewarp " > A prewarp configuration string generated from the OpenALPR calibration utility < / param > <nl> + / / / < exception cref = " InvalidOperationException " > Thrown when the library has not been initialized < / exception > <nl> + public void SetPrewarp ( string prewarp ) <nl> + { <nl> + openalpr_set_prewarp ( this . native_instance , prewarp ) ; <nl> + } <nl> + <nl> + / / / < summary > <nl> + / / / Set the detection mask used by OpenALPR . Areas within the mask will be scanned for plates , areas outside the mask will be ignored <nl> + / / / < / summary > <nl> + / / / < param name = " mask " > <nl> + / / / Provide a black and white image that contains white areas that should be scanned , and black areas that should be ignored . <nl> + / / / The width and height should match the image dimensions used for recognition . <nl> + / / / < / param > <nl> + / / / < exception cref = " InvalidOperationException " > Thrown when the library has not been initialized < / exception > <nl> + public void SetDetectionMask ( System . Drawing . Image mask ) <nl> + { <nl> + check_initialization ( ) ; <nl> + <nl> + System . Drawing . Bitmap clone = new System . Drawing . Bitmap ( mask . Width , mask . Height , System . Drawing . Imaging . PixelFormat . Format32bppRgb ) ; <nl> + using ( System . Drawing . Graphics gr = System . Drawing . Graphics . FromImage ( clone ) ) <nl> + { <nl> + gr . DrawImage ( mask , new System . Drawing . Rectangle ( 0 , 0 , clone . Width , clone . Height ) ) ; <nl> + } <nl> + <nl> + System . Drawing . Imaging . BitmapData locked_bmp = clone . LockBits ( new System . Drawing . Rectangle ( 0 , 0 , clone . Width , clone . Height ) , <nl> + System . Drawing . Imaging . ImageLockMode . ReadWrite , clone . PixelFormat ) ; <nl> + byte [ ] raw_bytes = new byte [ locked_bmp . Stride * locked_bmp . Height ] ; <nl> + System . Runtime . InteropServices . Marshal . Copy ( locked_bmp . Scan0 , raw_bytes , 0 , raw_bytes . Length ) ; <nl> + clone . UnlockBits ( locked_bmp ) ; <nl> + <nl> + int bytes_per_pixel = System . Drawing . Image . GetPixelFormatSize ( clone . PixelFormat ) / 8 ; <nl> + <nl> + <nl> + IntPtr unmanagedArray = Marshal . AllocHGlobal ( raw_bytes . Length ) ; <nl> + Marshal . Copy ( raw_bytes , 0 , unmanagedArray , raw_bytes . Length ) ; <nl> + <nl> + openalpr_set_mask ( this . native_instance , unmanagedArray , bytes_per_pixel , mask . Width , mask . Height ) ; <nl> + <nl> + Marshal . FreeHGlobal ( unmanagedArray ) ; <nl> + <nl> + } <nl> + <nl> + / / / < summary > <nl> + / / / Sets the maximum number of results for OpenALPR to return with each recognition task <nl> + / / / < / summary > <nl> + / / / < param name = " top_n " > An integer describing the maximum number of results to return < / param > <nl> + / / / < exception cref = " InvalidOperationException " > Thrown when the library has not been initialized < / exception > <nl> + public void setTopN ( int top_n ) <nl> + { <nl> + check_initialization ( ) ; <nl> + <nl> + openalpr_set_topn ( this . native_instance , top_n ) ; <nl> + } <nl> + <nl> + / / / < summary > <nl> + / / / Sets the region used by OpenALPR for pattern matching . For example , " md " in the US would match plates matching that pattern . <nl> + / / / < / summary > <nl> + / / / < param name = " region " > A two - letter code for the region / country to use as the default pattern < / param > <nl> + / / / < exception cref = " InvalidOperationException " > Thrown when the library has not been initialized < / exception > <nl> + public void setDefaultRegion ( string region ) <nl> + { <nl> + check_initialization ( ) ; <nl> + <nl> + openalpr_set_default_region ( this . native_instance , region ) ; <nl> + } <nl> + <nl> + / / Enumerate the native methods . Handle the plumbing internally <nl> + <nl> + [ StructLayout ( LayoutKind . Sequential ) ] <nl> + private struct NativeROI <nl> + { <nl> + public int x ; <nl> + public int y ; <nl> + public int width ; <nl> + public int height ; <nl> + } <nl> + <nl> + [ DllImport ( " libopenalprc . dll " ) ] <nl> + private static extern IntPtr openalpr_init ( [ MarshalAs ( UnmanagedType . LPStr ) ] string country , [ MarshalAs ( UnmanagedType . LPStr ) ] string configFile , [ MarshalAs ( UnmanagedType . LPStr ) ] string runtimeDir ) ; <nl> + <nl> + [ DllImport ( " libopenalprc . dll " ) ] <nl> + private static extern int openalpr_is_loaded ( IntPtr instance ) ; <nl> + <nl> + [ DllImport ( " libopenalprc . dll " ) ] <nl> + private static extern void openalpr_cleanup ( IntPtr instance ) ; <nl> + <nl> + [ DllImport ( " libopenalprc . dll " ) ] <nl> + private static extern void openalpr_set_country ( IntPtr instance , [ MarshalAs ( UnmanagedType . LPStr ) ] string country ) ; <nl> + <nl> + [ DllImport ( " libopenalprc . dll " ) ] <nl> + private static extern void openalpr_set_prewarp ( IntPtr instance , [ MarshalAs ( UnmanagedType . LPStr ) ] string prewarp_config ) ; <nl> + <nl> + [ DllImport ( " libopenalprc . dll " ) ] <nl> + private static extern void openalpr_set_mask ( IntPtr instance , IntPtr pixelData , int bytesPerPixel , int imgWidth , int imgHeight ) ; <nl> + <nl> + [ DllImport ( " libopenalprc . dll " ) ] <nl> + private static extern void openalpr_set_detect_region ( IntPtr instance , int detectRegion ) ; <nl> + <nl> + [ DllImport ( " libopenalprc . dll " ) ] <nl> + private static extern void openalpr_set_topn ( IntPtr instance , int topN ) ; <nl> + <nl> + [ DllImport ( " libopenalprc . dll " ) ] <nl> + private static extern void openalpr_set_default_region ( IntPtr instance , [ MarshalAs ( UnmanagedType . LPStr ) ] string region ) ; <nl> + <nl> + [ DllImport ( " libopenalprc . dll " ) ] <nl> + private static extern IntPtr openalpr_recognize_rawimage ( IntPtr instance , IntPtr pixelData , int bytesPerPixel , int imgWidth , int imgHeight , NativeROI roi ) ; <nl> + <nl> + [ DllImport ( " libopenalprc . dll " ) ] <nl> + private static extern IntPtr openalpr_recognize_encodedimage ( IntPtr instance , IntPtr bytes , long length , NativeROI roi ) ; <nl> + <nl> + [ DllImport ( " libopenalprc . dll " ) ] <nl> + private static extern void openalpr_free_response_string ( IntPtr response ) ; <nl> + <nl> + <nl> + } <nl> + } <nl> new file mode 100644 <nl> index 00000000 . . 0c18754b <nl> mmm / dev / null <nl> ppp b / src / bindings / csharp / alprnet / AlprNet . csproj <nl> <nl> + < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> + < Project ToolsVersion = " 14 . 0 " DefaultTargets = " Build " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> + < Import Project = " $ ( MSBuildExtensionsPath ) \ $ ( MSBuildToolsVersion ) \ Microsoft . Common . props " Condition = " Exists ( ' $ ( MSBuildExtensionsPath ) \ $ ( MSBuildToolsVersion ) \ Microsoft . Common . props ' ) " / > <nl> + < PropertyGroup > <nl> + < Configuration Condition = " ' $ ( Configuration ) ' = = ' ' " > Debug < / Configuration > <nl> + < Platform Condition = " ' $ ( Platform ) ' = = ' ' " > AnyCPU < / Platform > <nl> + < ProjectGuid > { F6106C0E - 0E89 - 4D2E - 89E6 - 19742D54B9F6 } < / ProjectGuid > <nl> + < OutputType > Library < / OutputType > <nl> + < AppDesignerFolder > Properties < / AppDesignerFolder > <nl> + < RootNamespace > alprnet < / RootNamespace > <nl> + < AssemblyName > alprnet < / AssemblyName > <nl> + < TargetFrameworkVersion > v2 . 0 < / TargetFrameworkVersion > <nl> + < FileAlignment > 512 < / FileAlignment > <nl> + < TargetFrameworkProfile / > <nl> + < / PropertyGroup > <nl> + < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | AnyCPU ' " > <nl> + < DebugSymbols > true < / DebugSymbols > <nl> + < DebugType > full < / DebugType > <nl> + < Optimize > false < / Optimize > <nl> + < OutputPath > bin \ Debug \ < / OutputPath > <nl> + < DefineConstants > DEBUG ; TRACE < / DefineConstants > <nl> + < ErrorReport > prompt < / ErrorReport > <nl> + < WarningLevel > 4 < / WarningLevel > <nl> + < / PropertyGroup > <nl> + < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | AnyCPU ' " > <nl> + < DebugType > pdbonly < / DebugType > <nl> + < Optimize > true < / Optimize > <nl> + < OutputPath > bin \ Release \ < / OutputPath > <nl> + < DefineConstants > TRACE < / DefineConstants > <nl> + < ErrorReport > prompt < / ErrorReport > <nl> + < WarningLevel > 4 < / WarningLevel > <nl> + < / PropertyGroup > <nl> + < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " > <nl> + < DebugSymbols > true < / DebugSymbols > <nl> + < OutputPath > bin \ x64 \ Debug \ < / OutputPath > <nl> + < DefineConstants > DEBUG ; TRACE < / DefineConstants > <nl> + < DebugType > full < / DebugType > <nl> + < PlatformTarget > x64 < / PlatformTarget > <nl> + < ErrorReport > prompt < / ErrorReport > <nl> + < CodeAnalysisRuleSet > MinimumRecommendedRules . ruleset < / CodeAnalysisRuleSet > <nl> + < / PropertyGroup > <nl> + < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " > <nl> + < OutputPath > bin \ x64 \ Release \ < / OutputPath > <nl> + < DefineConstants > TRACE < / DefineConstants > <nl> + < Optimize > true < / Optimize > <nl> + < DebugType > pdbonly < / DebugType > <nl> + < PlatformTarget > x64 < / PlatformTarget > <nl> + < ErrorReport > prompt < / ErrorReport > <nl> + < CodeAnalysisRuleSet > MinimumRecommendedRules . ruleset < / CodeAnalysisRuleSet > <nl> + < / PropertyGroup > <nl> + < ItemGroup > <nl> + < Reference Include = " Newtonsoft . Json , Version = 8 . 0 . 0 . 0 , Culture = neutral , PublicKeyToken = 30ad4fe6b2a6aeed , processorArchitecture = MSIL " > <nl> + < HintPath > packages \ Newtonsoft . Json . 8 . 0 . 3 \ lib \ net20 \ Newtonsoft . Json . dll < / HintPath > <nl> + < Private > True < / Private > <nl> + < / Reference > <nl> + < Reference Include = " System " / > <nl> + < Reference Include = " System . Drawing " / > <nl> + < Reference Include = " System . Data " / > <nl> + < Reference Include = " System . Xml " / > <nl> + < / ItemGroup > <nl> + < ItemGroup > <nl> + < Compile Include = " Models \ AlprResponse . cs " / > <nl> + < Compile Include = " Alpr . cs " / > <nl> + < Compile Include = " Models \ AlprResult . cs " / > <nl> + < Compile Include = " Models \ Candidate . cs " / > <nl> + < Compile Include = " Models \ Coordinate . cs " / > <nl> + < Compile Include = " Models \ RegionOfInterest . cs " / > <nl> + < Compile Include = " Properties \ AssemblyInfo . cs " / > <nl> + < / ItemGroup > <nl> + < ItemGroup > <nl> + < None Include = " packages . config " / > <nl> + < / ItemGroup > <nl> + < Import Project = " $ ( MSBuildToolsPath ) \ Microsoft . CSharp . targets " / > <nl> + < ! - - To modify your build process , add your task inside one of the targets below and uncomment it . <nl> + Other similar extension points exist , see Microsoft . Common . targets . <nl> + < Target Name = " BeforeBuild " > <nl> + < / Target > <nl> + < Target Name = " AfterBuild " > <nl> + < / Target > <nl> + - - > <nl> + < / Project > <nl> \ No newline at end of file <nl> new file mode 100644 <nl> index 00000000 . . 306869a4 <nl> mmm / dev / null <nl> ppp b / src / bindings / csharp / alprnet / Models / AlprResponse . cs <nl> <nl> + using System . Collections . Generic ; <nl> + <nl> + namespace AlprNet . Models <nl> + { <nl> + public class AlprResponse <nl> + { <nl> + public int version { get ; set ; } <nl> + public string data_type { get ; set ; } <nl> + public long epoch_time { get ; set ; } <nl> + public int img_width { get ; set ; } <nl> + public int img_height { get ; set ; } <nl> + public float processing_time_ms { get ; set ; } <nl> + public RegionOfInterest region_of_interest { get ; set ; } <nl> + public IList < AlprResult > results { get ; set ; } <nl> + } <nl> + } <nl> new file mode 100644 <nl> index 00000000 . . c768f477 <nl> mmm / dev / null <nl> ppp b / src / bindings / csharp / alprnet / Models / AlprResult . cs <nl> <nl> + using System . Collections . Generic ; <nl> + <nl> + <nl> + namespace AlprNet . Models <nl> + { <nl> + public class AlprResult <nl> + { <nl> + public string plate { get ; set ; } <nl> + public float confidence { get ; set ; } <nl> + public bool matches_template { get ; set ; } <nl> + public int plate_index { get ; set ; } <nl> + public string region { get ; set ; } <nl> + public float region_confidence { get ; set ; } <nl> + public float processing_time_ms { get ; set ; } <nl> + public int requested_topn { get ; set ; } <nl> + public IList < Coordinate > coordinates { get ; set ; } <nl> + public IList < Candidate > candidates { get ; set ; } <nl> + } <nl> + } <nl> new file mode 100644 <nl> index 00000000 . . 68b4e91d <nl> mmm / dev / null <nl> ppp b / src / bindings / csharp / alprnet / Models / Candidate . cs <nl> <nl> + <nl> + <nl> + namespace AlprNet . Models <nl> + { <nl> + public class Candidate <nl> + { <nl> + public string plate { get ; set ; } <nl> + public float confidence { get ; set ; } <nl> + public bool matches_template { get ; set ; } <nl> + } <nl> + } <nl> new file mode 100644 <nl> index 00000000 . . d9f5a32b <nl> mmm / dev / null <nl> ppp b / src / bindings / csharp / alprnet / Models / Coordinate . cs <nl> <nl> + <nl> + <nl> + namespace AlprNet . Models <nl> + { <nl> + public class Coordinate <nl> + { <nl> + public int x { get ; set ; } <nl> + public int y { get ; set ; } <nl> + } <nl> + } <nl> new file mode 100644 <nl> index 00000000 . . 5506b74c <nl> mmm / dev / null <nl> ppp b / src / bindings / csharp / alprnet / Models / RegionOfInterest . cs <nl> <nl> + <nl> + <nl> + namespace AlprNet . Models <nl> + { <nl> + public class RegionOfInterest <nl> + { <nl> + public int x { get ; set ; } <nl> + public int y { get ; set ; } <nl> + public int width { get ; set ; } <nl> + public int height { get ; set ; } <nl> + } <nl> + } <nl> new file mode 100644 <nl> index 00000000 . . e3ab5e1b <nl> mmm / dev / null <nl> ppp b / src / bindings / csharp / alprnet / Properties / AssemblyInfo . cs <nl> <nl> + using System . Reflection ; <nl> + using System . Runtime . CompilerServices ; <nl> + using System . Runtime . InteropServices ; <nl> + <nl> + / / General Information about an assembly is controlled through the following <nl> + / / set of attributes . Change these attribute values to modify the information <nl> + / / associated with an assembly . <nl> + [ assembly : AssemblyTitle ( " alprnet " ) ] <nl> + [ assembly : AssemblyDescription ( " " ) ] <nl> + [ assembly : AssemblyConfiguration ( " " ) ] <nl> + [ assembly : AssemblyCompany ( " " ) ] <nl> + [ assembly : AssemblyProduct ( " alprnet " ) ] <nl> + [ assembly : AssemblyCopyright ( " Copyright © 2016 " ) ] <nl> + [ assembly : AssemblyTrademark ( " " ) ] <nl> + [ assembly : AssemblyCulture ( " " ) ] <nl> + <nl> + / / Setting ComVisible to false makes the types in this assembly not visible <nl> + / / to COM components . If you need to access a type in this assembly from <nl> + / / COM , set the ComVisible attribute to true on that type . <nl> + [ assembly : ComVisible ( false ) ] <nl> + <nl> + / / The following GUID is for the ID of the typelib if this project is exposed to COM <nl> + [ assembly : Guid ( " f6106c0e - 0e89 - 4d2e - 89e6 - 19742d54b9f6 " ) ] <nl> + <nl> + / / Version information for an assembly consists of the following four values : <nl> + / / <nl> + / / Major Version <nl> + / / Minor Version <nl> + / / Build Number <nl> + / / Revision <nl> + / / <nl> + / / You can specify all the values or you can default the Build and Revision Numbers <nl> + / / by using the ' * ' as shown below : <nl> + / / [ assembly : AssemblyVersion ( " 1 . 0 . * " ) ] <nl> + [ assembly : AssemblyVersion ( " 1 . 0 . 0 . 0 " ) ] <nl> + [ assembly : AssemblyFileVersion ( " 1 . 0 . 0 . 0 " ) ] <nl> new file mode 100644 <nl> index 00000000 . . 72f97973 <nl> mmm / dev / null <nl> ppp b / src / bindings / csharp / alprnet / alprnet . sln <nl> <nl> + <nl> + Microsoft Visual Studio Solution File , Format Version 12 . 00 <nl> + # Visual Studio 14 <nl> + VisualStudioVersion = 14 . 0 . 25420 . 1 <nl> + MinimumVisualStudioVersion = 10 . 0 . 40219 . 1 <nl> + Project ( " { FAE04EC0 - 301F - 11D3 - BF4B - 00C04F79EFBC } " ) = " AlprNet " , " AlprNet . csproj " , " { F6106C0E - 0E89 - 4D2E - 89E6 - 19742D54B9F6 } " <nl> + EndProject <nl> + Project ( " { FAE04EC0 - 301F - 11D3 - BF4B - 00C04F79EFBC } " ) = " AlprNetTest " , " . . \ AlprNetTest \ AlprNetTest . csproj " , " { BA97FA53 - 9F76 - 42FD - 90A4 - E3BDBA3B66C3 } " <nl> + EndProject <nl> + Project ( " { FAE04EC0 - 301F - 11D3 - BF4B - 00C04F79EFBC } " ) = " AlprNetGuiTest " , " . . \ AlprNetGuiTest \ AlprNetGuiTest . csproj " , " { C7863A14 - 55D2 - 4389 - 9072 - 04AA6E30AAD1 } " <nl> + EndProject <nl> + Global <nl> + GlobalSection ( SolutionConfigurationPlatforms ) = preSolution <nl> + Debug | Any CPU = Debug | Any CPU <nl> + Debug | x64 = Debug | x64 <nl> + Debug | x86 = Debug | x86 <nl> + Release | Any CPU = Release | Any CPU <nl> + Release | x64 = Release | x64 <nl> + Release | x86 = Release | x86 <nl> + EndGlobalSection <nl> + GlobalSection ( ProjectConfigurationPlatforms ) = postSolution <nl> + { F6106C0E - 0E89 - 4D2E - 89E6 - 19742D54B9F6 } . Debug | Any CPU . ActiveCfg = Debug | Any CPU <nl> + { F6106C0E - 0E89 - 4D2E - 89E6 - 19742D54B9F6 } . Debug | Any CPU . Build . 0 = Debug | Any CPU <nl> + { F6106C0E - 0E89 - 4D2E - 89E6 - 19742D54B9F6 } . Debug | x64 . ActiveCfg = Debug | x64 <nl> + { F6106C0E - 0E89 - 4D2E - 89E6 - 19742D54B9F6 } . Debug | x64 . Build . 0 = Debug | x64 <nl> + { F6106C0E - 0E89 - 4D2E - 89E6 - 19742D54B9F6 } . Debug | x86 . ActiveCfg = Debug | Any CPU <nl> + { F6106C0E - 0E89 - 4D2E - 89E6 - 19742D54B9F6 } . Debug | x86 . Build . 0 = Debug | Any CPU <nl> + { F6106C0E - 0E89 - 4D2E - 89E6 - 19742D54B9F6 } . Release | Any CPU . ActiveCfg = Release | Any CPU <nl> + { F6106C0E - 0E89 - 4D2E - 89E6 - 19742D54B9F6 } . Release | Any CPU . Build . 0 = Release | Any CPU <nl> + { F6106C0E - 0E89 - 4D2E - 89E6 - 19742D54B9F6 } . Release | x64 . ActiveCfg = Release | x64 <nl> + { F6106C0E - 0E89 - 4D2E - 89E6 - 19742D54B9F6 } . Release | x64 . Build . 0 = Release | x64 <nl> + { F6106C0E - 0E89 - 4D2E - 89E6 - 19742D54B9F6 } . Release | x86 . ActiveCfg = Release | Any CPU <nl> + { F6106C0E - 0E89 - 4D2E - 89E6 - 19742D54B9F6 } . Release | x86 . Build . 0 = Release | Any CPU <nl> + { BA97FA53 - 9F76 - 42FD - 90A4 - E3BDBA3B66C3 } . Debug | Any CPU . ActiveCfg = Debug | Any CPU <nl> + { BA97FA53 - 9F76 - 42FD - 90A4 - E3BDBA3B66C3 } . Debug | Any CPU . Build . 0 = Debug | Any CPU <nl> + { BA97FA53 - 9F76 - 42FD - 90A4 - E3BDBA3B66C3 } . Debug | x64 . ActiveCfg = Debug | x64 <nl> + { BA97FA53 - 9F76 - 42FD - 90A4 - E3BDBA3B66C3 } . Debug | x64 . Build . 0 = Debug | x64 <nl> + { BA97FA53 - 9F76 - 42FD - 90A4 - E3BDBA3B66C3 } . Debug | x86 . ActiveCfg = Debug | Any CPU <nl> + { BA97FA53 - 9F76 - 42FD - 90A4 - E3BDBA3B66C3 } . Debug | x86 . Build . 0 = Debug | Any CPU <nl> + { BA97FA53 - 9F76 - 42FD - 90A4 - E3BDBA3B66C3 } . Release | Any CPU . ActiveCfg = Release | Any CPU <nl> + { BA97FA53 - 9F76 - 42FD - 90A4 - E3BDBA3B66C3 } . Release | Any CPU . Build . 0 = Release | Any CPU <nl> + { BA97FA53 - 9F76 - 42FD - 90A4 - E3BDBA3B66C3 } . Release | x64 . ActiveCfg = Release | x64 <nl> + { BA97FA53 - 9F76 - 42FD - 90A4 - E3BDBA3B66C3 } . Release | x64 . Build . 0 = Release | x64 <nl> + { BA97FA53 - 9F76 - 42FD - 90A4 - E3BDBA3B66C3 } . Release | x86 . ActiveCfg = Release | Any CPU <nl> + { BA97FA53 - 9F76 - 42FD - 90A4 - E3BDBA3B66C3 } . Release | x86 . Build . 0 = Release | Any CPU <nl> + { C7863A14 - 55D2 - 4389 - 9072 - 04AA6E30AAD1 } . Debug | Any CPU . ActiveCfg = Debug | x86 <nl> + { C7863A14 - 55D2 - 4389 - 9072 - 04AA6E30AAD1 } . Debug | x64 . ActiveCfg = Debug | x64 <nl> + { C7863A14 - 55D2 - 4389 - 9072 - 04AA6E30AAD1 } . Debug | x64 . Build . 0 = Debug | x64 <nl> + { C7863A14 - 55D2 - 4389 - 9072 - 04AA6E30AAD1 } . Debug | x86 . ActiveCfg = Debug | x86 <nl> + { C7863A14 - 55D2 - 4389 - 9072 - 04AA6E30AAD1 } . Debug | x86 . Build . 0 = Debug | x86 <nl> + { C7863A14 - 55D2 - 4389 - 9072 - 04AA6E30AAD1 } . Release | Any CPU . ActiveCfg = Release | x86 <nl> + { C7863A14 - 55D2 - 4389 - 9072 - 04AA6E30AAD1 } . Release | x64 . ActiveCfg = Release | x64 <nl> + { C7863A14 - 55D2 - 4389 - 9072 - 04AA6E30AAD1 } . Release | x64 . Build . 0 = Release | x64 <nl> + { C7863A14 - 55D2 - 4389 - 9072 - 04AA6E30AAD1 } . Release | x86 . ActiveCfg = Release | x86 <nl> + { C7863A14 - 55D2 - 4389 - 9072 - 04AA6E30AAD1 } . Release | x86 . Build . 0 = Release | x86 <nl> + EndGlobalSection <nl> + GlobalSection ( SolutionProperties ) = preSolution <nl> + HideSolutionNode = FALSE <nl> + EndGlobalSection <nl> + EndGlobal <nl> new file mode 100644 <nl> index 00000000 . . ee989f30 <nl> mmm / dev / null <nl> ppp b / src / bindings / csharp / alprnet / packages . config <nl> <nl> + < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> + < packages > <nl> + < package id = " Newtonsoft . Json " version = " 8 . 0 . 3 " targetFramework = " net20 " / > <nl> + < / packages > <nl> \ No newline at end of file <nl> new file mode 100644 <nl> index 00000000 . . fa39f895 <nl> mmm / dev / null <nl> ppp b / src / bindings / csharp / readme . md <nl> <nl> + OpenALPR C # Binding <nl> + = = = = = = = = = = = = = = = = = = = = = = <nl> + <nl> + This . NET binding enables OpenALPR to be used directly from C # . The binding uses the libopenalprc . dll produced from the native OpenALPR project . <nl> + <nl> + Code samples are available in the AlprNetTest and AlprNetGui project . You must compile the program to match the native library version of OpenALPR . Usually this is 64 - bit . <nl> + <nl> + To install , you must include all native DLLs along with the openalpr . conf and runtime_data directory in a location accessible by the . NET program . <nl> + <nl> + Troubleshooting <nl> + mmmmmmmmmmmmmmm - - <nl> + <nl> + The most common issue is that the native OpenALPR DLLs are not available to . NET . The " Dependency Walker " program is very helpful for spotting missing DLLs . Load the libopenalprc . dll into your project to detect if all the other native DLLs are available . <nl> | Replaced . NET binding with a simpler version | openalpr/openalpr | f031afe0013ab8aea4358357635c9469ff74c006 | 2016-10-22T00:52:46Z |
mmm a / CMakeLists . txt <nl> ppp b / CMakeLists . txt <nl> if ( ANDROID ) <nl> status ( " " ) <nl> status ( " Android : " ) <nl> status ( " Android ABI : " $ { ANDROID_ABI } ) <nl> + status ( " STL type : " $ { ANDROID_STL } ) <nl> status ( " Native API level : " android - $ { ANDROID_NATIVE_API_LEVEL } ) <nl> status ( " SDK target : " " $ { ANDROID_SDK_TARGET } " ) <nl> if ( BUILD_WITH_ANDROID_NDK ) <nl> mmm a / modules / androidcamera / src / camera_activity . cpp <nl> ppp b / modules / androidcamera / src / camera_activity . cpp <nl> <nl> # include < sys / stat . h > <nl> # include < dirent . h > <nl> # include < android / log . h > <nl> + # include < cctype > <nl> # include < string > <nl> # include < vector > <nl> # include < algorithm > <nl> std : : string CameraWrapperConnector : : getPathLibFolder ( ) <nl> LOGD ( " Library name : % s " , dl_info . dli_fname ) ; <nl> LOGD ( " Library base address : % p " , dl_info . dli_fbase ) ; <nl> <nl> - const char * libName = dl_info . dli_fname ; <nl> - while ( ( ( * libName ) = = ' / ' ) | | ( ( * libName ) = = ' . ' ) ) <nl> + const char * libName = dl_info . dli_fname ; <nl> + while ( ( ( * libName ) = = ' / ' ) | | ( ( * libName ) = = ' . ' ) ) <nl> libName + + ; <nl> <nl> char lineBuf [ 2048 ] ; <nl> std : : string CameraWrapperConnector : : getPathLibFolder ( ) <nl> <nl> if ( file ) <nl> { <nl> - while ( fgets ( lineBuf , sizeof lineBuf , file ) ! = NULL ) <nl> - { <nl> - / / verify that line ends with library name <nl> + while ( fgets ( lineBuf , sizeof lineBuf , file ) ! = NULL ) <nl> + { <nl> + / / verify that line ends with library name <nl> int lineLength = strlen ( lineBuf ) ; <nl> int libNameLength = strlen ( libName ) ; <nl> <nl> std : : string CameraWrapperConnector : : getPathLibFolder ( ) <nl> <nl> if ( 0 ! = strncmp ( lineBuf + lineLength - libNameLength , libName , libNameLength ) ) <nl> { <nl> - / / the line does not contain the library name <nl> + / / the line does not contain the library name <nl> continue ; <nl> } <nl> <nl> std : : string CameraWrapperConnector : : getPathLibFolder ( ) <nl> <nl> fclose ( file ) ; <nl> return pathBegin ; <nl> - } <nl> - fclose ( file ) ; <nl> - LOGE ( " Could not find library path " ) ; <nl> + } <nl> + fclose ( file ) ; <nl> + LOGE ( " Could not find library path " ) ; <nl> } <nl> else <nl> { <nl> - LOGE ( " Could not read / proc / self / smaps " ) ; <nl> + LOGE ( " Could not read / proc / self / smaps " ) ; <nl> } <nl> } <nl> else <nl> { <nl> - LOGE ( " Could not get library name and base address " ) ; <nl> + LOGE ( " Could not get library name and base address " ) ; <nl> } <nl> <nl> return string ( ) ; <nl> mmm a / modules / contrib / src / chamfermatching . cpp <nl> ppp b / modules / contrib / src / chamfermatching . cpp <nl> void ChamferMatcher : : Matching : : findContourOrientations ( const template_coords_t & <nl> } <nl> <nl> / / get the middle two angles <nl> - nth_element ( angles . begin ( ) , angles . begin ( ) + M - 1 , angles . end ( ) ) ; <nl> - nth_element ( angles . begin ( ) + M - 1 , angles . begin ( ) + M , angles . end ( ) ) ; <nl> + std : : nth_element ( angles . begin ( ) , angles . begin ( ) + M - 1 , angles . end ( ) ) ; <nl> + std : : nth_element ( angles . begin ( ) + M - 1 , angles . begin ( ) + M , angles . end ( ) ) ; <nl> / / sort ( angles . begin ( ) , angles . end ( ) ) ; <nl> <nl> / / average them to compute tangent <nl> mmm a / modules / contrib / src / spinimages . cpp <nl> ppp b / modules / contrib / src / spinimages . cpp <nl> namespace <nl> } ; <nl> size_t colors_mum = sizeof ( colors ) / sizeof ( colors [ 0 ] ) ; <nl> <nl> - # if defined __cplusplus & & __cplusplus > 199711L <nl> + # if ( defined __cplusplus & & __cplusplus > 199711L ) | | defined _STLPORT_MAJOR <nl> # else <nl> template < class FwIt , class T > void iota ( FwIt first , FwIt last , T value ) { while ( first ! = last ) * first + + = value + + ; } <nl> # endif <nl> mmm a / modules / core / include / opencv2 / core / core . hpp <nl> ppp b / modules / core / include / opencv2 / core / core . hpp <nl> class CV_EXPORTS CommandLineParser <nl> template < typename _Tp > <nl> static _Tp getData ( const std : : string & str ) <nl> { <nl> - _Tp res ; <nl> + _Tp res = _Tp ( ) ; <nl> std : : stringstream s1 ( str ) ; <nl> s1 > > res ; <nl> return res ; <nl> mmm a / modules / core / include / opencv2 / core / operations . hpp <nl> ppp b / modules / core / include / opencv2 / core / operations . hpp <nl> <nl> # elif __GNUC__ * 10 + __GNUC_MINOR__ > = 42 <nl> <nl> # if ! ( defined WIN32 | | defined _WIN32 ) & & ( defined __i486__ | | defined __i586__ | | \ <nl> - defined __i686__ | | defined __MMX__ | | defined __SSE__ | | defined __ppc__ ) <nl> + defined __i686__ | | defined __MMX__ | | defined __SSE__ | | defined __ppc__ ) | | \ <nl> + ( defined __GNUC__ & & defined _STLPORT_MAJOR ) <nl> # define CV_XADD __sync_fetch_and_add <nl> # else <nl> # include < ext / atomicity . h > <nl> mmm a / modules / features2d / src / keypoint . cpp <nl> ppp b / modules / features2d / src / keypoint . cpp <nl> void KeyPointsFilter : : runByImageBorder ( vector < KeyPoint > & keypoints , Size imageS <nl> if ( imageSize . height < = borderSize * 2 | | imageSize . width < = borderSize * 2 ) <nl> keypoints . clear ( ) ; <nl> else <nl> - keypoints . erase ( remove_if ( keypoints . begin ( ) , keypoints . end ( ) , <nl> + keypoints . erase ( std : : remove_if ( keypoints . begin ( ) , keypoints . end ( ) , <nl> RoiPredicate ( Rect ( Point ( borderSize , borderSize ) , <nl> Point ( imageSize . width - borderSize , imageSize . height - borderSize ) ) ) ) , <nl> keypoints . end ( ) ) ; <nl> void KeyPointsFilter : : runByKeypointSize ( vector < KeyPoint > & keypoints , float minS <nl> CV_Assert ( maxSize > = 0 ) ; <nl> CV_Assert ( minSize < = maxSize ) ; <nl> <nl> - keypoints . erase ( remove_if ( keypoints . begin ( ) , keypoints . end ( ) , SizePredicate ( minSize , maxSize ) ) , <nl> + keypoints . erase ( std : : remove_if ( keypoints . begin ( ) , keypoints . end ( ) , SizePredicate ( minSize , maxSize ) ) , <nl> keypoints . end ( ) ) ; <nl> } <nl> <nl> void KeyPointsFilter : : runByPixelsMask ( vector < KeyPoint > & keypoints , const Mat & m <nl> if ( mask . empty ( ) ) <nl> return ; <nl> <nl> - keypoints . erase ( remove_if ( keypoints . begin ( ) , keypoints . end ( ) , MaskPredicate ( mask ) ) , keypoints . end ( ) ) ; <nl> + keypoints . erase ( std : : remove_if ( keypoints . begin ( ) , keypoints . end ( ) , MaskPredicate ( mask ) ) , keypoints . end ( ) ) ; <nl> } <nl> <nl> struct KeyPoint_LessThan <nl> mmm a / modules / features2d / src / matchers . cpp <nl> ppp b / modules / features2d / src / matchers . cpp <nl> DescriptorMatcher : : DescriptorCollection : : DescriptorCollection ( ) <nl> DescriptorMatcher : : DescriptorCollection : : DescriptorCollection ( const DescriptorCollection & collection ) <nl> { <nl> mergedDescriptors = collection . mergedDescriptors . clone ( ) ; <nl> - copy ( collection . startIdxs . begin ( ) , collection . startIdxs . begin ( ) , startIdxs . begin ( ) ) ; <nl> + std : : copy ( collection . startIdxs . begin ( ) , collection . startIdxs . begin ( ) , startIdxs . begin ( ) ) ; <nl> } <nl> <nl> DescriptorMatcher : : DescriptorCollection : : ~ DescriptorCollection ( ) <nl> GenericDescriptorMatcher : : KeyPointCollection : : KeyPointCollection ( const KeyPoint <nl> <nl> keypoints . resize ( collection . keypoints . size ( ) ) ; <nl> for ( size_t i = 0 ; i < keypoints . size ( ) ; i + + ) <nl> - copy ( collection . keypoints [ i ] . begin ( ) , collection . keypoints [ i ] . end ( ) , keypoints [ i ] . begin ( ) ) ; <nl> + std : : copy ( collection . keypoints [ i ] . begin ( ) , collection . keypoints [ i ] . end ( ) , keypoints [ i ] . begin ( ) ) ; <nl> <nl> - copy ( collection . startIndices . begin ( ) , collection . startIndices . end ( ) , startIndices . begin ( ) ) ; <nl> + std : : copy ( collection . startIndices . begin ( ) , collection . startIndices . end ( ) , startIndices . begin ( ) ) ; <nl> } <nl> <nl> void GenericDescriptorMatcher : : KeyPointCollection : : add ( const vector < Mat > & _images , <nl> mmm a / modules / features2d / src / precomp . hpp <nl> ppp b / modules / features2d / src / precomp . hpp <nl> <nl> # include " opencv2 / imgproc / imgproc_c . h " <nl> # include " opencv2 / core / internal . hpp " <nl> <nl> + # include < algorithm > <nl> + <nl> # ifdef HAVE_TEGRA_OPTIMIZATION <nl> # include " opencv2 / features2d / features2d_tegra . hpp " <nl> # endif <nl> mmm a / modules / stitching / src / autocalib . cpp <nl> ppp b / modules / stitching / src / autocalib . cpp <nl> void estimateFocal ( const vector < ImageFeatures > & features , const vector < MatchesIn <nl> { <nl> double median ; <nl> <nl> - sort ( all_focals . begin ( ) , all_focals . end ( ) ) ; <nl> + std : : sort ( all_focals . begin ( ) , all_focals . end ( ) ) ; <nl> if ( all_focals . size ( ) % 2 = = 1 ) <nl> median = all_focals [ all_focals . size ( ) / 2 ] ; <nl> else <nl> mmm a / modules / stitching / src / stitcher . cpp <nl> ppp b / modules / stitching / src / stitcher . cpp <nl> void Stitcher : : estimateCameraParams ( ) <nl> focals . push_back ( cameras_ [ i ] . focal ) ; <nl> } <nl> <nl> - sort ( focals . begin ( ) , focals . end ( ) ) ; <nl> + std : : sort ( focals . begin ( ) , focals . end ( ) ) ; <nl> if ( focals . size ( ) % 2 = = 1 ) <nl> warped_image_scale_ = static_cast < float > ( focals [ focals . size ( ) / 2 ] ) ; <nl> else <nl> mmm a / modules / ts / include / opencv2 / ts / ts_gtest . h <nl> ppp b / modules / ts / include / opencv2 / ts / ts_gtest . h <nl> <nl> # define GTEST_HAS_RTTI 0 <nl> # else <nl> # define GTEST_HAS_RTTI 1 <nl> - # endif / / GTEST_OS_LINUX_ANDROID & & __STLPORT_MAJOR & & ! __EXCEPTIONS <nl> + # endif / / GTEST_OS_LINUX_ANDROID & & _STLPORT_MAJOR & & ! __EXCEPTIONS <nl> # else <nl> # define GTEST_HAS_RTTI 0 <nl> # endif / / __GXX_RTTI <nl> <nl> / / support TR1 tuple . libc + + only provides std : : tuple , in C + + 11 mode , <nl> / / and it can be used with some compilers that define __GNUC__ . <nl> # if ( defined ( __GNUC__ ) & & ! defined ( __CUDACC__ ) & & ( GTEST_GCC_VER_ > = 40000 ) \ <nl> - & & ! GTEST_OS_QNX & & ! defined ( _LIBCPP_VERSION ) ) | | _MSC_VER > = 1600 <nl> + & & ! GTEST_OS_QNX & & ! defined ( _LIBCPP_VERSION ) ) & & ! defined ( _STLPORT_MAJOR ) \ <nl> + | | ( defined ( _MSC_VER ) & & _MSC_VER > = 1600 ) <nl> # define GTEST_ENV_HAS_TR1_TUPLE_ 1 <nl> + # else <nl> + # define GTEST_ENV_HAS_TR1_TUPLE_ 0 <nl> # endif <nl> <nl> / / C + + 11 specifies that < tuple > provides std : : tuple . Use that if gtest is used <nl> <nl> / / can build with clang but need to use gcc4 . 2 ' s libstdc + + ) . <nl> # if GTEST_LANG_CXX11 & & ( ! defined ( __GLIBCXX__ ) | | __GLIBCXX__ > 20110325 ) <nl> # define GTEST_ENV_HAS_STD_TUPLE_ 1 <nl> - # else <nl> + # else <nl> # define GTEST_ENV_HAS_STD_TUPLE_ 0 <nl> # endif <nl> <nl> <nl> # define GTEST_USE_OWN_TR1_TUPLE 0 <nl> # else <nl> # define GTEST_USE_OWN_TR1_TUPLE 1 <nl> + # undef GTEST_HAS_TR1_TUPLE <nl> + # define GTEST_HAS_TR1_TUPLE 1 <nl> # endif <nl> <nl> # endif / / GTEST_USE_OWN_TR1_TUPLE <nl> mmm a / modules / videostab / src / inpainting . cpp <nl> ppp b / modules / videostab / src / inpainting . cpp <nl> void ConsistentMosaicInpainter : : inpaint ( int idx , Mat & frame , Mat & mask ) <nl> <nl> if ( var < stdevThresh_ * stdevThresh_ ) <nl> { <nl> - sort ( pixels . begin ( ) , pixels . begin ( ) + n ) ; <nl> + std : : sort ( pixels . begin ( ) , pixels . begin ( ) + n ) ; <nl> int nh = ( n - 1 ) / 2 ; <nl> int c1 = pixels [ nh ] . color . x ; <nl> int c2 = pixels [ nh ] . color . y ; <nl> mmm a / samples / c / facedetect . cpp <nl> ppp b / samples / c / facedetect . cpp <nl> <nl> # include " opencv2 / highgui / highgui . hpp " <nl> # include " opencv2 / imgproc / imgproc . hpp " <nl> <nl> + # include < cctype > <nl> # include < iostream > <nl> # include < iterator > <nl> # include < stdio . h > <nl> mmm a / samples / cpp / bagofwords_classification . cpp <nl> ppp b / samples / cpp / bagofwords_classification . cpp <nl> void VocData : : readClassifierGroundTruth ( const string & filename , vector < string > & <nl> <nl> string line ; <nl> string image ; <nl> - int obj_present ; <nl> + int obj_present = 0 ; <nl> while ( ! gtfile . eof ( ) ) <nl> { <nl> std : : getline ( gtfile , line ) ; <nl> void VocData : : readFileToString ( const string filename , string & file_contents ) <nl> <nl> int VocData : : stringToInteger ( const string input_str ) <nl> { <nl> - int result ; <nl> + int result = 0 ; <nl> <nl> stringstream ss ( input_str ) ; <nl> if ( ( ss > > result ) . fail ( ) ) <nl> mmm a / samples / cpp / calibration . cpp <nl> ppp b / samples / cpp / calibration . cpp <nl> <nl> # include " opencv2 / imgproc / imgproc . hpp " <nl> # include " opencv2 / calib3d / calib3d . hpp " <nl> # include " opencv2 / highgui / highgui . hpp " <nl> + <nl> + # include < cctype > <nl> # include < stdio . h > <nl> # include < string . h > <nl> # include < time . h > <nl> mmm a / samples / cpp / point_cloud . cpp <nl> ppp b / samples / cpp / point_cloud . cpp <nl> <nl> + # include < cctype > <nl> # include < cstring > <nl> # include < cmath > <nl> # include < iostream > <nl> # include < sstream > <nl> + <nl> # include " opencv2 / core / core . hpp " <nl> # include " opencv2 / core / opengl_interop . hpp " <nl> # include " opencv2 / highgui / highgui . hpp " <nl> mmm a / samples / cpp / tutorial_code / core / how_to_scan_images / how_to_scan_images . cpp <nl> ppp b / samples / cpp / tutorial_code / core / how_to_scan_images / how_to_scan_images . cpp <nl> int main ( int argc , char * argv [ ] ) <nl> return - 1 ; <nl> } <nl> <nl> - int divideWith ; / / convert our input string to number - C + + style <nl> + int divideWith = 0 ; / / convert our input string to number - C + + style <nl> stringstream s ; <nl> s < < argv [ 2 ] ; <nl> s > > divideWith ; <nl> - if ( ! s ) <nl> + if ( ! s | | ! divideWith ) <nl> { <nl> cout < < " Invalid number entered for dividing . " < < endl ; <nl> return - 1 ; <nl> mmm a / samples / cpp / videostab . cpp <nl> ppp b / samples / cpp / videostab . cpp <nl> class GlobalMotionReader : public IGlobalMotionEstimator <nl> ifstream f ( path . c_str ( ) ) ; <nl> if ( ! f . is_open ( ) ) <nl> throw runtime_error ( " can ' t open motions file : " + path ) ; <nl> - int size ; f > > size ; <nl> + int size = 0 ; f > > size ; <nl> motions_ . resize ( size ) ; <nl> for ( int i = 0 ; i < size ; + + i ) <nl> { <nl> | Merge pull request from taka - no - me : fix_stlport_build | opencv/opencv | 02c7e221a37464756bfe90b46776195ad530fa72 | 2012-12-24T08:44:13Z |
mmm a / src / objective - c / ProtoRPC / ProtoRPC . m <nl> ppp b / src / objective - c / ProtoRPC / ProtoRPC . m <nl> <nl> # import < RxLibrary / GRXWriteable . h > <nl> # import < RxLibrary / GRXWriter + Transformations . h > <nl> <nl> + static NSError * ErrorForBadProto ( id proto , Class expectedClass , NSError * parsingError ) { <nl> + NSDictionary * info = @ { <nl> + NSLocalizedDescriptionKey : @ " Unable to parse response from the server " , <nl> + NSLocalizedRecoverySuggestionErrorKey : @ " Retry with exponential backoff " , <nl> + NSUnderlyingErrorKey : parsingError , <nl> + @ " Expected class " : expectedClass , <nl> + @ " Received value " : proto , <nl> + } ; <nl> + / / TODO ( jcanizales ) : Use kGRPCErrorDomain and GRPCErrorCodeInternal when they ' re public . <nl> + return [ NSError errorWithDomain : @ " io . grpc " <nl> + code : 13 <nl> + userInfo : info ] ; <nl> + } <nl> + <nl> @ implementation ProtoRPC { <nl> id < GRXWriteable > _responseWriteable ; <nl> } <nl> - ( instancetype ) initWithHost : ( NSString * ) host <nl> if ( parsed ) { <nl> [ responsesWriteable writeValue : parsed ] ; <nl> } else { <nl> - [ weakSelf finishWithError : error ] ; <nl> + [ weakSelf finishWithError : ErrorForBadProto ( value , responseClass , error ) ] ; <nl> } <nl> } completionHandler : ^ ( NSError * errorOrNil ) { <nl> [ responsesWriteable writesFinishedWithError : errorOrNil ] ; <nl> | Wrap parsing error appropriately before propagating . | grpc/grpc | f5d519464f0ce606ff8746cc324dc5c7626a8e02 | 2015-09-03T21:20:12Z |
mmm a / fdbrpc / FlowTransport . actor . cpp <nl> ppp b / fdbrpc / FlowTransport . actor . cpp <nl> ACTOR Future < Void > connectionKeeper ( Reference < Peer > self , <nl> state Optional < double > firstConnFailedTime = Optional < double > ( ) ; <nl> loop { <nl> try { <nl> + state Future < Void > delayedHealthUpdateF = Future < Void > ( ) ; <nl> + <nl> if ( ! conn ) { / / Always , except for the first loop with an incoming connection <nl> self - > outgoingConnectionIdle = true ; <nl> / / Wait until there is something to send . <nl> ACTOR Future < Void > connectionKeeper ( Reference < Peer > self , <nl> TraceEvent ( " ConnectingTo " , conn ? conn - > getDebugID ( ) : UID ( ) ) <nl> . suppressFor ( 1 . 0 ) <nl> . detail ( " PeerAddr " , self - > destination ) <nl> - . detail ( " PeerReferences " , self - > peerReferences ) ; <nl> + . detail ( " PeerReferences " , self - > peerReferences ) <nl> + . detail ( " FailureStatus " , IFailureMonitor : : failureMonitor ( ) . getState ( self - > destination ) . isAvailable ( ) <nl> + ? " OK " <nl> + : " FAILED " ) ; <nl> <nl> - state Future < Void > delayedHealthUpdateF = Future < Void > ( ) ; <nl> try { <nl> choose { <nl> when ( Reference < IConnection > _conn = <nl> ACTOR Future < Void > connectionKeeper ( Reference < Peer > self , <nl> delayedHealthUpdateF = delayedHealthUpdate ( self - > destination ) ; <nl> wait ( connectionWriter ( self , conn ) | | reader | | connectionMonitor ( self ) ) ; <nl> } catch ( Error & e ) { <nl> - if ( e . code ( ) = = error_code_connection_failed ) <nl> - IFailureMonitor : : failureMonitor ( ) . setStatus ( self - > destination , FailureStatus ( true ) ) ; <nl> if ( e . code ( ) = = error_code_connection_failed | | e . code ( ) = = error_code_actor_cancelled | | <nl> e . code ( ) = = error_code_connection_unreferenced | | <nl> ( g_network - > isSimulated ( ) & & e . code ( ) = = error_code_checksum_failed ) ) <nl> ACTOR Future < Void > connectionKeeper ( Reference < Peer > self , <nl> . detail ( " PeerAddr " , self - > destination ) ; <nl> } <nl> <nl> + if ( e . code ( ) = = error_code_connection_failed ) { <nl> + IFailureMonitor : : failureMonitor ( ) . setStatus ( self - > destination , FailureStatus ( true ) ) ; <nl> + } <nl> + <nl> if ( self - > destination . isPublic ( ) <nl> & & IFailureMonitor : : failureMonitor ( ) . getState ( self - > destination ) . isAvailable ( ) <nl> & & ! FlowTransport : : transport ( ) . isClient ( ) ) <nl> ACTOR Future < Void > connectionKeeper ( Reference < Peer > self , <nl> <nl> conn - > close ( ) ; <nl> conn = Reference < IConnection > ( ) ; <nl> - } else { <nl> - IFailureMonitor : : failureMonitor ( ) . setStatus ( self - > destination , FailureStatus ( true ) ) ; <nl> } <nl> <nl> / / Clients might send more packets in response , which needs to go out on the next connection <nl> ACTOR Future < Void > connectionKeeper ( Reference < Peer > self , <nl> TraceEvent ( " PeerDestroy " ) . error ( e ) . suppressFor ( 1 . 0 ) . detail ( " PeerAddr " , self - > destination ) ; <nl> self - > connect . cancel ( ) ; <nl> self - > transport - > peers . erase ( self - > destination ) ; <nl> + IFailureMonitor : : failureMonitor ( ) . setStatus ( self - > destination , FailureStatus ( true ) ) ; <nl> return Void ( ) ; <nl> } <nl> } <nl> | FlowTransport : Refactor and clear FailureStatus on destroy | apple/foundationdb | 500a265d208641188af5c36d20d465e1fd749ecc | 2020-04-21T21:11:19Z |
mmm a / src / mongo / db / commands / apply_ops . cpp <nl> ppp b / src / mongo / db / commands / apply_ops . cpp <nl> namespace mongo { <nl> <nl> num + + ; <nl> <nl> - logOpForDbHash ( ns . c_str ( ) ) ; <nl> + WriteUnitOfWork wuow ( txn ) ; <nl> + logOpForDbHash ( txn , ns . c_str ( ) ) ; <nl> + wuow . commit ( ) ; <nl> } <nl> <nl> result . append ( " applied " , num ) ; <nl> mmm a / src / mongo / db / commands / dbhash . cpp <nl> ppp b / src / mongo / db / commands / dbhash . cpp <nl> namespace mongo { <nl> DBHashCmd dbhashCmd ; <nl> <nl> <nl> - void logOpForDbHash ( const char * ns ) { <nl> - dbhashCmd . wipeCacheForCollection ( ns ) ; <nl> + void logOpForDbHash ( OperationContext * txn , const char * ns ) { <nl> + dbhashCmd . wipeCacheForCollection ( txn , ns ) ; <nl> } <nl> <nl> / / mmm - <nl> namespace mongo { <nl> return 1 ; <nl> } <nl> <nl> - void DBHashCmd : : wipeCacheForCollection ( StringData ns ) { <nl> + class DBHashCmd : : DBHashLogOpHandler : public RecoveryUnit : : Change { <nl> + public : <nl> + DBHashLogOpHandler ( DBHashCmd * dCmd , <nl> + StringData ns ) : <nl> + _dCmd ( dCmd ) , <nl> + _ns ( ns . toString ( ) ) { <nl> + <nl> + } <nl> + void commit ( ) { <nl> + scoped_lock lk ( _dCmd - > _cachedHashedMutex ) ; <nl> + _dCmd - > _cachedHashed . erase ( _ns ) ; <nl> + } <nl> + void rollback ( ) { } <nl> + <nl> + private : <nl> + DBHashCmd * _dCmd ; <nl> + const std : : string _ns ; <nl> + } ; <nl> + <nl> + void DBHashCmd : : wipeCacheForCollection ( OperationContext * txn , <nl> + StringData ns ) { <nl> if ( ! isCachable ( ns ) ) <nl> return ; <nl> - scoped_lock lk ( _cachedHashedMutex ) ; <nl> - _cachedHashed . erase ( ns . toString ( ) ) ; <nl> + txn - > recoveryUnit ( ) - > registerChange ( new DBHashLogOpHandler ( this , ns ) ) ; <nl> } <nl> <nl> bool DBHashCmd : : isCachable ( StringData ns ) const { <nl> mmm a / src / mongo / db / commands / dbhash . h <nl> ppp b / src / mongo / db / commands / dbhash . h <nl> <nl> <nl> namespace mongo { <nl> <nl> - void logOpForDbHash ( const char * ns ) ; <nl> + void logOpForDbHash ( OperationContext * txn , const char * ns ) ; <nl> <nl> class DBHashCmd : public Command { <nl> public : <nl> namespace mongo { <nl> <nl> virtual bool run ( OperationContext * txn , const std : : string & dbname , BSONObj & cmdObj , int , std : : string & errmsg , BSONObjBuilder & result , bool ) ; <nl> <nl> - void wipeCacheForCollection ( StringData ns ) ; <nl> + void wipeCacheForCollection ( OperationContext * txn , StringData ns ) ; <nl> <nl> private : <nl> <nl> + / * * <nl> + * RecoveryUnit : : Change subclass used to commit work for dbhash logOp listener <nl> + * / <nl> + class DBHashLogOpHandler ; <nl> + <nl> bool isCachable ( StringData ns ) const ; <nl> <nl> std : : string hashCollection ( OperationContext * opCtx , Database * db , const std : : string & fullCollectionName , bool * fromCache ) ; <nl> mmm a / src / mongo / db / repl / oplog . cpp <nl> ppp b / src / mongo / db / repl / oplog . cpp <nl> namespace { <nl> / / <nl> getGlobalAuthorizationManager ( ) - > logOp ( txn , opstr , ns , obj , patt , b ) ; <nl> logOpForSharding ( txn , opstr , ns , obj , patt , fromMigrate ) ; <nl> + logOpForDbHash ( txn , ns ) ; <nl> + <nl> + if ( strstr ( ns , " . system . js " ) ) { <nl> + Scope : : storedFuncMod ( txn ) ; <nl> + } <nl> <nl> try { <nl> / / TODO SERVER - 15192 remove this once all listeners are rollback - safe . <nl> namespace { <nl> } <nl> } ; <nl> txn - > recoveryUnit ( ) - > registerChange ( new RollbackPreventer ( ) ) ; <nl> - logOpForDbHash ( ns ) ; <nl> - <nl> - if ( strstr ( ns , " . system . js " ) ) { <nl> - Scope : : storedFuncMod ( ) ; / / this is terrible <nl> - } <nl> } <nl> catch ( const DBException & ex ) { <nl> severe ( ) < < " Fatal DBException in logOp ( ) : " < < ex . toString ( ) ; <nl> mmm a / src / mongo / s / d_migrate . cpp <nl> ppp b / src / mongo / s / d_migrate . cpp <nl> namespace mongo { <nl> <nl> txn - > recoveryUnit ( ) - > registerChange ( new LogOpForShardingHandler ( this , <nl> txn , <nl> - ide , <nl> + ide . wrap ( ) , <nl> obj , <nl> op , <nl> notInActiveChunk ) ) ; <nl> namespace mongo { <nl> public : <nl> LogOpForShardingHandler ( MigrateFromStatus * migrateFromStatus , <nl> OperationContext * txn , <nl> - const BSONElement & ide , <nl> + const BSONObj & idObj , <nl> const BSONObj & obj , <nl> const char op , <nl> const bool notInActiveChunk ) : <nl> _migrateFromStatus ( migrateFromStatus ) , <nl> _txn ( txn ) , <nl> - _ide ( ide ) , <nl> + _idObj ( idObj . getOwned ( ) ) , <nl> _obj ( obj . getOwned ( ) ) , <nl> _op ( op ) , <nl> _notInActiveChunk ( notInActiveChunk ) { <nl> namespace mongo { <nl> <nl> scoped_lock sl ( _migrateFromStatus - > _mutex ) ; <nl> / / can ' t filter deletes : ( <nl> - _migrateFromStatus - > _deleted . push_back ( _ide . wrap ( ) ) ; <nl> - _migrateFromStatus - > _memoryUsed + = _ide . size ( ) + 5 ; <nl> + _migrateFromStatus - > _deleted . push_back ( _idObj ) ; <nl> + _migrateFromStatus - > _memoryUsed + = _idObj . firstElement ( ) . size ( ) + 5 ; <nl> return ; <nl> } <nl> <nl> namespace mongo { <nl> if ( ! Helpers : : findById ( _txn , <nl> ctx . db ( ) , <nl> _migrateFromStatus - > _ns . c_str ( ) , <nl> - _ide . wrap ( ) , <nl> + _idObj , <nl> it ) ) { <nl> - warning ( ) < < " logOpForSharding couldn ' t find : " < < _ide <nl> + warning ( ) < < " logOpForSharding couldn ' t find : " <nl> + < < _idObj . firstElement ( ) <nl> < < " even though should have " < < migrateLog ; <nl> return ; <nl> } <nl> namespace mongo { <nl> } <nl> <nl> scoped_lock sl ( _migrateFromStatus - > _mutex ) ; <nl> - _migrateFromStatus - > _reload . push_back ( _ide . wrap ( ) ) ; <nl> - _migrateFromStatus - > _memoryUsed + = _ide . size ( ) + 5 ; <nl> + _migrateFromStatus - > _reload . push_back ( _idObj ) ; <nl> + _migrateFromStatus - > _memoryUsed + = _idObj . firstElement ( ) . size ( ) + 5 ; <nl> } <nl> <nl> virtual void rollback ( ) { } <nl> namespace mongo { <nl> private : <nl> MigrateFromStatus * _migrateFromStatus ; <nl> OperationContext * _txn ; <nl> - const BSONElement _ide ; <nl> + const BSONObj _idObj ; <nl> const BSONObj _obj ; <nl> const char _op ; <nl> const bool _notInActiveChunk ; <nl> mmm a / src / mongo / scripting / engine . cpp <nl> ppp b / src / mongo / scripting / engine . cpp <nl> <nl> # include " mongo / client / dbclientcursor . h " <nl> # include " mongo / client / dbclientinterface . h " <nl> # include " mongo / db / global_environment_experiment . h " <nl> + # include " mongo / db / operation_context . h " <nl> # include " mongo / platform / unordered_set . h " <nl> # include " mongo / util / file . h " <nl> # include " mongo / util / log . h " <nl> namespace mongo { <nl> using std : : set ; <nl> using std : : string ; <nl> <nl> - long long Scope : : _lastVersion = 1 ; <nl> + AtomicInt64 Scope : : _lastVersion ( 1 ) ; <nl> <nl> namespace { <nl> / / 2 GB is the largest support Javascript file size . <nl> namespace { <nl> return exec ( code , filename , printResult , reportError , timeoutMs ) ; <nl> } <nl> <nl> - void Scope : : storedFuncMod ( ) { <nl> - _lastVersion + + ; <nl> + class Scope : : StoredFuncModLogOpHandler : public RecoveryUnit : : Change { <nl> + public : <nl> + void commit ( ) { <nl> + _lastVersion . fetchAndAdd ( 1 ) ; <nl> + } <nl> + void rollback ( ) { } <nl> + } ; <nl> + <nl> + void Scope : : storedFuncMod ( OperationContext * txn ) { <nl> + txn - > recoveryUnit ( ) - > registerChange ( new StoredFuncModLogOpHandler ( ) ) ; <nl> } <nl> <nl> void Scope : : validateObjectIdString ( const string & str ) { <nl> namespace { <nl> uassert ( 10208 , " need to have locallyConnected already " , _localDBName . size ( ) ) ; <nl> } <nl> <nl> - if ( _loadedVersion = = _lastVersion ) <nl> + int64_t lastVersion = _lastVersion . load ( ) ; <nl> + if ( _loadedVersion = = lastVersion ) <nl> return ; <nl> <nl> - _loadedVersion = _lastVersion ; <nl> + _loadedVersion = lastVersion ; <nl> string coll = _localDBName + " . system . js " ; <nl> <nl> scoped_ptr < DBClientBase > directDBClient ( createDirectClient ( txn ) ) ; <nl> mmm a / src / mongo / scripting / engine . h <nl> ppp b / src / mongo / scripting / engine . h <nl> <nl> <nl> # include " mongo / db / global_environment_experiment . h " <nl> # include " mongo / db / jsobj . h " <nl> + # include " mongo / platform / atomic_word . h " <nl> <nl> namespace mongo { <nl> typedef unsigned long long ScriptingFunction ; <nl> namespace mongo { <nl> * if any changes are made to . system . js , call this <nl> * right now its just global - slightly inefficient , but a lot simpler <nl> * / <nl> - static void storedFuncMod ( ) ; <nl> + static void storedFuncMod ( OperationContext * txn ) ; <nl> <nl> static void validateObjectIdString ( const std : : string & str ) ; <nl> <nl> namespace mongo { <nl> <nl> protected : <nl> friend class PooledScope ; <nl> + <nl> + / * * <nl> + * RecoveryUnit : : Change subclass used to commit work for <nl> + * Scope : : storedFuncMod logOp listener . <nl> + * / <nl> + class StoredFuncModLogOpHandler ; <nl> + <nl> virtual FunctionCacheMap & getFunctionCache ( ) { return _cachedFunctions ; } <nl> virtual ScriptingFunction _createFunction ( const char * code , <nl> ScriptingFunction functionNumber = 0 ) = 0 ; <nl> <nl> std : : string _localDBName ; <nl> - long long _loadedVersion ; <nl> + int64_t _loadedVersion ; <nl> std : : set < std : : string > _storedNames ; <nl> - static long long _lastVersion ; <nl> + static AtomicInt64 _lastVersion ; <nl> FunctionCacheMap _cachedFunctions ; <nl> int _numTimesUsed ; <nl> bool _lastRetIsNativeCode ; / / v8 only : set to true if eval ' d script returns a native func <nl> | SERVER - 15192 Make dbhash and storedFuncMod logOp listeners rollback - safe | mongodb/mongo | ffb3d64e1ae2f3dc84b3bbcb5d23ef85f87a9415 | 2015-02-18T05:05:25Z |
mmm a / utils / analyze_code_size . py <nl> ppp b / utils / analyze_code_size . py <nl> def parse_segments ( path , arch ) : <nl> segment_regex = re . compile ( <nl> r " ^ 0x [ 0 - 9a - f ] + \ ( \ s * 0x ( ? P < size > [ 0 - 9a - f ] + ) \ ) " <nl> r " ( ? P < name > . + ? ) ( ? P < name2 > . + ? ) $ " ) <nl> + object_file_segment_regex = re . compile ( <nl> + r " ^ 0x [ 0 - 9a - f ] + \ ( \ s * 0x ( ? P < size > [ 0 - 9a - f ] + ) \ ) " <nl> + r " SEGMENT $ " ) <nl> section_regex = re . compile ( <nl> r " ^ 0x [ 0 - 9a - f ] + \ ( \ s * 0x ( ? P < size > [ 0 - 9a - f ] + ) \ ) " <nl> r " ( ? P < name > . + ? ) ( ? P < name2 > . + ? ) $ " ) <nl> def parse_segments ( path , arch ) : <nl> segments . append ( new_segment ) <nl> continue <nl> <nl> + object_file_segment_match = object_file_segment_regex . match ( line ) <nl> + if object_file_segment_match : <nl> + new_segment = Segment ( " SEGMENT " ) <nl> + segments . append ( new_segment ) <nl> + continue <nl> + <nl> # Match a section entry . <nl> section_match = section_regex . match ( line ) <nl> if section_match : <nl> | Merge pull request from aschwaighofer / analyze_code_size_object_files | apple/swift | a2896c42b1dd30ada45794c630f613f8a2562eb1 | 2019-02-12T19:22:01Z |
mmm a / src / video_core / gpu . cpp <nl> ppp b / src / video_core / gpu . cpp <nl> u32 RenderTargetBytesPerPixel ( RenderTargetFormat format ) { <nl> case RenderTargetFormat : : RGBA32_UINT : <nl> return 16 ; <nl> case RenderTargetFormat : : RGBA16_UINT : <nl> + case RenderTargetFormat : : RGBA16_UNORM : <nl> case RenderTargetFormat : : RGBA16_FLOAT : <nl> case RenderTargetFormat : : RG32_FLOAT : <nl> case RenderTargetFormat : : RG32_UINT : <nl> mmm a / src / video_core / gpu . h <nl> ppp b / src / video_core / gpu . h <nl> enum class RenderTargetFormat : u32 { <nl> NONE = 0x0 , <nl> RGBA32_FLOAT = 0xC0 , <nl> RGBA32_UINT = 0xC2 , <nl> + RGBA16_UNORM = 0xC6 , <nl> RGBA16_UINT = 0xC9 , <nl> RGBA16_FLOAT = 0xCA , <nl> RG32_FLOAT = 0xCB , <nl> mmm a / src / video_core / renderer_opengl / gl_rasterizer_cache . cpp <nl> ppp b / src / video_core / renderer_opengl / gl_rasterizer_cache . cpp <nl> static constexpr std : : array < FormatTuple , SurfaceParams : : MaxPixelFormat > tex_form <nl> { GL_R8 , GL_RED , GL_UNSIGNED_BYTE , ComponentType : : UNorm , false } , / / R8 <nl> { GL_R8UI , GL_RED_INTEGER , GL_UNSIGNED_BYTE , ComponentType : : UInt , false } , / / R8UI <nl> { GL_RGBA16F , GL_RGBA , GL_HALF_FLOAT , ComponentType : : Float , false } , / / RGBA16F <nl> + { GL_RGBA16 , GL_RGBA , GL_UNSIGNED_SHORT , ComponentType : : UNorm , false } , / / RGBA16U <nl> { GL_RGBA16UI , GL_RGBA , GL_UNSIGNED_SHORT , ComponentType : : UInt , false } , / / RGBA16UI <nl> { GL_R11F_G11F_B10F , GL_RGB , GL_UNSIGNED_INT_10F_11F_11F_REV , ComponentType : : Float , <nl> false } , / / R11FG11FB10F <nl> static constexpr std : : array < void ( * ) ( u32 , u32 , u32 , std : : vector < u8 > & , Tegra : : GPU <nl> MortonCopy < true , PixelFormat : : R8 > , <nl> MortonCopy < true , PixelFormat : : R8UI > , <nl> MortonCopy < true , PixelFormat : : RGBA16F > , <nl> + MortonCopy < true , PixelFormat : : RGBA16U > , <nl> MortonCopy < true , PixelFormat : : RGBA16UI > , <nl> MortonCopy < true , PixelFormat : : R11FG11FB10F > , <nl> MortonCopy < true , PixelFormat : : RGBA32UI > , <nl> static constexpr std : : array < void ( * ) ( u32 , u32 , u32 , std : : vector < u8 > & , Tegra : : GPU <nl> MortonCopy < false , PixelFormat : : R8 > , <nl> MortonCopy < false , PixelFormat : : R8UI > , <nl> MortonCopy < false , PixelFormat : : RGBA16F > , <nl> + MortonCopy < false , PixelFormat : : RGBA16U > , <nl> MortonCopy < false , PixelFormat : : RGBA16UI > , <nl> MortonCopy < false , PixelFormat : : R11FG11FB10F > , <nl> MortonCopy < false , PixelFormat : : RGBA32UI > , <nl> mmm a / src / video_core / renderer_opengl / gl_rasterizer_cache . h <nl> ppp b / src / video_core / renderer_opengl / gl_rasterizer_cache . h <nl> struct SurfaceParams { <nl> R8 = 5 , <nl> R8UI = 6 , <nl> RGBA16F = 7 , <nl> - RGBA16UI = 8 , <nl> - R11FG11FB10F = 9 , <nl> - RGBA32UI = 10 , <nl> - DXT1 = 11 , <nl> - DXT23 = 12 , <nl> - DXT45 = 13 , <nl> - DXN1 = 14 , / / This is also known as BC4 <nl> - DXN2UNORM = 15 , <nl> - DXN2SNORM = 16 , <nl> - BC7U = 17 , <nl> - ASTC_2D_4X4 = 18 , <nl> - G8R8 = 19 , <nl> - BGRA8 = 20 , <nl> - RGBA32F = 21 , <nl> - RG32F = 22 , <nl> - R32F = 23 , <nl> - R16F = 24 , <nl> - R16UNORM = 25 , <nl> - R16S = 26 , <nl> - R16UI = 27 , <nl> - R16I = 28 , <nl> - RG16 = 29 , <nl> - RG16F = 30 , <nl> - RG16UI = 31 , <nl> - RG16I = 32 , <nl> - RG16S = 33 , <nl> - RGB32F = 34 , <nl> - SRGBA8 = 35 , <nl> - RG8U = 36 , <nl> - RG8S = 37 , <nl> - RG32UI = 38 , <nl> - R32UI = 39 , <nl> + RGBA16U = 8 , <nl> + RGBA16UI = 9 , <nl> + R11FG11FB10F = 10 , <nl> + RGBA32UI = 11 , <nl> + DXT1 = 12 , <nl> + DXT23 = 13 , <nl> + DXT45 = 14 , <nl> + DXN1 = 15 , / / This is also known as BC4 <nl> + DXN2UNORM = 16 , <nl> + DXN2SNORM = 17 , <nl> + BC7U = 18 , <nl> + ASTC_2D_4X4 = 19 , <nl> + G8R8 = 20 , <nl> + BGRA8 = 21 , <nl> + RGBA32F = 22 , <nl> + RG32F = 23 , <nl> + R32F = 24 , <nl> + R16F = 25 , <nl> + R16UNORM = 26 , <nl> + R16S = 27 , <nl> + R16UI = 28 , <nl> + R16I = 29 , <nl> + RG16 = 30 , <nl> + RG16F = 31 , <nl> + RG16UI = 32 , <nl> + RG16I = 33 , <nl> + RG16S = 34 , <nl> + RGB32F = 35 , <nl> + SRGBA8 = 36 , <nl> + RG8U = 37 , <nl> + RG8S = 38 , <nl> + RG32UI = 39 , <nl> + R32UI = 40 , <nl> <nl> MaxColorFormat , <nl> <nl> / / DepthStencil formats <nl> - Z24S8 = 40 , <nl> - S8Z24 = 41 , <nl> - Z32F = 42 , <nl> - Z16 = 43 , <nl> - Z32FS8 = 44 , <nl> + Z24S8 = 41 , <nl> + S8Z24 = 42 , <nl> + Z32F = 43 , <nl> + Z16 = 44 , <nl> + Z32FS8 = 45 , <nl> <nl> MaxDepthStencilFormat , <nl> <nl> struct SurfaceParams { <nl> 1 , / / R8 <nl> 1 , / / R8UI <nl> 1 , / / RGBA16F <nl> + 1 , / / RGBA16U <nl> 1 , / / RGBA16UI <nl> 1 , / / R11FG11FB10F <nl> 1 , / / RGBA32UI <nl> struct SurfaceParams { <nl> 8 , / / R8 <nl> 8 , / / R8UI <nl> 64 , / / RGBA16F <nl> + 64 , / / RGBA16U <nl> 64 , / / RGBA16UI <nl> 32 , / / R11FG11FB10F <nl> 128 , / / RGBA32UI <nl> struct SurfaceParams { <nl> return PixelFormat : : A2B10G10R10 ; <nl> case Tegra : : RenderTargetFormat : : RGBA16_FLOAT : <nl> return PixelFormat : : RGBA16F ; <nl> + case Tegra : : RenderTargetFormat : : RGBA16_UNORM : <nl> + return PixelFormat : : RGBA16U ; <nl> case Tegra : : RenderTargetFormat : : RGBA16_UINT : <nl> return PixelFormat : : RGBA16UI ; <nl> case Tegra : : RenderTargetFormat : : RGBA32_FLOAT : <nl> struct SurfaceParams { <nl> case Tegra : : RenderTargetFormat : : R16_UNORM : <nl> case Tegra : : RenderTargetFormat : : B5G6R5_UNORM : <nl> case Tegra : : RenderTargetFormat : : RG8_UNORM : <nl> + case Tegra : : RenderTargetFormat : : RGBA16_UNORM : <nl> return ComponentType : : UNorm ; <nl> case Tegra : : RenderTargetFormat : : RGBA8_SNORM : <nl> case Tegra : : RenderTargetFormat : : RG16_SNORM : <nl> | renderer_opengl : Implement RenderTargetFormat : : RGBA16_UNORM . | yuzu-emu/yuzu | 6e52f37d5ba4a11bcbcfbc2840554e3b7705a2c7 | 2018-08-13T22:20:07Z |
mmm a / dlib / optimization / find_max_factor_graph_viterbi_abstract . h <nl> ppp b / dlib / optimization / find_max_factor_graph_viterbi_abstract . h <nl> namespace dlib <nl> - This function is a tool for exactly solving the MAP problem in a chain - structured <nl> graphical model or factor graph . That is , it attempts to solve a certain kind of <nl> optimization problem which can be defined as follows : <nl> - - Let X be a set of prob . number_of_nodes ( ) integer valued variables , each taking <nl> + - Let X denote a set of prob . number_of_nodes ( ) integer valued variables , each taking <nl> a value in the range [ 0 , map_problem : : num_states ) . <nl> - Let X ( i ) = the ith variable in X . <nl> - Let F ( i ) = factor_value_i ( X ( i ) , X ( i - 1 ) , . . . , X ( i - map_problem : : order ) ) <nl> | Minor clarification . | davisking/dlib | 6bbbd3cf82e9ad093f8d2bf6b39ccc1495de83da | 2011-09-18T19:46:39Z |
mmm a / core / io / multiplayer_api . cpp <nl> ppp b / core / io / multiplayer_api . cpp <nl> <nl> # include " core / io / marshalls . h " <nl> # include " scene / main / node . h " <nl> <nl> + _FORCE_INLINE_ bool _should_call_local ( MultiplayerAPI : : RPCMode mode , bool is_master , bool & r_skip_rpc ) { <nl> + <nl> + switch ( mode ) { <nl> + <nl> + case MultiplayerAPI : : RPC_MODE_DISABLED : { <nl> + / / do nothing <nl> + } break ; <nl> + case MultiplayerAPI : : RPC_MODE_REMOTE : { <nl> + / / do nothing also , no need to call local <nl> + } break ; <nl> + case MultiplayerAPI : : RPC_MODE_REMOTESYNC : <nl> + case MultiplayerAPI : : RPC_MODE_MASTERSYNC : <nl> + case MultiplayerAPI : : RPC_MODE_SLAVESYNC : <nl> + case MultiplayerAPI : : RPC_MODE_SYNC : { <nl> + / / call it , sync always results in call <nl> + return true ; <nl> + } break ; <nl> + case MultiplayerAPI : : RPC_MODE_MASTER : { <nl> + if ( is_master ) <nl> + r_skip_rpc = true ; / / no other master so . . <nl> + return is_master ; <nl> + } break ; <nl> + case MultiplayerAPI : : RPC_MODE_SLAVE : { <nl> + return ! is_master ; <nl> + } break ; <nl> + } <nl> + return false ; <nl> + } <nl> + <nl> + _FORCE_INLINE_ bool _can_call_mode ( Node * p_node , MultiplayerAPI : : RPCMode mode , int p_remote_id ) { <nl> + switch ( mode ) { <nl> + <nl> + case MultiplayerAPI : : RPC_MODE_DISABLED : { <nl> + return false ; <nl> + } break ; <nl> + case MultiplayerAPI : : RPC_MODE_REMOTE : { <nl> + return true ; <nl> + } break ; <nl> + case MultiplayerAPI : : RPC_MODE_REMOTESYNC : <nl> + case MultiplayerAPI : : RPC_MODE_SYNC : { <nl> + return true ; <nl> + } break ; <nl> + case MultiplayerAPI : : RPC_MODE_MASTERSYNC : <nl> + case MultiplayerAPI : : RPC_MODE_MASTER : { <nl> + return p_node - > is_network_master ( ) ; <nl> + } break ; <nl> + case MultiplayerAPI : : RPC_MODE_SLAVESYNC : <nl> + case MultiplayerAPI : : RPC_MODE_SLAVE : { <nl> + return ! p_node - > is_network_master ( ) & & p_remote_id = = p_node - > get_network_master ( ) ; <nl> + } break ; <nl> + } <nl> + <nl> + return false ; <nl> + } <nl> + <nl> void MultiplayerAPI : : poll ( ) { <nl> <nl> if ( ! network_peer . is_valid ( ) | | network_peer - > get_connection_status ( ) = = NetworkedMultiplayerPeer : : CONNECTION_DISCONNECTED ) <nl> Node * MultiplayerAPI : : _process_get_node ( int p_from , const uint8_t * p_packet , int <nl> } <nl> <nl> void MultiplayerAPI : : _process_rpc ( Node * p_node , const StringName & p_name , int p_from , const uint8_t * p_packet , int p_packet_len , int p_offset ) { <nl> - if ( ! p_node - > can_call_rpc ( p_name , p_from ) ) <nl> - return ; <nl> <nl> ERR_FAIL_COND ( p_offset > = p_packet_len ) ; <nl> <nl> + / / Check that remote can call the RPC on this node <nl> + RPCMode rpc_mode = RPC_MODE_DISABLED ; <nl> + const Map < StringName , RPCMode > : : Element * E = p_node - > get_node_rpc_mode ( p_name ) ; <nl> + if ( E ) { <nl> + rpc_mode = E - > get ( ) ; <nl> + } else if ( p_node - > get_script_instance ( ) ) { <nl> + rpc_mode = p_node - > get_script_instance ( ) - > get_rpc_mode ( p_name ) ; <nl> + } <nl> + ERR_FAIL_COND ( ! _can_call_mode ( p_node , rpc_mode , p_from ) ) ; <nl> + <nl> int argc = p_packet [ p_offset ] ; <nl> Vector < Variant > args ; <nl> Vector < const Variant * > argp ; <nl> void MultiplayerAPI : : _process_rpc ( Node * p_node , const StringName & p_name , int p_ <nl> <nl> void MultiplayerAPI : : _process_rset ( Node * p_node , const StringName & p_name , int p_from , const uint8_t * p_packet , int p_packet_len , int p_offset ) { <nl> <nl> - if ( ! p_node - > can_call_rset ( p_name , p_from ) ) <nl> - return ; <nl> - <nl> ERR_FAIL_COND ( p_offset > = p_packet_len ) ; <nl> <nl> + / / Check that remote can call the RSET on this node <nl> + RPCMode rset_mode = RPC_MODE_DISABLED ; <nl> + const Map < StringName , RPCMode > : : Element * E = p_node - > get_node_rset_mode ( p_name ) ; <nl> + if ( E ) { <nl> + rset_mode = E - > get ( ) ; <nl> + } else if ( p_node - > get_script_instance ( ) ) { <nl> + rset_mode = p_node - > get_script_instance ( ) - > get_rset_mode ( p_name ) ; <nl> + } <nl> + ERR_FAIL_COND ( ! _can_call_mode ( p_node , rset_mode , p_from ) ) ; <nl> + <nl> Variant value ; <nl> decode_variant ( value , & p_packet [ p_offset ] , p_packet_len - p_offset ) ; <nl> <nl> void MultiplayerAPI : : _server_disconnected ( ) { <nl> emit_signal ( " server_disconnected " ) ; <nl> } <nl> <nl> - bool _should_call_native ( Node : : RPCMode mode , bool is_master , bool & r_skip_rpc ) { <nl> - <nl> - switch ( mode ) { <nl> - <nl> - case Node : : RPC_MODE_DISABLED : { <nl> - / / do nothing <nl> - } break ; <nl> - case Node : : RPC_MODE_REMOTE : { <nl> - / / do nothing also , no need to call local <nl> - } break ; <nl> - case Node : : RPC_MODE_SYNC : { <nl> - / / call it , sync always results in call <nl> - return true ; <nl> - } break ; <nl> - case Node : : RPC_MODE_MASTER : { <nl> - if ( is_master ) <nl> - r_skip_rpc = true ; / / no other master so . . <nl> - return is_master ; <nl> - } break ; <nl> - case Node : : RPC_MODE_SLAVE : { <nl> - return ! is_master ; <nl> - } break ; <nl> - } <nl> - return false ; <nl> - } <nl> - <nl> - bool _should_call_script ( ScriptInstance : : RPCMode mode , bool is_master , bool & r_skip_rpc ) { <nl> - switch ( mode ) { <nl> - <nl> - case ScriptInstance : : RPC_MODE_DISABLED : { <nl> - / / do nothing <nl> - } break ; <nl> - case ScriptInstance : : RPC_MODE_REMOTE : { <nl> - / / do nothing also , no need to call local <nl> - } break ; <nl> - case ScriptInstance : : RPC_MODE_SYNC : { <nl> - / / call it , sync always results in call <nl> - return true ; <nl> - } break ; <nl> - case ScriptInstance : : RPC_MODE_MASTER : { <nl> - if ( is_master ) <nl> - r_skip_rpc = true ; / / no other master so . . <nl> - return is_master ; <nl> - } break ; <nl> - case ScriptInstance : : RPC_MODE_SLAVE : { <nl> - return ! is_master ; <nl> - } break ; <nl> - } <nl> - return false ; <nl> - } <nl> - <nl> void MultiplayerAPI : : rpcp ( Node * p_node , int p_peer_id , bool p_unreliable , const StringName & p_method , const Variant * * p_arg , int p_argcount ) { <nl> <nl> ERR_FAIL_COND ( ! p_node - > is_inside_tree ( ) ) ; <nl> void MultiplayerAPI : : rpcp ( Node * p_node , int p_peer_id , bool p_unreliable , const <nl> if ( p_peer_id = = 0 | | p_peer_id = = node_id | | ( p_peer_id < 0 & & p_peer_id ! = - node_id ) ) { <nl> / / check that send mode can use local call <nl> <nl> - const Map < StringName , Node : : RPCMode > : : Element * E = p_node - > get_node_rpc_mode ( p_method ) ; <nl> + const Map < StringName , RPCMode > : : Element * E = p_node - > get_node_rpc_mode ( p_method ) ; <nl> if ( E ) { <nl> - call_local_native = _should_call_native ( E - > get ( ) , is_master , skip_rpc ) ; <nl> + call_local_native = _should_call_local ( E - > get ( ) , is_master , skip_rpc ) ; <nl> } <nl> <nl> if ( call_local_native ) { <nl> / / done below <nl> } else if ( p_node - > get_script_instance ( ) ) { <nl> / / attempt with script <nl> - ScriptInstance : : RPCMode rpc_mode = p_node - > get_script_instance ( ) - > get_rpc_mode ( p_method ) ; <nl> - call_local_script = _should_call_script ( rpc_mode , is_master , skip_rpc ) ; <nl> + RPCMode rpc_mode = p_node - > get_script_instance ( ) - > get_rpc_mode ( p_method ) ; <nl> + call_local_script = _should_call_local ( rpc_mode , is_master , skip_rpc ) ; <nl> } <nl> } <nl> <nl> void MultiplayerAPI : : rsetp ( Node * p_node , int p_peer_id , bool p_unreliable , const <nl> <nl> bool set_local = false ; <nl> <nl> - const Map < StringName , Node : : RPCMode > : : Element * E = p_node - > get_node_rset_mode ( p_property ) ; <nl> + const Map < StringName , RPCMode > : : Element * E = p_node - > get_node_rset_mode ( p_property ) ; <nl> if ( E ) { <nl> <nl> - set_local = _should_call_native ( E - > get ( ) , is_master , skip_rset ) ; <nl> + set_local = _should_call_local ( E - > get ( ) , is_master , skip_rset ) ; <nl> } <nl> <nl> if ( set_local ) { <nl> void MultiplayerAPI : : rsetp ( Node * p_node , int p_peer_id , bool p_unreliable , const <nl> } <nl> } else if ( p_node - > get_script_instance ( ) ) { <nl> / / attempt with script <nl> - ScriptInstance : : RPCMode rpc_mode = p_node - > get_script_instance ( ) - > get_rset_mode ( p_property ) ; <nl> + RPCMode rpc_mode = p_node - > get_script_instance ( ) - > get_rset_mode ( p_property ) ; <nl> <nl> - set_local = _should_call_script ( rpc_mode , is_master , skip_rset ) ; <nl> + set_local = _should_call_local ( rpc_mode , is_master , skip_rset ) ; <nl> <nl> if ( set_local ) { <nl> <nl> void MultiplayerAPI : : _bind_methods ( ) { <nl> ADD_SIGNAL ( MethodInfo ( " connected_to_server " ) ) ; <nl> ADD_SIGNAL ( MethodInfo ( " connection_failed " ) ) ; <nl> ADD_SIGNAL ( MethodInfo ( " server_disconnected " ) ) ; <nl> + <nl> + BIND_ENUM_CONSTANT ( RPC_MODE_DISABLED ) ; <nl> + BIND_ENUM_CONSTANT ( RPC_MODE_REMOTE ) ; <nl> + BIND_ENUM_CONSTANT ( RPC_MODE_SYNC ) ; <nl> + BIND_ENUM_CONSTANT ( RPC_MODE_MASTER ) ; <nl> + BIND_ENUM_CONSTANT ( RPC_MODE_SLAVE ) ; <nl> + BIND_ENUM_CONSTANT ( RPC_MODE_REMOTESYNC ) ; <nl> + BIND_ENUM_CONSTANT ( RPC_MODE_MASTERSYNC ) ; <nl> + BIND_ENUM_CONSTANT ( RPC_MODE_SLAVESYNC ) ; <nl> } <nl> <nl> MultiplayerAPI : : MultiplayerAPI ( ) { <nl> mmm a / core / io / multiplayer_api . h <nl> ppp b / core / io / multiplayer_api . h <nl> class MultiplayerAPI : public Reference { <nl> NETWORK_COMMAND_RAW , <nl> } ; <nl> <nl> + enum RPCMode { <nl> + <nl> + RPC_MODE_DISABLED , / / No rpc for this method , calls to this will be blocked ( default ) <nl> + RPC_MODE_REMOTE , / / Using rpc ( ) on it will call method / set property in all remote peers <nl> + RPC_MODE_SYNC , / / Using rpc ( ) on it will call method / set property in all remote peers and locally <nl> + RPC_MODE_MASTER , / / Using rpc ( ) on it will call method on wherever the master is , be it local or remote <nl> + RPC_MODE_SLAVE , / / Using rpc ( ) on it will call method for all slaves <nl> + RPC_MODE_REMOTESYNC , / / Same as RPC_MODE_SYNC , compatibility <nl> + RPC_MODE_MASTERSYNC , / / Using rpc ( ) on it will call method / set property in the master peer and locally <nl> + RPC_MODE_SLAVESYNC , / / Using rpc ( ) on it will call method / set property in all slave peers and locally <nl> + } ; <nl> + <nl> void poll ( ) ; <nl> void clear ( ) ; <nl> void set_root_node ( Node * p_node ) ; <nl> class MultiplayerAPI : public Reference { <nl> ~ MultiplayerAPI ( ) ; <nl> } ; <nl> <nl> + VARIANT_ENUM_CAST ( MultiplayerAPI : : RPCMode ) ; <nl> + <nl> # endif / / MULTIPLAYER_PROTOCOL_H <nl> mmm a / core / script_language . h <nl> ppp b / core / script_language . h <nl> <nl> # ifndef SCRIPT_LANGUAGE_H <nl> # define SCRIPT_LANGUAGE_H <nl> <nl> + # include " io / multiplayer_api . h " <nl> # include " map . h " <nl> # include " pair . h " <nl> # include " resource . h " <nl> class ScriptInstance { <nl> <nl> virtual bool is_placeholder ( ) const { return false ; } <nl> <nl> - enum RPCMode { <nl> - RPC_MODE_DISABLED , <nl> - RPC_MODE_REMOTE , <nl> - RPC_MODE_SYNC , <nl> - RPC_MODE_MASTER , <nl> - RPC_MODE_SLAVE , <nl> - } ; <nl> - <nl> - virtual RPCMode get_rpc_mode ( const StringName & p_method ) const = 0 ; <nl> - virtual RPCMode get_rset_mode ( const StringName & p_variable ) const = 0 ; <nl> + virtual MultiplayerAPI : : RPCMode get_rpc_mode ( const StringName & p_method ) const = 0 ; <nl> + virtual MultiplayerAPI : : RPCMode get_rset_mode ( const StringName & p_variable ) const = 0 ; <nl> <nl> virtual ScriptLanguage * get_language ( ) = 0 ; <nl> virtual ~ ScriptInstance ( ) ; <nl> class PlaceHolderScriptInstance : public ScriptInstance { <nl> <nl> virtual bool is_placeholder ( ) const { return true ; } <nl> <nl> - virtual RPCMode get_rpc_mode ( const StringName & p_method ) const { return RPC_MODE_DISABLED ; } <nl> - virtual RPCMode get_rset_mode ( const StringName & p_variable ) const { return RPC_MODE_DISABLED ; } <nl> + virtual MultiplayerAPI : : RPCMode get_rpc_mode ( const StringName & p_method ) const { return MultiplayerAPI : : RPC_MODE_DISABLED ; } <nl> + virtual MultiplayerAPI : : RPCMode get_rset_mode ( const StringName & p_variable ) const { return MultiplayerAPI : : RPC_MODE_DISABLED ; } <nl> <nl> PlaceHolderScriptInstance ( ScriptLanguage * p_language , Ref < Script > p_script , Object * p_owner ) ; <nl> ~ PlaceHolderScriptInstance ( ) ; <nl> mmm a / doc / classes / MultiplayerAPI . xml <nl> ppp b / doc / classes / MultiplayerAPI . xml <nl> <nl> < / signal > <nl> < / signals > <nl> < constants > <nl> + < constant name = " RPC_MODE_DISABLED " value = " 0 " enum = " RPCMode " > <nl> + Used with [ method Node . rpc_config ] or [ method Node . rset_config ] to disable a method or property for all RPC calls , making it unavailable . Default for all methods . <nl> + < / constant > <nl> + < constant name = " RPC_MODE_REMOTE " value = " 1 " enum = " RPCMode " > <nl> + Used with [ method Node . rpc_config ] or [ method Node . rset_config ] to set a method to be called or a property to be changed only on the remote end , not locally . Analogous to the [ code ] remote [ / code ] keyword . Calls and property changes are accepted from all remote peers , no matter if they are node ' s master or slaves . <nl> + < / constant > <nl> + < constant name = " RPC_MODE_SYNC " value = " 2 " enum = " RPCMode " > <nl> + Behave like [ constant RPC_MODE_REMOTE ] but also make the call or property change locally . Analogous to the [ code ] sync [ / code ] keyword . <nl> + < / constant > <nl> + < constant name = " RPC_MODE_MASTER " value = " 3 " enum = " RPCMode " > <nl> + Used with [ method Node . rpc_config ] or [ method Node . rset_config ] to set a method to be called or a property to be changed only on the network master for this node . Analogous to the [ code ] master [ / code ] keyword . Only accepts calls or property changes from the node ' s network slaves , see [ method Node . set_network_master ] . <nl> + < / constant > <nl> + < constant name = " RPC_MODE_SLAVE " value = " 4 " enum = " RPCMode " > <nl> + Used with [ method Node . rpc_config ] or [ method Node . rset_config ] to set a method to be called or a property to be changed only on slaves for this node . Analogous to the [ code ] slave [ / code ] keyword . Only accepts calls or property changes from the node ' s network master , see [ method Node . set_network_master ] . <nl> + < / constant > <nl> + < constant name = " RPC_MODE_REMOTESYNC " value = " 5 " enum = " RPCMode " > <nl> + Behave like [ code ] RPC_MODE_REMOTE [ / code ] but also make the call or property change locally . Same as [ constant RPC_MODE_SYNC ] which is only kept for compatibility . Analogous to the [ code ] remotesync [ / code ] keyword . <nl> + < / constant > <nl> + < constant name = " RPC_MODE_MASTERSYNC " value = " 6 " enum = " RPCMode " > <nl> + Behave like [ code ] RPC_MODE_MASTER [ / code ] but also make the call or property change locally . Analogous to the [ code ] mastersync [ / code ] keyword . <nl> + < / constant > <nl> + < constant name = " RPC_MODE_SLAVESYNC " value = " 7 " enum = " RPCMode " > <nl> + Behave like [ code ] RPC_MODE_SLAVE [ / code ] but also make the call or property change locally . Analogous to the [ code ] slavesync [ / code ] keyword . <nl> + < / constant > <nl> < / constants > <nl> < / class > <nl> mmm a / doc / classes / Node . xml <nl> ppp b / doc / classes / Node . xml <nl> <nl> < / return > <nl> < argument index = " 0 " name = " method " type = " String " > <nl> < / argument > <nl> - < argument index = " 1 " name = " mode " type = " int " enum = " Node . RPCMode " > <nl> + < argument index = " 1 " name = " mode " type = " int " enum = " MultiplayerAPI . RPCMode " > <nl> < / argument > <nl> < description > <nl> - Changes the RPC mode for the given [ code ] method [ / code ] to the given [ code ] mode [ / code ] . See [ enum RPCMode ] . An alternative is annotating methods and properties with the corresponding keywords ( [ code ] remote [ / code ] , [ code ] sync [ / code ] , [ code ] master [ / code ] , [ code ] slave [ / code ] ) . By default , methods are not exposed to networking ( and RPCs ) . Also see [ method rset ] and [ method rset_config ] for properties . <nl> + Changes the RPC mode for the given [ code ] method [ / code ] to the given [ code ] mode [ / code ] . See [ enum MultiplayerAPI . RPCMode ] . An alternative is annotating methods and properties with the corresponding keywords ( [ code ] remote [ / code ] , [ code ] sync [ / code ] , [ code ] master [ / code ] , [ code ] slave [ / code ] ) . By default , methods are not exposed to networking ( and RPCs ) . Also see [ method rset ] and [ method rset_config ] for properties . <nl> < / description > <nl> < / method > <nl> < method name = " rpc_id " qualifiers = " vararg " > <nl> <nl> < / return > <nl> < argument index = " 0 " name = " property " type = " String " > <nl> < / argument > <nl> - < argument index = " 1 " name = " mode " type = " int " enum = " Node . RPCMode " > <nl> + < argument index = " 1 " name = " mode " type = " int " enum = " MultiplayerAPI . RPCMode " > <nl> < / argument > <nl> < description > <nl> - Changes the RPC mode for the given [ code ] property [ / code ] to the given [ code ] mode [ / code ] . See [ enum RPCMode ] . An alternative is annotating methods and properties with the corresponding keywords ( [ code ] remote [ / code ] , [ code ] sync [ / code ] , [ code ] master [ / code ] , [ code ] slave [ / code ] ) . By default , properties are not exposed to networking ( and RPCs ) . Also see [ method rpc ] and [ method rpc_config ] for methods . <nl> + Changes the RPC mode for the given [ code ] property [ / code ] to the given [ code ] mode [ / code ] . See [ enum MultiplayerAPI . RPCMode ] . An alternative is annotating methods and properties with the corresponding keywords ( [ code ] remote [ / code ] , [ code ] sync [ / code ] , [ code ] master [ / code ] , [ code ] slave [ / code ] ) . By default , properties are not exposed to networking ( and RPCs ) . Also see [ method rpc ] and [ method rpc_config ] for methods . <nl> < / description > <nl> < / method > <nl> < method name = " rset_id " > <nl> <nl> < constant name = " NOTIFICATION_INTERNAL_PHYSICS_PROCESS " value = " 26 " > <nl> Notification received every frame when the internal physics process flag is set ( see [ method set_physics_process_internal ] ) . <nl> < / constant > <nl> - < constant name = " RPC_MODE_DISABLED " value = " 0 " enum = " RPCMode " > <nl> - Used with [ method rpc_config ] or [ method rset_config ] to disable a method or property for all RPC calls , making it unavailable . Default for all methods . <nl> - < / constant > <nl> - < constant name = " RPC_MODE_REMOTE " value = " 1 " enum = " RPCMode " > <nl> - Used with [ method rpc_config ] or [ method rset_config ] to set a method to be called or a property to be changed only on the remote end , not locally . Analogous to the [ code ] remote [ / code ] keyword . <nl> - < / constant > <nl> - < constant name = " RPC_MODE_SYNC " value = " 2 " enum = " RPCMode " > <nl> - Used with [ method rpc_config ] or [ method rset_config ] to set a method to be called or a property to be changed both on the remote end and locally . Analogous to the [ code ] sync [ / code ] keyword . <nl> - < / constant > <nl> - < constant name = " RPC_MODE_MASTER " value = " 3 " enum = " RPCMode " > <nl> - Used with [ method rpc_config ] or [ method rset_config ] to set a method to be called or a property to be changed only on the network master for this node . Analogous to the [ code ] master [ / code ] keyword . See [ method set_network_master ] . <nl> - < / constant > <nl> - < constant name = " RPC_MODE_SLAVE " value = " 4 " enum = " RPCMode " > <nl> - Used with [ method rpc_config ] or [ method rset_config ] to set a method to be called or a property to be changed only on slaves for this node . Analogous to the [ code ] slave [ / code ] keyword . See [ method set_network_master ] . <nl> - < / constant > <nl> < constant name = " PAUSE_MODE_INHERIT " value = " 0 " enum = " PauseMode " > <nl> Inherits pause mode from the node ' s parent . For the root node , it is equivalent to PAUSE_MODE_STOP . Default . <nl> < / constant > <nl> mmm a / modules / gdnative / include / nativescript / godot_nativescript . h <nl> ppp b / modules / gdnative / include / nativescript / godot_nativescript . h <nl> typedef enum { <nl> GODOT_METHOD_RPC_MODE_SYNC , <nl> GODOT_METHOD_RPC_MODE_MASTER , <nl> GODOT_METHOD_RPC_MODE_SLAVE , <nl> + GODOT_METHOD_RPC_MODE_REMOTESYNC , <nl> + GODOT_METHOD_RPC_MODE_MASTERSYNC , <nl> + GODOT_METHOD_RPC_MODE_SLAVESYNC , <nl> } godot_method_rpc_mode ; <nl> <nl> typedef enum { <nl> mmm a / modules / gdnative / nativescript / nativescript . cpp <nl> ppp b / modules / gdnative / nativescript / nativescript . cpp <nl> Ref < Script > NativeScriptInstance : : get_script ( ) const { <nl> return script ; <nl> } <nl> <nl> - NativeScriptInstance : : RPCMode NativeScriptInstance : : get_rpc_mode ( const StringName & p_method ) const { <nl> + MultiplayerAPI : : RPCMode NativeScriptInstance : : get_rpc_mode ( const StringName & p_method ) const { <nl> <nl> NativeScriptDesc * script_data = GET_SCRIPT_DESC ( ) ; <nl> <nl> NativeScriptInstance : : RPCMode NativeScriptInstance : : get_rpc_mode ( const StringNam <nl> if ( E ) { <nl> switch ( E - > get ( ) . rpc_mode ) { <nl> case GODOT_METHOD_RPC_MODE_DISABLED : <nl> - return RPC_MODE_DISABLED ; <nl> + return MultiplayerAPI : : RPC_MODE_DISABLED ; <nl> case GODOT_METHOD_RPC_MODE_REMOTE : <nl> - return RPC_MODE_REMOTE ; <nl> + return MultiplayerAPI : : RPC_MODE_REMOTE ; <nl> case GODOT_METHOD_RPC_MODE_SYNC : <nl> - return RPC_MODE_SYNC ; <nl> + return MultiplayerAPI : : RPC_MODE_SYNC ; <nl> case GODOT_METHOD_RPC_MODE_MASTER : <nl> - return RPC_MODE_MASTER ; <nl> + return MultiplayerAPI : : RPC_MODE_MASTER ; <nl> case GODOT_METHOD_RPC_MODE_SLAVE : <nl> - return RPC_MODE_SLAVE ; <nl> + return MultiplayerAPI : : RPC_MODE_SLAVE ; <nl> + case GODOT_METHOD_RPC_MODE_REMOTESYNC : <nl> + return MultiplayerAPI : : RPC_MODE_REMOTESYNC ; <nl> + case GODOT_METHOD_RPC_MODE_MASTERSYNC : <nl> + return MultiplayerAPI : : RPC_MODE_MASTERSYNC ; <nl> + case GODOT_METHOD_RPC_MODE_SLAVESYNC : <nl> + return MultiplayerAPI : : RPC_MODE_SLAVESYNC ; <nl> default : <nl> - return RPC_MODE_DISABLED ; <nl> + return MultiplayerAPI : : RPC_MODE_DISABLED ; <nl> } <nl> } <nl> <nl> script_data = script_data - > base_data ; <nl> } <nl> <nl> - return RPC_MODE_DISABLED ; <nl> + return MultiplayerAPI : : RPC_MODE_DISABLED ; <nl> } <nl> <nl> - NativeScriptInstance : : RPCMode NativeScriptInstance : : get_rset_mode ( const StringName & p_variable ) const { <nl> + MultiplayerAPI : : RPCMode NativeScriptInstance : : get_rset_mode ( const StringName & p_variable ) const { <nl> <nl> NativeScriptDesc * script_data = GET_SCRIPT_DESC ( ) ; <nl> <nl> NativeScriptInstance : : RPCMode NativeScriptInstance : : get_rset_mode ( const StringNa <nl> if ( E ) { <nl> switch ( E . get ( ) . rset_mode ) { <nl> case GODOT_METHOD_RPC_MODE_DISABLED : <nl> - return RPC_MODE_DISABLED ; <nl> + return MultiplayerAPI : : RPC_MODE_DISABLED ; <nl> case GODOT_METHOD_RPC_MODE_REMOTE : <nl> - return RPC_MODE_REMOTE ; <nl> + return MultiplayerAPI : : RPC_MODE_REMOTE ; <nl> case GODOT_METHOD_RPC_MODE_SYNC : <nl> - return RPC_MODE_SYNC ; <nl> + return MultiplayerAPI : : RPC_MODE_SYNC ; <nl> case GODOT_METHOD_RPC_MODE_MASTER : <nl> - return RPC_MODE_MASTER ; <nl> + return MultiplayerAPI : : RPC_MODE_MASTER ; <nl> case GODOT_METHOD_RPC_MODE_SLAVE : <nl> - return RPC_MODE_SLAVE ; <nl> + return MultiplayerAPI : : RPC_MODE_SLAVE ; <nl> default : <nl> - return RPC_MODE_DISABLED ; <nl> + return MultiplayerAPI : : RPC_MODE_DISABLED ; <nl> } <nl> } <nl> <nl> script_data = script_data - > base_data ; <nl> } <nl> <nl> - return RPC_MODE_DISABLED ; <nl> + return MultiplayerAPI : : RPC_MODE_DISABLED ; <nl> } <nl> <nl> ScriptLanguage * NativeScriptInstance : : get_language ( ) { <nl> mmm a / modules / gdnative / nativescript / nativescript . h <nl> ppp b / modules / gdnative / nativescript / nativescript . h <nl> class NativeScriptInstance : public ScriptInstance { <nl> virtual Variant call ( const StringName & p_method , const Variant * * p_args , int p_argcount , Variant : : CallError & r_error ) ; <nl> virtual void notification ( int p_notification ) ; <nl> virtual Ref < Script > get_script ( ) const ; <nl> - virtual RPCMode get_rpc_mode ( const StringName & p_method ) const ; <nl> - virtual RPCMode get_rset_mode ( const StringName & p_variable ) const ; <nl> + virtual MultiplayerAPI : : RPCMode get_rpc_mode ( const StringName & p_method ) const ; <nl> + virtual MultiplayerAPI : : RPCMode get_rset_mode ( const StringName & p_variable ) const ; <nl> virtual ScriptLanguage * get_language ( ) ; <nl> <nl> virtual void call_multilevel ( const StringName & p_method , const Variant * * p_args , int p_argcount ) ; <nl> mmm a / modules / gdnative / pluginscript / pluginscript_instance . cpp <nl> ppp b / modules / gdnative / pluginscript / pluginscript_instance . cpp <nl> void PluginScriptInstance : : notification ( int p_notification ) { <nl> _desc - > notification ( _data , p_notification ) ; <nl> } <nl> <nl> - ScriptInstance : : RPCMode PluginScriptInstance : : get_rpc_mode ( const StringName & p_method ) const { <nl> + MultiplayerAPI : : RPCMode PluginScriptInstance : : get_rpc_mode ( const StringName & p_method ) const { <nl> return _script - > get_rpc_mode ( p_method ) ; <nl> } <nl> <nl> - ScriptInstance : : RPCMode PluginScriptInstance : : get_rset_mode ( const StringName & p_variable ) const { <nl> + MultiplayerAPI : : RPCMode PluginScriptInstance : : get_rset_mode ( const StringName & p_variable ) const { <nl> return _script - > get_rset_mode ( p_variable ) ; <nl> } <nl> <nl> mmm a / modules / gdnative / pluginscript / pluginscript_instance . h <nl> ppp b / modules / gdnative / pluginscript / pluginscript_instance . h <nl> class PluginScriptInstance : public ScriptInstance { <nl> <nl> void set_path ( const String & p_path ) ; <nl> <nl> - virtual RPCMode get_rpc_mode ( const StringName & p_method ) const ; <nl> - virtual RPCMode get_rset_mode ( const StringName & p_variable ) const ; <nl> + virtual MultiplayerAPI : : RPCMode get_rpc_mode ( const StringName & p_method ) const ; <nl> + virtual MultiplayerAPI : : RPCMode get_rset_mode ( const StringName & p_variable ) const ; <nl> <nl> virtual void refcount_incremented ( ) ; <nl> virtual bool refcount_decremented ( ) ; <nl> mmm a / modules / gdnative / pluginscript / pluginscript_script . cpp <nl> ppp b / modules / gdnative / pluginscript / pluginscript_script . cpp <nl> Error PluginScript : : reload ( bool p_keep_state ) { <nl> / / rpc_mode is passed as an optional field and is not part of MethodInfo <nl> Variant var = v [ " rpc_mode " ] ; <nl> if ( var = = Variant ( ) ) { <nl> - _methods_rpc_mode [ mi . name ] = ScriptInstance : : RPC_MODE_DISABLED ; <nl> + _methods_rpc_mode [ mi . name ] = MultiplayerAPI : : RPC_MODE_DISABLED ; <nl> } else { <nl> - _methods_rpc_mode [ mi . name ] = ScriptInstance : : RPCMode ( int ( var ) ) ; <nl> + _methods_rpc_mode [ mi . name ] = MultiplayerAPI : : RPCMode ( int ( var ) ) ; <nl> } <nl> } <nl> Array * signals = ( Array * ) & manifest . signals ; <nl> Error PluginScript : : reload ( bool p_keep_state ) { <nl> / / rset_mode is passed as an optional field and is not part of PropertyInfo <nl> Variant var = v [ " rset_mode " ] ; <nl> if ( var = = Variant ( ) ) { <nl> - _methods_rpc_mode [ pi . name ] = ScriptInstance : : RPC_MODE_DISABLED ; <nl> + _methods_rpc_mode [ pi . name ] = MultiplayerAPI : : RPC_MODE_DISABLED ; <nl> } else { <nl> - _methods_rpc_mode [ pi . name ] = ScriptInstance : : RPCMode ( int ( var ) ) ; <nl> + _methods_rpc_mode [ pi . name ] = MultiplayerAPI : : RPCMode ( int ( var ) ) ; <nl> } <nl> } <nl> / / Manifest ' s attributes must be explicitly freed <nl> int PluginScript : : get_member_line ( const StringName & p_member ) const { <nl> return - 1 ; <nl> } <nl> <nl> - ScriptInstance : : RPCMode PluginScript : : get_rpc_mode ( const StringName & p_method ) const { <nl> - ASSERT_SCRIPT_VALID_V ( ScriptInstance : : RPC_MODE_DISABLED ) ; <nl> - const Map < StringName , ScriptInstance : : RPCMode > : : Element * e = _methods_rpc_mode . find ( p_method ) ; <nl> + MultiplayerAPI : : RPCMode PluginScript : : get_rpc_mode ( const StringName & p_method ) const { <nl> + ASSERT_SCRIPT_VALID_V ( MultiplayerAPI : : RPC_MODE_DISABLED ) ; <nl> + const Map < StringName , MultiplayerAPI : : RPCMode > : : Element * e = _methods_rpc_mode . find ( p_method ) ; <nl> if ( e ! = NULL ) { <nl> return e - > get ( ) ; <nl> } else { <nl> - return ScriptInstance : : RPC_MODE_DISABLED ; <nl> + return MultiplayerAPI : : RPC_MODE_DISABLED ; <nl> } <nl> } <nl> <nl> - ScriptInstance : : RPCMode PluginScript : : get_rset_mode ( const StringName & p_variable ) const { <nl> - ASSERT_SCRIPT_VALID_V ( ScriptInstance : : RPC_MODE_DISABLED ) ; <nl> - const Map < StringName , ScriptInstance : : RPCMode > : : Element * e = _variables_rset_mode . find ( p_variable ) ; <nl> + MultiplayerAPI : : RPCMode PluginScript : : get_rset_mode ( const StringName & p_variable ) const { <nl> + ASSERT_SCRIPT_VALID_V ( MultiplayerAPI : : RPC_MODE_DISABLED ) ; <nl> + const Map < StringName , MultiplayerAPI : : RPCMode > : : Element * e = _variables_rset_mode . find ( p_variable ) ; <nl> if ( e ! = NULL ) { <nl> return e - > get ( ) ; <nl> } else { <nl> - return ScriptInstance : : RPC_MODE_DISABLED ; <nl> + return MultiplayerAPI : : RPC_MODE_DISABLED ; <nl> } <nl> } <nl> <nl> mmm a / modules / gdnative / pluginscript / pluginscript_script . h <nl> ppp b / modules / gdnative / pluginscript / pluginscript_script . h <nl> class PluginScript : public Script { <nl> Map < StringName , PropertyInfo > _properties_info ; <nl> Map < StringName , MethodInfo > _signals_info ; <nl> Map < StringName , MethodInfo > _methods_info ; <nl> - Map < StringName , ScriptInstance : : RPCMode > _variables_rset_mode ; <nl> - Map < StringName , ScriptInstance : : RPCMode > _methods_rpc_mode ; <nl> + Map < StringName , MultiplayerAPI : : RPCMode > _variables_rset_mode ; <nl> + Map < StringName , MultiplayerAPI : : RPCMode > _methods_rpc_mode ; <nl> <nl> Set < Object * > _instances ; <nl> / / exported members <nl> class PluginScript : public Script { <nl> <nl> virtual int get_member_line ( const StringName & p_member ) const ; <nl> <nl> - ScriptInstance : : RPCMode get_rpc_mode ( const StringName & p_method ) const ; <nl> - ScriptInstance : : RPCMode get_rset_mode ( const StringName & p_variable ) const ; <nl> + MultiplayerAPI : : RPCMode get_rpc_mode ( const StringName & p_method ) const ; <nl> + MultiplayerAPI : : RPCMode get_rset_mode ( const StringName & p_variable ) const ; <nl> <nl> PluginScript ( ) ; <nl> void init ( PluginScriptLanguage * language ) ; <nl> mmm a / modules / gdscript / gdscript . cpp <nl> ppp b / modules / gdscript / gdscript . cpp <nl> ScriptLanguage * GDScriptInstance : : get_language ( ) { <nl> return GDScriptLanguage : : get_singleton ( ) ; <nl> } <nl> <nl> - GDScriptInstance : : RPCMode GDScriptInstance : : get_rpc_mode ( const StringName & p_method ) const { <nl> + MultiplayerAPI : : RPCMode GDScriptInstance : : get_rpc_mode ( const StringName & p_method ) const { <nl> <nl> const GDScript * cscript = script . ptr ( ) ; <nl> <nl> GDScriptInstance : : RPCMode GDScriptInstance : : get_rpc_mode ( const StringName & p_met <nl> const Map < StringName , GDScriptFunction * > : : Element * E = cscript - > member_functions . find ( p_method ) ; <nl> if ( E ) { <nl> <nl> - if ( E - > get ( ) - > get_rpc_mode ( ) ! = RPC_MODE_DISABLED ) { <nl> + if ( E - > get ( ) - > get_rpc_mode ( ) ! = MultiplayerAPI : : RPC_MODE_DISABLED ) { <nl> return E - > get ( ) - > get_rpc_mode ( ) ; <nl> } <nl> } <nl> cscript = cscript - > _base ; <nl> } <nl> <nl> - return RPC_MODE_DISABLED ; <nl> + return MultiplayerAPI : : RPC_MODE_DISABLED ; <nl> } <nl> <nl> - GDScriptInstance : : RPCMode GDScriptInstance : : get_rset_mode ( const StringName & p_variable ) const { <nl> + MultiplayerAPI : : RPCMode GDScriptInstance : : get_rset_mode ( const StringName & p_variable ) const { <nl> <nl> const GDScript * cscript = script . ptr ( ) ; <nl> <nl> GDScriptInstance : : RPCMode GDScriptInstance : : get_rset_mode ( const StringName & p_va <nl> cscript = cscript - > _base ; <nl> } <nl> <nl> - return RPC_MODE_DISABLED ; <nl> + return MultiplayerAPI : : RPC_MODE_DISABLED ; <nl> } <nl> <nl> void GDScriptInstance : : reload_members ( ) { <nl> void GDScriptLanguage : : get_reserved_words ( List < String > * p_words ) const { <nl> " sync " , <nl> " master " , <nl> " slave " , <nl> + " remotesync " , <nl> + " mastersync " , <nl> + " slavesync " , <nl> 0 <nl> } ; <nl> <nl> mmm a / modules / gdscript / gdscript . h <nl> ppp b / modules / gdscript / gdscript . h <nl> class GDScript : public Script { <nl> int index ; <nl> StringName setter ; <nl> StringName getter ; <nl> - ScriptInstance : : RPCMode rpc_mode ; <nl> + MultiplayerAPI : : RPCMode rpc_mode ; <nl> } ; <nl> <nl> friend class GDScriptInstance ; <nl> class GDScriptInstance : public ScriptInstance { <nl> <nl> void reload_members ( ) ; <nl> <nl> - virtual RPCMode get_rpc_mode ( const StringName & p_method ) const ; <nl> - virtual RPCMode get_rset_mode ( const StringName & p_variable ) const ; <nl> + virtual MultiplayerAPI : : RPCMode get_rpc_mode ( const StringName & p_method ) const ; <nl> + virtual MultiplayerAPI : : RPCMode get_rset_mode ( const StringName & p_variable ) const ; <nl> <nl> GDScriptInstance ( ) ; <nl> ~ GDScriptInstance ( ) ; <nl> mmm a / modules / gdscript / gdscript_function . cpp <nl> ppp b / modules / gdscript / gdscript_function . cpp <nl> GDScriptFunction : : GDScriptFunction ( ) : <nl> <nl> _stack_size = 0 ; <nl> _call_size = 0 ; <nl> - rpc_mode = ScriptInstance : : RPC_MODE_DISABLED ; <nl> + rpc_mode = MultiplayerAPI : : RPC_MODE_DISABLED ; <nl> name = " < anonymous > " ; <nl> # ifdef DEBUG_ENABLED <nl> _func_cname = NULL ; <nl> mmm a / modules / gdscript / gdscript_function . h <nl> ppp b / modules / gdscript / gdscript_function . h <nl> class GDScriptFunction { <nl> ADDR_TYPE_NIL = 9 <nl> } ; <nl> <nl> - enum RPCMode { <nl> - RPC_DISABLED , <nl> - RPC_ENABLED , <nl> - RPC_SYNC , <nl> - RPC_SYNC_MASTER , <nl> - RPC_SYNC_SLAVE <nl> - } ; <nl> - <nl> struct StackDebug { <nl> <nl> int line ; <nl> class GDScriptFunction { <nl> int _call_size ; <nl> int _initial_line ; <nl> bool _static ; <nl> - ScriptInstance : : RPCMode rpc_mode ; <nl> + MultiplayerAPI : : RPCMode rpc_mode ; <nl> <nl> GDScript * _script ; <nl> <nl> class GDScriptFunction { <nl> <nl> Variant call ( GDScriptInstance * p_instance , const Variant * * p_args , int p_argcount , Variant : : CallError & r_err , CallState * p_state = NULL ) ; <nl> <nl> - _FORCE_INLINE_ ScriptInstance : : RPCMode get_rpc_mode ( ) const { return rpc_mode ; } <nl> + _FORCE_INLINE_ MultiplayerAPI : : RPCMode get_rpc_mode ( ) const { return rpc_mode ; } <nl> GDScriptFunction ( ) ; <nl> ~ GDScriptFunction ( ) ; <nl> } ; <nl> mmm a / modules / gdscript / gdscript_parser . cpp <nl> ppp b / modules / gdscript / gdscript_parser . cpp <nl> void GDScriptParser : : _parse_class ( ClassNode * p_class ) { <nl> function - > line = fnline ; <nl> <nl> function - > rpc_mode = rpc_mode ; <nl> - rpc_mode = ScriptInstance : : RPC_MODE_DISABLED ; <nl> + rpc_mode = MultiplayerAPI : : RPC_MODE_DISABLED ; <nl> <nl> if ( _static ) <nl> p_class - > static_functions . push_back ( function ) ; <nl> void GDScriptParser : : _parse_class ( ClassNode * p_class ) { <nl> tokenizer - > advance ( ) ; <nl> } <nl> <nl> - if ( tokenizer - > get_token ( ) ! = GDScriptTokenizer : : TK_PR_VAR & & tokenizer - > get_token ( ) ! = GDScriptTokenizer : : TK_PR_ONREADY & & tokenizer - > get_token ( ) ! = GDScriptTokenizer : : TK_PR_REMOTE & & tokenizer - > get_token ( ) ! = GDScriptTokenizer : : TK_PR_MASTER & & tokenizer - > get_token ( ) ! = GDScriptTokenizer : : TK_PR_SLAVE & & tokenizer - > get_token ( ) ! = GDScriptTokenizer : : TK_PR_SYNC ) { <nl> + if ( tokenizer - > get_token ( ) ! = GDScriptTokenizer : : TK_PR_VAR & & tokenizer - > get_token ( ) ! = GDScriptTokenizer : : TK_PR_ONREADY & & tokenizer - > get_token ( ) ! = GDScriptTokenizer : : TK_PR_REMOTE & & tokenizer - > get_token ( ) ! = GDScriptTokenizer : : TK_PR_MASTER & & tokenizer - > get_token ( ) ! = GDScriptTokenizer : : TK_PR_SLAVE & & tokenizer - > get_token ( ) ! = GDScriptTokenizer : : TK_PR_SYNC & & tokenizer - > get_token ( ) ! = GDScriptTokenizer : : TK_PR_REMOTESYNC & & tokenizer - > get_token ( ) ! = GDScriptTokenizer : : TK_PR_MASTERSYNC & & tokenizer - > get_token ( ) ! = GDScriptTokenizer : : TK_PR_SLAVESYNC ) { <nl> <nl> current_export = PropertyInfo ( ) ; <nl> - _set_error ( " Expected ' var ' , ' onready ' , ' remote ' , ' master ' , ' slave ' or ' sync ' . " ) ; <nl> + _set_error ( " Expected ' var ' , ' onready ' , ' remote ' , ' master ' , ' slave ' , ' sync ' , ' remotesync ' , ' mastersync ' , ' slavesync ' . " ) ; <nl> return ; <nl> } <nl> <nl> void GDScriptParser : : _parse_class ( ClassNode * p_class ) { <nl> return ; <nl> } <nl> } <nl> - rpc_mode = ScriptInstance : : RPC_MODE_REMOTE ; <nl> + rpc_mode = MultiplayerAPI : : RPC_MODE_REMOTE ; <nl> <nl> continue ; <nl> } break ; <nl> void GDScriptParser : : _parse_class ( ClassNode * p_class ) { <nl> } <nl> } <nl> <nl> - rpc_mode = ScriptInstance : : RPC_MODE_MASTER ; <nl> + rpc_mode = MultiplayerAPI : : RPC_MODE_MASTER ; <nl> continue ; <nl> } break ; <nl> case GDScriptTokenizer : : TK_PR_SLAVE : { <nl> void GDScriptParser : : _parse_class ( ClassNode * p_class ) { <nl> } <nl> } <nl> <nl> - rpc_mode = ScriptInstance : : RPC_MODE_SLAVE ; <nl> + rpc_mode = MultiplayerAPI : : RPC_MODE_SLAVE ; <nl> continue ; <nl> } break ; <nl> + case GDScriptTokenizer : : TK_PR_REMOTESYNC : <nl> case GDScriptTokenizer : : TK_PR_SYNC : { <nl> <nl> / / may be fallthrough from export , ignore if so <nl> void GDScriptParser : : _parse_class ( ClassNode * p_class ) { <nl> return ; <nl> } <nl> <nl> - rpc_mode = ScriptInstance : : RPC_MODE_SYNC ; <nl> + rpc_mode = MultiplayerAPI : : RPC_MODE_SYNC ; <nl> + continue ; <nl> + } break ; <nl> + case GDScriptTokenizer : : TK_PR_MASTERSYNC : { <nl> + <nl> + / / may be fallthrough from export , ignore if so <nl> + tokenizer - > advance ( ) ; <nl> + if ( tokenizer - > get_token ( ) ! = GDScriptTokenizer : : TK_PR_VAR & & tokenizer - > get_token ( ) ! = GDScriptTokenizer : : TK_PR_FUNCTION ) { <nl> + if ( current_export . type ) <nl> + _set_error ( " Expected ' var ' . " ) ; <nl> + else <nl> + _set_error ( " Expected ' var ' or ' func ' . " ) ; <nl> + return ; <nl> + } <nl> + <nl> + rpc_mode = MultiplayerAPI : : RPC_MODE_MASTERSYNC ; <nl> + continue ; <nl> + } break ; <nl> + case GDScriptTokenizer : : TK_PR_SLAVESYNC : { <nl> + <nl> + / / may be fallthrough from export , ignore if so <nl> + tokenizer - > advance ( ) ; <nl> + if ( tokenizer - > get_token ( ) ! = GDScriptTokenizer : : TK_PR_VAR & & tokenizer - > get_token ( ) ! = GDScriptTokenizer : : TK_PR_FUNCTION ) { <nl> + if ( current_export . type ) <nl> + _set_error ( " Expected ' var ' . " ) ; <nl> + else <nl> + _set_error ( " Expected ' var ' or ' func ' . " ) ; <nl> + return ; <nl> + } <nl> + <nl> + rpc_mode = MultiplayerAPI : : RPC_MODE_SLAVESYNC ; <nl> continue ; <nl> } break ; <nl> case GDScriptTokenizer : : TK_PR_VAR : { <nl> void GDScriptParser : : _parse_class ( ClassNode * p_class ) { <nl> <nl> tokenizer - > advance ( ) ; <nl> <nl> - rpc_mode = ScriptInstance : : RPC_MODE_DISABLED ; <nl> + rpc_mode = MultiplayerAPI : : RPC_MODE_DISABLED ; <nl> <nl> if ( tokenizer - > get_token ( ) = = GDScriptTokenizer : : TK_OP_ASSIGN ) { <nl> <nl> void GDScriptParser : : clear ( ) { <nl> current_class = NULL ; <nl> <nl> completion_found = false ; <nl> - rpc_mode = ScriptInstance : : RPC_MODE_DISABLED ; <nl> + rpc_mode = MultiplayerAPI : : RPC_MODE_DISABLED ; <nl> <nl> current_function = NULL ; <nl> <nl> mmm a / modules / gdscript / gdscript_parser . h <nl> ppp b / modules / gdscript / gdscript_parser . h <nl> class GDScriptParser { <nl> StringName getter ; <nl> int line ; <nl> Node * expression ; <nl> - ScriptInstance : : RPCMode rpc_mode ; <nl> + MultiplayerAPI : : RPCMode rpc_mode ; <nl> } ; <nl> struct Constant { <nl> StringName identifier ; <nl> class GDScriptParser { <nl> struct FunctionNode : public Node { <nl> <nl> bool _static ; <nl> - ScriptInstance : : RPCMode rpc_mode ; <nl> + MultiplayerAPI : : RPCMode rpc_mode ; <nl> StringName name ; <nl> Vector < StringName > arguments ; <nl> Vector < Node * > default_values ; <nl> class GDScriptParser { <nl> FunctionNode ( ) { <nl> type = TYPE_FUNCTION ; <nl> _static = false ; <nl> - rpc_mode = ScriptInstance : : RPC_MODE_DISABLED ; <nl> + rpc_mode = MultiplayerAPI : : RPC_MODE_DISABLED ; <nl> } <nl> } ; <nl> <nl> class GDScriptParser { <nl> <nl> PropertyInfo current_export ; <nl> <nl> - ScriptInstance : : RPCMode rpc_mode ; <nl> + MultiplayerAPI : : RPCMode rpc_mode ; <nl> <nl> void _set_error ( const String & p_error , int p_line = - 1 , int p_column = - 1 ) ; <nl> bool _recover_from_completion ( ) ; <nl> mmm a / modules / gdscript / gdscript_tokenizer . cpp <nl> ppp b / modules / gdscript / gdscript_tokenizer . cpp <nl> const char * GDScriptTokenizer : : token_names [ TK_MAX ] = { <nl> " sync " , <nl> " master " , <nl> " slave " , <nl> + " remotesync " , <nl> + " mastersync " , <nl> + " slavesync " , <nl> " ' [ ' " , <nl> " ' ] ' " , <nl> " ' { ' " , <nl> static const _kws _keyword_list [ ] = { <nl> { GDScriptTokenizer : : TK_PR_MASTER , " master " } , <nl> { GDScriptTokenizer : : TK_PR_SLAVE , " slave " } , <nl> { GDScriptTokenizer : : TK_PR_SYNC , " sync " } , <nl> + { GDScriptTokenizer : : TK_PR_REMOTESYNC , " remotesync " } , <nl> + { GDScriptTokenizer : : TK_PR_MASTERSYNC , " mastersync " } , <nl> + { GDScriptTokenizer : : TK_PR_SLAVESYNC , " slavesync " } , <nl> { GDScriptTokenizer : : TK_PR_CONST , " const " } , <nl> { GDScriptTokenizer : : TK_PR_ENUM , " enum " } , <nl> / / controlflow <nl> bool GDScriptTokenizer : : is_token_literal ( int p_offset , bool variable_safe ) const <nl> case TK_PR_MASTER : <nl> case TK_PR_SLAVE : <nl> case TK_PR_SYNC : <nl> + case TK_PR_REMOTESYNC : <nl> + case TK_PR_MASTERSYNC : <nl> + case TK_PR_SLAVESYNC : <nl> return true ; <nl> <nl> / / Literal for non - variables only : <nl> mmm a / modules / gdscript / gdscript_tokenizer . h <nl> ppp b / modules / gdscript / gdscript_tokenizer . h <nl> class GDScriptTokenizer { <nl> TK_PR_SYNC , <nl> TK_PR_MASTER , <nl> TK_PR_SLAVE , <nl> + TK_PR_REMOTESYNC , <nl> + TK_PR_MASTERSYNC , <nl> + TK_PR_SLAVESYNC , <nl> TK_BRACKET_OPEN , <nl> TK_BRACKET_CLOSE , <nl> TK_CURLY_BRACKET_OPEN , <nl> mmm a / modules / mono / csharp_script . cpp <nl> ppp b / modules / mono / csharp_script . cpp <nl> bool CSharpInstance : : refcount_decremented ( ) { <nl> return ref_dying ; <nl> } <nl> <nl> - ScriptInstance : : RPCMode CSharpInstance : : _member_get_rpc_mode ( GDMonoClassMember * p_member ) const { <nl> + MultiplayerAPI : : RPCMode CSharpInstance : : _member_get_rpc_mode ( GDMonoClassMember * p_member ) const { <nl> <nl> if ( p_member - > has_attribute ( CACHED_CLASS ( RemoteAttribute ) ) ) <nl> - return RPC_MODE_REMOTE ; <nl> + return MultiplayerAPI : : RPC_MODE_REMOTE ; <nl> if ( p_member - > has_attribute ( CACHED_CLASS ( SyncAttribute ) ) ) <nl> - return RPC_MODE_SYNC ; <nl> + return MultiplayerAPI : : RPC_MODE_SYNC ; <nl> if ( p_member - > has_attribute ( CACHED_CLASS ( MasterAttribute ) ) ) <nl> - return RPC_MODE_MASTER ; <nl> + return MultiplayerAPI : : RPC_MODE_MASTER ; <nl> if ( p_member - > has_attribute ( CACHED_CLASS ( SlaveAttribute ) ) ) <nl> - return RPC_MODE_SLAVE ; <nl> + return MultiplayerAPI : : RPC_MODE_SLAVE ; <nl> + if ( p_member - > has_attribute ( CACHED_CLASS ( RemoteSyncAttribute ) ) ) <nl> + return MultiplayerAPI : : RPC_MODE_REMOTESYNC ; <nl> + if ( p_member - > has_attribute ( CACHED_CLASS ( MasterSyncAttribute ) ) ) <nl> + return MultiplayerAPI : : RPC_MODE_MASTERSYNC ; <nl> + if ( p_member - > has_attribute ( CACHED_CLASS ( SlaveSyncAttribute ) ) ) <nl> + return MultiplayerAPI : : RPC_MODE_SLAVESYNC ; <nl> <nl> - return RPC_MODE_DISABLED ; <nl> + return MultiplayerAPI : : RPC_MODE_DISABLED ; <nl> } <nl> <nl> - ScriptInstance : : RPCMode CSharpInstance : : get_rpc_mode ( const StringName & p_method ) const { <nl> + MultiplayerAPI : : RPCMode CSharpInstance : : get_rpc_mode ( const StringName & p_method ) const { <nl> <nl> GDMonoClass * top = script - > script_class ; <nl> <nl> ScriptInstance : : RPCMode CSharpInstance : : get_rpc_mode ( const StringName & p_method ) <nl> top = top - > get_parent_class ( ) ; <nl> } <nl> <nl> - return RPC_MODE_DISABLED ; <nl> + return MultiplayerAPI : : RPC_MODE_DISABLED ; <nl> } <nl> <nl> - ScriptInstance : : RPCMode CSharpInstance : : get_rset_mode ( const StringName & p_variable ) const { <nl> + MultiplayerAPI : : RPCMode CSharpInstance : : get_rset_mode ( const StringName & p_variable ) const { <nl> <nl> GDMonoClass * top = script - > script_class ; <nl> <nl> ScriptInstance : : RPCMode CSharpInstance : : get_rset_mode ( const StringName & p_variab <nl> top = top - > get_parent_class ( ) ; <nl> } <nl> <nl> - return RPC_MODE_DISABLED ; <nl> + return MultiplayerAPI : : RPC_MODE_DISABLED ; <nl> } <nl> <nl> void CSharpInstance : : notification ( int p_notification ) { <nl> ScriptInstance * CSharpScript : : instance_create ( Object * p_this ) { <nl> return NULL ; <nl> # endif <nl> } <nl> - <nl> + <nl> if ( ! script_class ) { <nl> if ( GDMono : : get_singleton ( ) - > get_project_assembly ( ) = = NULL ) { <nl> / / The project assembly is not loaded <nl> ERR_EXPLAIN ( " Cannot instance script because the project assembly is not loaded . Script : " + get_path ( ) ) ; <nl> ERR_FAIL_V ( NULL ) ; <nl> } <nl> - <nl> - / / The project assembly is loaded , but the class could not found <nl> + <nl> + / / The project assembly is loaded , but the class could not found <nl> ERR_EXPLAIN ( " Cannot instance script because the class ' " + name + " ' could not be found . Script : " + get_path ( ) ) ; <nl> ERR_FAIL_V ( NULL ) ; <nl> } <nl> mmm a / modules / mono / csharp_script . h <nl> ppp b / modules / mono / csharp_script . h <nl> class CSharpInstance : public ScriptInstance { <nl> <nl> void _call_multilevel ( MonoObject * p_mono_object , const StringName & p_method , const Variant * * p_args , int p_argcount ) ; <nl> <nl> - RPCMode _member_get_rpc_mode ( GDMonoClassMember * p_member ) const ; <nl> + MultiplayerAPI : : RPCMode _member_get_rpc_mode ( GDMonoClassMember * p_member ) const ; <nl> <nl> public : <nl> MonoObject * get_mono_object ( ) const ; <nl> class CSharpInstance : public ScriptInstance { <nl> virtual void refcount_incremented ( ) ; <nl> virtual bool refcount_decremented ( ) ; <nl> <nl> - virtual RPCMode get_rpc_mode ( const StringName & p_method ) const ; <nl> - virtual RPCMode get_rset_mode ( const StringName & p_variable ) const ; <nl> + virtual MultiplayerAPI : : RPCMode get_rpc_mode ( const StringName & p_method ) const ; <nl> + virtual MultiplayerAPI : : RPCMode get_rset_mode ( const StringName & p_variable ) const ; <nl> <nl> virtual void notification ( int p_notification ) ; <nl> void call_notification_no_check ( MonoObject * p_mono_object , int p_notification ) ; <nl> mmm a / modules / mono / glue / cs_files / RPCAttributes . cs <nl> ppp b / modules / mono / glue / cs_files / RPCAttributes . cs <nl> public class MasterAttribute : Attribute { } <nl> <nl> [ AttributeUsage ( AttributeTargets . Method | AttributeTargets . Field ) ] <nl> public class SlaveAttribute : Attribute { } <nl> + <nl> + [ AttributeUsage ( AttributeTargets . Method | AttributeTargets . Field ) ] <nl> + public class RemoteSyncAttribute : Attribute { } <nl> + <nl> + [ AttributeUsage ( AttributeTargets . Method | AttributeTargets . Field ) ] <nl> + public class MasterSyncAttribute : Attribute { } <nl> + <nl> + [ AttributeUsage ( AttributeTargets . Method | AttributeTargets . Field ) ] <nl> + public class SlaveSyncAttribute : Attribute { } <nl> } <nl> mmm a / modules / mono / mono_gd / gd_mono_utils . cpp <nl> ppp b / modules / mono / mono_gd / gd_mono_utils . cpp <nl> void MonoCache : : clear_members ( ) { <nl> class_SyncAttribute = NULL ; <nl> class_MasterAttribute = NULL ; <nl> class_SlaveAttribute = NULL ; <nl> + class_RemoteSyncAttribute = NULL ; <nl> + class_MasterSyncAttribute = NULL ; <nl> + class_SlaveSyncAttribute = NULL ; <nl> class_GodotMethodAttribute = NULL ; <nl> field_GodotMethodAttribute_methodName = NULL ; <nl> <nl> void update_godot_api_cache ( ) { <nl> CACHE_CLASS_AND_CHECK ( SyncAttribute , GODOT_API_CLASS ( SyncAttribute ) ) ; <nl> CACHE_CLASS_AND_CHECK ( MasterAttribute , GODOT_API_CLASS ( MasterAttribute ) ) ; <nl> CACHE_CLASS_AND_CHECK ( SlaveAttribute , GODOT_API_CLASS ( SlaveAttribute ) ) ; <nl> + CACHE_CLASS_AND_CHECK ( RemoteSyncAttribute , GODOT_API_CLASS ( RemoteSyncAttribute ) ) ; <nl> + CACHE_CLASS_AND_CHECK ( MasterSyncAttribute , GODOT_API_CLASS ( MasterSyncAttribute ) ) ; <nl> + CACHE_CLASS_AND_CHECK ( SlaveSyncAttribute , GODOT_API_CLASS ( SlaveSyncAttribute ) ) ; <nl> CACHE_CLASS_AND_CHECK ( GodotMethodAttribute , GODOT_API_CLASS ( GodotMethodAttribute ) ) ; <nl> CACHE_FIELD_AND_CHECK ( GodotMethodAttribute , methodName , CACHED_CLASS ( GodotMethodAttribute ) - > get_field ( " methodName " ) ) ; <nl> <nl> mmm a / modules / mono / mono_gd / gd_mono_utils . h <nl> ppp b / modules / mono / mono_gd / gd_mono_utils . h <nl> struct MonoCache { <nl> GDMonoClass * class_ToolAttribute ; <nl> GDMonoClass * class_RemoteAttribute ; <nl> GDMonoClass * class_SyncAttribute ; <nl> + GDMonoClass * class_RemoteSyncAttribute ; <nl> + GDMonoClass * class_MasterSyncAttribute ; <nl> + GDMonoClass * class_SlaveSyncAttribute ; <nl> GDMonoClass * class_MasterAttribute ; <nl> GDMonoClass * class_SlaveAttribute ; <nl> GDMonoClass * class_GodotMethodAttribute ; <nl> mmm a / modules / visual_script / visual_script . cpp <nl> ppp b / modules / visual_script / visual_script . cpp <nl> Ref < Script > VisualScriptInstance : : get_script ( ) const { <nl> return script ; <nl> } <nl> <nl> - ScriptInstance : : RPCMode VisualScriptInstance : : get_rpc_mode ( const StringName & p_method ) const { <nl> + MultiplayerAPI : : RPCMode VisualScriptInstance : : get_rpc_mode ( const StringName & p_method ) const { <nl> <nl> const Map < StringName , VisualScript : : Function > : : Element * E = script - > functions . find ( p_method ) ; <nl> if ( ! E ) { <nl> - return RPC_MODE_DISABLED ; <nl> + return MultiplayerAPI : : RPC_MODE_DISABLED ; <nl> } <nl> <nl> if ( E - > get ( ) . function_id > = 0 & & E - > get ( ) . nodes . has ( E - > get ( ) . function_id ) ) { <nl> ScriptInstance : : RPCMode VisualScriptInstance : : get_rpc_mode ( const StringName & p_m <nl> } <nl> } <nl> <nl> - return RPC_MODE_DISABLED ; <nl> + return MultiplayerAPI : : RPC_MODE_DISABLED ; <nl> } <nl> <nl> - ScriptInstance : : RPCMode VisualScriptInstance : : get_rset_mode ( const StringName & p_variable ) const { <nl> + MultiplayerAPI : : RPCMode VisualScriptInstance : : get_rset_mode ( const StringName & p_variable ) const { <nl> <nl> - return RPC_MODE_DISABLED ; <nl> + return MultiplayerAPI : : RPC_MODE_DISABLED ; <nl> } <nl> <nl> void VisualScriptInstance : : create ( const Ref < VisualScript > & p_script , Object * p_owner ) { <nl> mmm a / modules / visual_script / visual_script . h <nl> ppp b / modules / visual_script / visual_script . h <nl> class VisualScriptInstance : public ScriptInstance { <nl> <nl> virtual ScriptLanguage * get_language ( ) ; <nl> <nl> - virtual RPCMode get_rpc_mode ( const StringName & p_method ) const ; <nl> - virtual RPCMode get_rset_mode ( const StringName & p_variable ) const ; <nl> + virtual MultiplayerAPI : : RPCMode get_rpc_mode ( const StringName & p_method ) const ; <nl> + virtual MultiplayerAPI : : RPCMode get_rset_mode ( const StringName & p_variable ) const ; <nl> <nl> VisualScriptInstance ( ) ; <nl> ~ VisualScriptInstance ( ) ; <nl> mmm a / modules / visual_script / visual_script_nodes . cpp <nl> ppp b / modules / visual_script / visual_script_nodes . cpp <nl> bool VisualScriptFunction : : _set ( const StringName & p_name , const Variant & p_value <nl> } <nl> <nl> if ( p_name = = " rpc / mode " ) { <nl> - rpc_mode = ScriptInstance : : RPCMode ( int ( p_value ) ) ; <nl> + rpc_mode = MultiplayerAPI : : RPCMode ( int ( p_value ) ) ; <nl> return true ; <nl> } <nl> <nl> int VisualScriptFunction : : get_argument_count ( ) const { <nl> return arguments . size ( ) ; <nl> } <nl> <nl> - void VisualScriptFunction : : set_rpc_mode ( ScriptInstance : : RPCMode p_mode ) { <nl> + void VisualScriptFunction : : set_rpc_mode ( MultiplayerAPI : : RPCMode p_mode ) { <nl> rpc_mode = p_mode ; <nl> } <nl> <nl> - ScriptInstance : : RPCMode VisualScriptFunction : : get_rpc_mode ( ) const { <nl> + MultiplayerAPI : : RPCMode VisualScriptFunction : : get_rpc_mode ( ) const { <nl> return rpc_mode ; <nl> } <nl> <nl> VisualScriptFunction : : VisualScriptFunction ( ) { <nl> stack_size = 256 ; <nl> stack_less = false ; <nl> sequenced = true ; <nl> - rpc_mode = ScriptInstance : : RPC_MODE_DISABLED ; <nl> + rpc_mode = MultiplayerAPI : : RPC_MODE_DISABLED ; <nl> } <nl> <nl> void VisualScriptFunction : : set_stack_less ( bool p_enable ) { <nl> mmm a / modules / visual_script / visual_script_nodes . h <nl> ppp b / modules / visual_script / visual_script_nodes . h <nl> class VisualScriptFunction : public VisualScriptNode { <nl> <nl> bool stack_less ; <nl> int stack_size ; <nl> - ScriptInstance : : RPCMode rpc_mode ; <nl> + MultiplayerAPI : : RPCMode rpc_mode ; <nl> bool sequenced ; <nl> <nl> protected : <nl> class VisualScriptFunction : public VisualScriptNode { <nl> void set_return_type ( Variant : : Type p_type ) ; <nl> Variant : : Type get_return_type ( ) const ; <nl> <nl> - void set_rpc_mode ( ScriptInstance : : RPCMode p_mode ) ; <nl> - ScriptInstance : : RPCMode get_rpc_mode ( ) const ; <nl> + void set_rpc_mode ( MultiplayerAPI : : RPCMode p_mode ) ; <nl> + MultiplayerAPI : : RPCMode get_rpc_mode ( ) const ; <nl> <nl> virtual VisualScriptNodeInstance * instance ( VisualScriptInstance * p_instance ) ; <nl> <nl> mmm a / scene / main / node . cpp <nl> ppp b / scene / main / node . cpp <nl> <nl> # include " viewport . h " <nl> <nl> VARIANT_ENUM_CAST ( Node : : PauseMode ) ; <nl> - VARIANT_ENUM_CAST ( Node : : RPCMode ) ; <nl> <nl> void Node : : _notification ( int p_notification ) { <nl> <nl> bool Node : : is_network_master ( ) const { <nl> <nl> / * * * * * RPC CONFIG * * * * * * * * / <nl> <nl> - void Node : : rpc_config ( const StringName & p_method , RPCMode p_mode ) { <nl> + void Node : : rpc_config ( const StringName & p_method , MultiplayerAPI : : RPCMode p_mode ) { <nl> <nl> - if ( p_mode = = RPC_MODE_DISABLED ) { <nl> + if ( p_mode = = MultiplayerAPI : : RPC_MODE_DISABLED ) { <nl> data . rpc_methods . erase ( p_method ) ; <nl> } else { <nl> data . rpc_methods [ p_method ] = p_mode ; <nl> } ; <nl> } <nl> <nl> - void Node : : rset_config ( const StringName & p_property , RPCMode p_mode ) { <nl> + void Node : : rset_config ( const StringName & p_property , MultiplayerAPI : : RPCMode p_mode ) { <nl> <nl> - if ( p_mode = = RPC_MODE_DISABLED ) { <nl> + if ( p_mode = = MultiplayerAPI : : RPC_MODE_DISABLED ) { <nl> data . rpc_properties . erase ( p_property ) ; <nl> } else { <nl> data . rpc_properties [ p_property ] = p_mode ; <nl> void Node : : set_custom_multiplayer ( Ref < MultiplayerAPI > p_multiplayer ) { <nl> multiplayer = p_multiplayer ; <nl> } <nl> <nl> - const Map < StringName , Node : : RPCMode > : : Element * Node : : get_node_rpc_mode ( const StringName & p_method ) { <nl> + const Map < StringName , MultiplayerAPI : : RPCMode > : : Element * Node : : get_node_rpc_mode ( const StringName & p_method ) { <nl> return data . rpc_methods . find ( p_method ) ; <nl> } <nl> <nl> - const Map < StringName , Node : : RPCMode > : : Element * Node : : get_node_rset_mode ( const StringName & p_property ) { <nl> + const Map < StringName , MultiplayerAPI : : RPCMode > : : Element * Node : : get_node_rset_mode ( const StringName & p_property ) { <nl> return data . rpc_properties . find ( p_property ) ; <nl> } <nl> <nl> - bool Node : : can_call_rpc ( const StringName & p_method , int p_from ) const { <nl> - <nl> - const Map < StringName , RPCMode > : : Element * E = data . rpc_methods . find ( p_method ) ; <nl> - if ( E ) { <nl> - <nl> - switch ( E - > get ( ) ) { <nl> - <nl> - case RPC_MODE_DISABLED : { <nl> - return false ; <nl> - } break ; <nl> - case RPC_MODE_REMOTE : { <nl> - return true ; <nl> - } break ; <nl> - case RPC_MODE_SYNC : { <nl> - return true ; <nl> - } break ; <nl> - case RPC_MODE_MASTER : { <nl> - return is_network_master ( ) ; <nl> - } break ; <nl> - case RPC_MODE_SLAVE : { <nl> - return ! is_network_master ( ) & & p_from = = get_network_master ( ) ; <nl> - } break ; <nl> - } <nl> - } <nl> - <nl> - if ( get_script_instance ( ) ) { <nl> - / / attempt with script <nl> - ScriptInstance : : RPCMode rpc_mode = get_script_instance ( ) - > get_rpc_mode ( p_method ) ; <nl> - <nl> - switch ( rpc_mode ) { <nl> - <nl> - case ScriptInstance : : RPC_MODE_DISABLED : { <nl> - return false ; <nl> - } break ; <nl> - case ScriptInstance : : RPC_MODE_REMOTE : { <nl> - return true ; <nl> - } break ; <nl> - case ScriptInstance : : RPC_MODE_SYNC : { <nl> - return true ; <nl> - } break ; <nl> - case ScriptInstance : : RPC_MODE_MASTER : { <nl> - return is_network_master ( ) ; <nl> - } break ; <nl> - case ScriptInstance : : RPC_MODE_SLAVE : { <nl> - return ! is_network_master ( ) & & p_from = = get_network_master ( ) ; <nl> - } break ; <nl> - } <nl> - } <nl> - <nl> - ERR_PRINTS ( " RPC from " + itos ( p_from ) + " on unauthorized method attempted : " + String ( p_method ) + " on base : " + String ( Variant ( this ) ) ) ; <nl> - return false ; <nl> - } <nl> - <nl> - bool Node : : can_call_rset ( const StringName & p_property , int p_from ) const { <nl> - <nl> - const Map < StringName , RPCMode > : : Element * E = data . rpc_properties . find ( p_property ) ; <nl> - if ( E ) { <nl> - <nl> - switch ( E - > get ( ) ) { <nl> - <nl> - case RPC_MODE_DISABLED : { <nl> - return false ; <nl> - } break ; <nl> - case RPC_MODE_REMOTE : { <nl> - return true ; <nl> - } break ; <nl> - case RPC_MODE_SYNC : { <nl> - return true ; <nl> - } break ; <nl> - case RPC_MODE_MASTER : { <nl> - return is_network_master ( ) ; <nl> - } break ; <nl> - case RPC_MODE_SLAVE : { <nl> - return ! is_network_master ( ) & & p_from = = get_network_master ( ) ; <nl> - } break ; <nl> - } <nl> - } <nl> - <nl> - if ( get_script_instance ( ) ) { <nl> - / / attempt with script <nl> - ScriptInstance : : RPCMode rpc_mode = get_script_instance ( ) - > get_rset_mode ( p_property ) ; <nl> - <nl> - switch ( rpc_mode ) { <nl> - <nl> - case ScriptInstance : : RPC_MODE_DISABLED : { <nl> - return false ; <nl> - } break ; <nl> - case ScriptInstance : : RPC_MODE_REMOTE : { <nl> - return true ; <nl> - } break ; <nl> - case ScriptInstance : : RPC_MODE_SYNC : { <nl> - return true ; <nl> - } break ; <nl> - case ScriptInstance : : RPC_MODE_MASTER : { <nl> - return is_network_master ( ) ; <nl> - } break ; <nl> - case ScriptInstance : : RPC_MODE_SLAVE : { <nl> - return ! is_network_master ( ) & & p_from = = get_network_master ( ) ; <nl> - } break ; <nl> - } <nl> - } <nl> - <nl> - ERR_PRINTS ( " RSET from " + itos ( p_from ) + " on unauthorized property attempted : " + String ( p_property ) + " on base : " + String ( Variant ( this ) ) ) ; <nl> - <nl> - return false ; <nl> - } <nl> - <nl> bool Node : : can_process ( ) const { <nl> <nl> ERR_FAIL_COND_V ( ! is_inside_tree ( ) , false ) ; <nl> void Node : : _bind_methods ( ) { <nl> BIND_CONSTANT ( NOTIFICATION_INTERNAL_PROCESS ) ; <nl> BIND_CONSTANT ( NOTIFICATION_INTERNAL_PHYSICS_PROCESS ) ; <nl> <nl> - BIND_ENUM_CONSTANT ( RPC_MODE_DISABLED ) ; <nl> - BIND_ENUM_CONSTANT ( RPC_MODE_REMOTE ) ; <nl> - BIND_ENUM_CONSTANT ( RPC_MODE_SYNC ) ; <nl> - BIND_ENUM_CONSTANT ( RPC_MODE_MASTER ) ; <nl> - BIND_ENUM_CONSTANT ( RPC_MODE_SLAVE ) ; <nl> - <nl> BIND_ENUM_CONSTANT ( PAUSE_MODE_INHERIT ) ; <nl> BIND_ENUM_CONSTANT ( PAUSE_MODE_STOP ) ; <nl> BIND_ENUM_CONSTANT ( PAUSE_MODE_PROCESS ) ; <nl> mmm a / scene / main / node . h <nl> ppp b / scene / main / node . h <nl> class Node : public Object { <nl> # endif <nl> } ; <nl> <nl> - enum RPCMode { <nl> - <nl> - RPC_MODE_DISABLED , / / no rpc for this method , calls to this will be blocked ( default ) <nl> - RPC_MODE_REMOTE , / / using rpc ( ) on it will call method / set property in all other peers <nl> - RPC_MODE_SYNC , / / using rpc ( ) on it will call method / set property in all other peers and locally <nl> - RPC_MODE_MASTER , / / usinc rpc ( ) on it will call method on wherever the master is , be it local or remote <nl> - RPC_MODE_SLAVE , / / usinc rpc ( ) on it will call method for all slaves , be it local or remote <nl> - } ; <nl> - <nl> struct Comparator { <nl> <nl> bool operator ( ) ( const Node * p_a , const Node * p_b ) const { return p_b - > is_greater_than ( p_a ) ; } <nl> class Node : public Object { <nl> Node * pause_owner ; <nl> <nl> int network_master ; <nl> - Map < StringName , RPCMode > rpc_methods ; <nl> - Map < StringName , RPCMode > rpc_properties ; <nl> + Map < StringName , MultiplayerAPI : : RPCMode > rpc_methods ; <nl> + Map < StringName , MultiplayerAPI : : RPCMode > rpc_properties ; <nl> <nl> / / variables used to properly sort the node when processing , ignored otherwise <nl> / / should move all the stuff below to bits <nl> class Node : public Object { <nl> int get_network_master ( ) const ; <nl> bool is_network_master ( ) const ; <nl> <nl> - void rpc_config ( const StringName & p_method , RPCMode p_mode ) ; / / config a local method for RPC <nl> - void rset_config ( const StringName & p_property , RPCMode p_mode ) ; / / config a local property for RPC <nl> + void rpc_config ( const StringName & p_method , MultiplayerAPI : : RPCMode p_mode ) ; / / config a local method for RPC <nl> + void rset_config ( const StringName & p_property , MultiplayerAPI : : RPCMode p_mode ) ; / / config a local property for RPC <nl> <nl> void rpc ( const StringName & p_method , VARIANT_ARG_LIST ) ; / / rpc call , honors RPCMode <nl> void rpc_unreliable ( const StringName & p_method , VARIANT_ARG_LIST ) ; / / rpc call , honors RPCMode <nl> class Node : public Object { <nl> Ref < MultiplayerAPI > get_multiplayer ( ) const ; <nl> Ref < MultiplayerAPI > get_custom_multiplayer ( ) const ; <nl> void set_custom_multiplayer ( Ref < MultiplayerAPI > p_multiplayer ) ; <nl> - const Map < StringName , RPCMode > : : Element * get_node_rpc_mode ( const StringName & p_method ) ; <nl> - const Map < StringName , RPCMode > : : Element * get_node_rset_mode ( const StringName & p_property ) ; <nl> - <nl> - bool can_call_rpc ( const StringName & p_method , int p_from ) const ; <nl> - bool can_call_rset ( const StringName & p_property , int p_from ) const ; <nl> + const Map < StringName , MultiplayerAPI : : RPCMode > : : Element * get_node_rpc_mode ( const StringName & p_method ) ; <nl> + const Map < StringName , MultiplayerAPI : : RPCMode > : : Element * get_node_rset_mode ( const StringName & p_property ) ; <nl> <nl> Node ( ) ; <nl> ~ Node ( ) ; <nl> | Merge pull request from Faless / rpc_sync_mmore | godotengine/godot | fc7f931d26900f70ec19f91837d1715e1a301834 | 2018-05-30T12:59:08Z |
mmm a / test / scan - test . cc <nl> ppp b / test / scan - test . cc <nl> <nl> <nl> FMT_BEGIN_NAMESPACE <nl> namespace internal { <nl> - <nl> struct scan_arg { <nl> int * value ; <nl> / / TODO : more types <nl> } ; <nl> - <nl> - template < typename Handler > <nl> - void parse_scan_format ( string_view format_str , Handler & & handler ) { <nl> - const char * p = format_str . data ( ) ; <nl> - const char * end = p + format_str . size ( ) ; <nl> - while ( p ! = end ) { <nl> - char c = * p + + ; <nl> - if ( c ! = ' { ' | | p = = end | | * p + + ! = ' } ' ) <nl> - throw format_error ( " invalid format string " ) ; <nl> - handler . on_arg ( ) ; <nl> - } <nl> - } <nl> } / / namespace internal <nl> <nl> struct scan_args { <nl> struct scan_args { <nl> } ; <nl> <nl> namespace internal { <nl> - struct scan_handler { <nl> + struct scan_handler : error_handler { <nl> const char * begin ; <nl> const char * end ; <nl> scan_args args ; <nl> struct scan_handler { <nl> args ( args ) , <nl> next_arg_id ( 0 ) { } <nl> <nl> - void on_arg ( ) { <nl> + void on_text ( const char * , const char * ) { on_error ( " invalid format " ) ; } <nl> + <nl> + void on_arg_id ( ) { <nl> + if ( next_arg_id > = args . size ) on_error ( " argument index out of range " ) ; <nl> + } <nl> + void on_arg_id ( unsigned ) { on_error ( " invalid format " ) ; } <nl> + void on_arg_id ( string_view ) { on_error ( " invalid format " ) ; } <nl> + <nl> + void on_replacement_field ( const char * ) { <nl> int value = 0 ; <nl> while ( begin ! = end ) { <nl> char c = * begin + + ; <nl> - if ( c < ' 0 ' | | c > ' 9 ' ) throw format_error ( " invalid input " ) ; <nl> + if ( c < ' 0 ' | | c > ' 9 ' ) on_error ( " invalid input " ) ; <nl> value = value * 10 + ( c - ' 0 ' ) ; <nl> } <nl> - if ( next_arg_id > = args . size ) <nl> - throw format_error ( " argument index out of range " ) ; <nl> * args . data [ 0 ] . value = value ; <nl> } <nl> + <nl> + const char * on_format_specs ( const char * begin , const char * ) { <nl> + return begin ; <nl> + } <nl> } ; <nl> } / / namespace internal <nl> <nl> void vscan ( string_view input , string_view format_str , scan_args args ) { <nl> - internal : : parse_scan_format ( format_str , internal : : scan_handler ( input , args ) ) ; <nl> + internal : : parse_format_string < false > ( format_str , <nl> + internal : : scan_handler ( input , args ) ) ; <nl> } <nl> <nl> template < typename . . . Args > <nl> | Reuse parse_format_string in scan | fmtlib/fmt | 4fcd4a4bd04133c07716509dd01281ee29a55e89 | 2019-05-18T21:18:06Z |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.