API Change List in R23
c4d_customgui/customgui_bitmapbutton.h
struct BitmapButtonCallback { void * data ; // changed to void * data = nullptr ;c4d_customgui/customgui_listview.h
struct TreeViewFloatSliderInfo { TreeViewFloatSliderInfo () : value (1.0), minValue (0.0), maxValue (1.0), increment (0.01), floatFormat ( FORMAT_PERCENT ), state ( LV_CHECKBOX_ENABLED ) {} // Changed to TreeViewFloatSliderInfo () : value (1.0), minValue (0.0), maxValue (1.0), minNominalValue (0.0), maxNominalValue (1.0), increment (0.01), floatFormat ( FORMAT_PERCENT ), state ( LV_CHECKBOX_ENABLED ), unit (0) {} } class TreeViewFunctions { virtual String GetNameForEdit ( void * root, void * userdata, void * obj); } class CINEWARE_SINGLEINHERITANCE TreeViewF { String GetNameForEdit( TreeViewFunctions * pFuncs, void * root, void * userdata, void * obj); } struct InternalFunctionTable { /*57*/ String (TreeViewF::*GetNameForEdit)( TreeViewFunctions * pFuncs, void * root, void * userdata, void * obj); } class PaintView { Bool GetShowMeshWireframe ( Bool & showMesh); Bool SetShowMeshWireframe ( Bool showMesh); } struct PaintLibrary : public C4DLibrary { Bool ( iPaintView ::* GetShowMeshWireframe)( Bool & showMesh); Bool ( iPaintView ::* SetShowMeshWireframe)( Bool showMesh); }description/arprefs.h removed.
description/deltamushbase.h removed.
description/dmline.h removed.
description/dpathlist.h removed.
description/fdecay.h removed.
description/fdelay.h removed.
description/fobjexport.h removed.
description/fobjimport.h removed.
description/fribexport.h removed.
description/Fstepexport.h removed.
description/ftime.h removed.
description/mrenderman.h removed.
description/odirectdeltamushdeformer.h removed.
description/ofracture.h removed.
description/omotioncapture.h removed.
description/osplinetovolume.h removed.
description/prefscineman.h removed.
description/prefsgpurenderer.h removed.
description/prefsmetricspreferences.h removed.
description/prefsphprefs.h removed.
description/Sclient.h removed.
description/Sgroup.h removed.
description/shrenderman.h removed.
description/Smodul.h removed.
description/Sserial.h removed.
description/tfloat.h removed.
description/toolmeshtovolume.h removed.
description/toolsculptbrushmulti.h removed.
description/toolsculptbrushpolish.h removed.
description/toolsculptbrushproject.h removed.
description/toolvolumeremesher.h removed.
description/tspooldummy.h removed.
description/tvolume.h removed.
description/vpbloom.h removed.
description/vprenderman.h removed
// Removed ABCEXPORT_FORMAT = 1024, ABCEXPORT_FORMAT_HDF5_LEGACY = 0, ABCEXPORT_FORMAT_OGAWA = 1, class BaseSceneHook : public BaseList2D { Bool InitDisplayControl ( BaseSceneHook *node, BaseDocument * doc, BaseDraw * bd, const AtomArray * active); // Changed to Bool InitDisplayControl ( BaseDocument * doc, BaseDraw * bd, const AtomArray * active); void Draw ( BaseDocument * doc, BaseDraw * bd, BaseDrawHelp * bh, BaseThread * bt, SCENEHOOKDRAW flags); } struct LayerData { LayerData () { solo = false ; } } class DrawportContextRef; class BaseDraw : public BaseView { void GetDrawportContext (maxon::DrawportContextRef& context) const } // Deprecated use GetUVSeams2 const EdgeBaseSelect * GetUVSeams ( const BaseObject * obj); const EdgeBaseSelect * GetUVSeams2 ( const BaseObject * obj, Bool checkUVSettings = false ); enum class MODELINGCOMMANDFLAGS { IMPORTER = (1 << 0) } enum class VIEWPORT_PICK_FLAGS { NO_DEPTH_CORRECTION = (1 << 7), } class DrawportContextRef; Bool ( BaseSceneHook ::*InitDisplayControlEx)( BaseSceneHook *node, BaseDocument * doc, BaseDraw * bd, const AtomArray * active); void ( BaseSceneHook ::*Draw)( BaseDocument * doc, BaseDraw * bd, BaseDrawHelp * bh, BaseThread * bt, SCENEHOOKDRAW flags); void (*GetDrawportContext)( const BaseDraw * bd, maxon::DrawportContextRef& context); const EdgeBaseSelect * (*GetUVSeams2)( const BaseObject * obj, Bool checkUVSettings);utilities/sseconversion.h added.
enum class VALUEKIND : UInt64 { CONTAINS_RECURSIVE_CONTAINER = 1 LL << 61, } template < typename ARRAY> class ArrayImpl { String ToString ( const FormatStatement* formatStatement) const ; // Changed to String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } template < typename ALLOCATOR = DefaultAllocator> class BaseBitSet { static Result<void> DescribeIO ( const DataSerializeInterface& stream) } class BytesValue { String ToString ( const FormatStatement* formatStatement) const ; // Changed to String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } template < typename COLLECTION, typename SUPER> class BaseCollection : public SUPER { inline String ToString ( const FormatStatement* formatStatement) const ; // Changed to inline String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } class GenericContainerInterface { MAXON_METHOD String ToString ( const FormatStatement* formatStatement) const ; // Changed to MAXON_METHOD String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } template < typename K, typename V, typename MAP = BurstTrieMapSelector<>> class ContiguousRangeMap { typename SFINAEHelper<String, K>::type ToString ( const FormatStatement* fmt) const // Changed to typename SFINAEHelper<String, K>::type ToString ( const FormatStatement* fmt = nullptr ) const } class Crc32C { static const UInt32 UNSET_VALUE = 0; } class DataDescriptionInterface { MAXON_METHOD String ToString ( const FormatStatement* formatStatement) const ; // Changed to MAXON_METHOD String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } MAXON_ATTRIBUTE (Id, CLASSIFICATION, "net.maxon.description.data.info.classification" , RESOURCE_DEFINE (ENUM_TYPE, Id( "type" ))); class DataDescriptionDatabaseInterface { // Deprecated static MAXON_METHOD Result<BaseArray<Tuple<Id, Data, String>>> GetEffectiveEnumList( const DataDictionary& dataEntry, const DataDictionary& guiEntry, const DataDescription& stringDescription, Bool resolveExtensionPointsAndGui, const AssetRepositoryRef& repository, const Data* filterData); static MAXON_METHOD Result<BaseArray<Tuple<Id, Data, String>>> GetEffectiveEnumList( const DataDictionary& dataEntry, const DataDictionary& guiEntry, const DataDescription& stringDescription, Bool resolveExtensionPointsAndGui, Bool withStrings, const LanguageRef& language, const AssetRepositoryRef& repository, const Data* filterData); } class DataDictionaryInterface { MAXON_METHOD String ToString ( const FormatStatement* formatStatement) const ; // Changed to MAXON_METHOD String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } struct IDENT_VOID { String ToString ( const FormatStatement* formatStatement) const // Changed to String ToString ( const FormatStatement* formatStatement = nullptr ) const } struct DataTypeComponent { String ToString ( const FormatStatement* formatStatement) const // Changed to String ToString ( const FormatStatement* formatStatement = nullptr ) const } class DataTypeImpl { String ToString ( const FormatStatement* formatStatement) const ; // Changed to String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } class DataTypeImpl::Instantiated : public DataTypeImpl { String ToString ( const FormatStatement* formatStatement) const ; // Changed to String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } class 数据 { String ToString ( const FormatStatement* formatStatement) const ; // Changed to String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } class class ConstDataPtr { String ToString ( const FormatStatement* formatStatement) const ; // Changed to String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } class InternedId { String ToString ( const FormatStatement* formatStatement) const ; // Changed to String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } struct Member { String ToString ( const FormatStatement* formatStatement) const ; // Changed to String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } class LocalDateTime { String ToString ( const FormatStatement* formatStatement) const ; // Changed to String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } class UniversalDateTime { String ToString ( const FormatStatement* formatStatement) const ; // Changed to String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } template < typename ITERATOR, typename SUPER = EmptyClass> class ForEachIterator : public SUPER { inline String ToString ( const FormatStatement* formatStatement) const ; // Changed to inline String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } class Entry : public HashMapEntryBase<K, V, Entry, ENTRY_HANDLER> { typename SFINAEHelper<String, V>::type ToString ( const FormatStatement* format) const // Changed to typename SFINAEHelper<String, V>::type ToString ( const FormatStatement* format = nullptr ) const } template <typename VALUEHASH> class Hash { typename SFINAEHelper<String, V>::type ToString ( const FormatStatement* formatStatement) const // Changed to typename SFINAEHelper<String, V>::type ToString ( const FormatStatement* formatStatement = nullptr ) const } class JobInterface : protected JobInterfaceBase { String ToString ( const FormatStatement* formatStatement) const ; // Changed to String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } class JobStatusRef : public StrongRef <JobStatusInterface> { String ToString ( const FormatStatement* formatStatement) const ; // Changed to String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } class JobRef : public StrongRef <JobInterface> { String ToString ( const FormatStatement* formatStatement) const ; // Changed to String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } class JobGroupInterface { String ToString ( const FormatStatement* formatStatement) const ; // Changed to String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } class JobGroupRef : public StrongRef <JobGroupInterface> { String ToString ( const FormatStatement* formatStatement) const ; // Changed to String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } template < typename T> class StaticJobGroupInterface : public JobGroupInterface { String ToString ( const FormatStatement* formatStatement) const ; // Changed to String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } template < typename T> class StaticJobGroupRef : public StrongRef <StaticJobGroupInterface<T>> { String ToString ( const FormatStatement* formatStatement) const ; // Changed to String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } class MachineInterface : MAXON_INTERFACE_BASES (ObserverObjectInterface) { MAXON_METHOD String ToString ( const FormatStatement* formatStatement) const ; // Changed to MAXON_METHOD String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } template < typename K, typename V> class MapInterface : public MapBase0<MapInterface<K, V>, K, V, EmptyClass, DefaultCompare> { MAXON_METHOD String ToString ( const FormatStatement* formatStatement) const ; // Changed to MAXON_METHOD String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } template < typename MAP> class MapImpl : public std::conditional<STD_IS_REPLACEMENT(const, typename std::remove_reference<MAP>::type) || !STD_IS_REPLACEMENT(reference, MAP), MapInterface<typename std::remove_reference<MAP>::type::KeyType, typename ConstIf<typename std::remove_reference<MAP>::type::ValueType, STD_IS_REPLACEMENT(const, typename std::remove_reference<MAP>::type)>::type>, NonConstMap<typename std::remove_reference<MAP>::type::KeyType, typename std::remove_reference<MAP>::type::ValueType>>::type { String ToString ( const FormatStatement* formatStatement) const ; // Changed to String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } template < typename V> struct SqrMat3 { String ToString ( const FormatStatement* formatStatement) const // Changed to String ToString ( const FormatStatement* formatStatement = nullptr ) const } template <typename V> struct Mat3 { String ToString ( const FormatStatement* formatStatement) const // Changed to String ToString ( const FormatStatement* formatStatement = nullptr ) const } template < typename V> struct SqrMat2 { String ToString ( const FormatStatement* formatStatement) const // Changed to String ToString ( const FormatStatement* formatStatement = nullptr ) const } template <typename V> struct Mat2 { String ToString ( const FormatStatement* formatStatement) const // Changed to String ToString ( const FormatStatement* formatStatement = nullptr ) const } template < typename V> struct SqrMat4 { String ToString ( const FormatStatement* formatStatement) const // Changed to String ToString ( const FormatStatement* formatStatement = nullptr ) const } template < typename INT_TYPE> class MultiIndex { String ToString ( const FormatStatement* fmt) const ; // Changed to String ToString ( const FormatStatement* fmt = nullptr ) const ; } class InterfaceReference { String ToString ( const FormatStatement* fs) const // Changed to String ToString ( const FormatStatement* fs = nullptr ) const } class ComponentDescriptor { String ToString ( const FormatStatement* fs) const // Changed to String ToString ( const FormatStatement* fs = nullptr ) const } class ClassInterface { MAXON_METHOD String ToString ( const FormatStatement* formatStatement) const ; // Changed to MAXON_METHOD String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } class ObjectInterface : protected ObjectSuper { MAXON_METHOD String ToString ( const FormatStatement* formatStatement) const ; // Changed to MAXON_METHOD String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } template < typename T> class Opt { typename SFINAEHelper<String, T>::type ToString ( const FormatStatement* format) const // Changed to typename SFINAEHelper<String, T>::type ToString ( const FormatStatement* format = nullptr ) const } class ParameterType { String ToString ( const FormatStatement* fmt) const ; // Changed to String ToString ( const FormatStatement* fmt = nullptr ) const ; } template < typename T> class Range { typename SFINAEHelper<String, T>::type ToString ( const FormatStatement* format) const // Changed to typename SFINAEHelper<String, T>::type ToString ( const FormatStatement* format = nullptr ) const } template < typename K> struct RangeSetPair { typename SFINAEHelper<String, K>::type ToString ( const FormatStatement* fmt) const // Changed to typename SFINAEHelper<String, K>::type ToString ( const FormatStatement* fmt = nullptr ) const } template <typename K, typename V, typename MAP = BurstTrieMapSelector<>> class RangeMap { typename SFINAEHelper<String, K>::type ToString ( const FormatStatement* fmt) const // Changed to typename SFINAEHelper<String, K>::type ToString ( const FormatStatement* fmt = nullptr ) const } template < typename K, typename V, typename HASH = DefaultCompare, typename HANDLER = RefCountHashMapDefaultHandler> class RefCountHashMap { String ToString ( const FormatStatement* fmt) const // Changed to String ToString ( const FormatStatement* fmt = nullptr ) const } class EntryRef { String ToString ( const FormatStatement* fs) const // Changed to String ToString ( const FormatStatement* fs = nullptr ) const } class Member { MAXON_METHOD String ToString ( const FormatStatement* fs) const ; // Changed to MAXON_METHOD String ToString ( const FormatStatement* fs = nullptr ) const ; } template < typename TYPE> class SetInterface : public SetBase0<SetInterface<TYPE>, TYPE, EmptyClass, DefaultCompare> { MAXON_METHOD String ToString ( const FormatStatement* formatStatement) const ; // Changed to MAXON_METHOD String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } template < typename SET> class SetImpl { String ToString ( const FormatStatement* formatStatement) const // Changed to String ToString ( const FormatStatement* formatStatement = nullptr ) const } struct ConversionTestSet { String ToString ( const FormatStatement* format) const // Changed to String ToString ( const FormatStatement* format = nullptr ) const } class StringInterface : public StringTemplate<StringInterface, String, Utf32Char> { inline String ToString ( const FormatStatement* formatStatement) const ; // Changed to inline String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } class CStringInterface : public StringTemplate<CStringInterface, CString, Char> { String ToString ( const FormatStatement* formatStatement) const ; // Changed to String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } class LanguageInterface { MAXON_METHOD String ToString ( const maxon::FormatStatement * fs) const ; // Changed to MAXON_METHOD String ToString ( const maxon::FormatStatement * fs = nullptr ) const ; } template < typename T, typename HANDLER, typename TAG, Int TAG_BITS, TAG DEFAULT_VALUE = TAG(0), Bool ENABLE_POINTER_CONVERSION = true> class TaggedBaseRef { typename SFINAEHelper<String, T>::type ToString ( const FormatStatement* format) const // Changed to typename SFINAEHelper<String, T>::type ToString ( const FormatStatement* format = nullptr ) const } class ThreadInterface : public JobInterface { String ToString ( const FormatStatement* formatStatement) const ; // Changed to String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } template < typename INTERFACE> class ThreadRefTemplate : public StrongRef <INTERFACE> { String ToString ( const FormatStatement* formatStatement) const ; // Changed to String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } class TimeValue { String ToString ( const FormatStatement* formatStatement) const ; // Changed to String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } template < typename K, typename V, typename MAP = HashMapSelector<>, Bool COW = false> class TreeMap : public TreeMapParent<TreeMap<K, V, MAP, COW>, COW> { String ToString ( const FormatStatement* fs) const // Changed to String ToString ( const FormatStatement* fs = nullptr ) const } template < typename ... T> class Tuple : public maxon::details::TupleStorage <T...> { typename SFINAEHelper< String , T...>::type ToString ( const FormatStatement* format) const // Changed to typename SFINAEHelper< String , T...>::type ToString ( const FormatStatement* format = nullptr ) const } template <> class Tuple<> { const String & ToString ( const FormatStatement*) const // Changed to const String & ToString ( const FormatStatement* fmt = nullptr ) const } class DimensionInterface { MAXON_METHOD String ToString ( const FormatStatement* fs) const ; // Changed to MAXON_METHOD String ToString ( const FormatStatement* fs = nullptr ) const ; } class UnitInterface { MAXON_METHOD String ToString ( const FormatStatement* fs) const ; // Changed to MAXON_METHOD String ToString ( const FormatStatement* fs = nullptr ) const ; } class UrlInterface { MAXON_METHOD String ToString ( const FormatStatement* formatStatement) const ; // Changed to MAXON_METHOD String ToString ( const FormatStatement* formatStatement = nullptr ) const ; } class Uuid; { MAXON_METHOD String ToString ( const FormatStatement* formatStatement) const ; // Changed to MAXON_METHOD String ToString ( const FormatStatement* formatStatement = nullptr ) const ; }//Deprecated static MAXON_METHOD void SSL_load_error_strings();
//Deprecated SSL_library_init static MAXON_METHOD int OPENSSL_init_ssl();
//Deprecated static MAXON_METHOD const SSL_METHOD* TLSv1_method(); /* TLSv1.0 */
//Deprecated static MAXON_METHOD const SSL_METHOD* TLSv1_1_method(); /* TLSv1.1 */
//Deprecated static MAXON_METHOD const SSL_METHOD* TLSv1_2_method(); /* TLSv1.2 */
//Deprecated static MAXON_METHOD const SSL_METHOD* SSLv3_method(); /* SSLv3 */
//Deprecated static MAXON_METHOD const SSL_METHOD* SSLv2_method(); /* SSLv2 */
//Deprecated static MAXON_METHOD const SSL_METHOD* SSLv23_method(); /* SSLv3 but can rollback to v2 */ static MAXON_METHOD const SSL_METHOD* TLS_method(); }
// Removed SSL2,
// Removed SSL23, TLS }
c4d_customgui/customgui_bitmapbutton.h
#define BITMAPBUTTON_FORCE_SIZE_Y 'sizy' ///< ::Int32 Additionally forces the y size of the bitmap button. FORCE_SIZE is used for y size when not specified.c4d_customgui/customgui_description.h
enum class AMFILTERFLAGS { SHOWKEYFRAMESEL = 1 << 4, SHOWANIMATED = 1 << 5, SHOWDRIVERDRIVENXPRESSO = 1 << 6, SHOWOVERRIDEN = 1 << 7, }c4d_customgui/customgui_filename_breadcrumb.h
#define BREADCRUMB_SLASH_CODE 10007 ///< ::Bool The string "_&s&_" is replaced with character "/"c4d_customgui/customgui_linkbox.h
LINKBOX_NO_PICKER = 10003 ///< ::Bool No picker mode.c4d_customgui/customgui_listview.h
#define TREEVIEW_CUSTOM_BG_COLOR 'cubg' class TreeViewCustomGui { virtual Bool IsSelectable( void *root, void *userdata, void *obj); void SetShowLines ( Bool show); Bool GetShowLines () const ; }c4d_libs/lib_activeobjectmanager.h
enum class ACTIVEOBJECTMODE { NODEV2 , } class SDKBrowserPluginInterface { Int32 GetPluginID ( String *plugin_name = 0) const ; // Changed to Int32 GetPluginID ( String *plugin_name = nullptr ) const ; } class SDKBrowserPluginInterfaceInfo { virtual Int32 GetPluginID ( String *plugin_name = 0) // Changed to virtual Int32 GetPluginID ( String *plugin_name = nullptr ) } class SDKBrowserContentNodeInfo { virtual UInt32 GetNodeFlags( Int64 *out_size = 0) // Changed to virtual UInt32 GetNodeFlags( Int64 *out_size = nullptr ) virtual Int32 NewFolder( Int32 mode, const String &name, SDKBrowserContentNodeRef *folder = 0) // Changed to virtual Int32 NewFolder( Int32 mode, const String &name, SDKBrowserContentNodeRef *folder = nullptr ) } class SDKBrowserContentNode { SDKBrowserURL GetNodeURL( UInt32 flags = 0, Int32 *idx = 0) const ; // Changed to SDKBrowserURL GetNodeURL( UInt32 flags = 0, Int32 *idx = nullptr ) const ; UInt32 GetNodeFlags( Int64 *out_size = 0) const ; // Changed to UInt32 GetNodeFlags( Int64 *out_size = nullptr ) const ; Int32 NewFolder( Int32 模式， const String &name, SDKBrowserContentNodeRef *folder = 0); // Changed to Int32 NewFolder( Int32 模式， const String &name, SDKBrowserContentNodeRef *folder = nullptr ); } class SDKBrowser { static SDKBrowserIcon * GetIcon ( const SDKBrowserURL &url, SDKBrowserPluginRef plugin = 0, Int32 flags = 0, LocalFileTime *preview_time = 0); // Changed to static SDKBrowserIcon * GetIcon ( const SDKBrowserURL &url, SDKBrowserPluginRef plugin = nullptr , Int32 flags = 0, LocalFileTime *preview_time = nullptr ); static Int32 PreviewDialogMisc( SubDialog *dlg, void *&private_data, Int32 cmd, Int32 value0 = 0, Int32 value1 = 0, void *value2 = 0, void *value3 = 0); // Changed to static Int32 PreviewDialogMisc( SubDialog *dlg, void *&private_data, Int32 cmd, Int32 value0 = 0, Int32 value1 = 0, void *value2 = nullptr , void *value3 = nullptr ); } class DescID { // Removed Int32 temp1; Int32 *temp2; std::aligned_storage< sizeof ( maxon::BaseArray<DescLevel> ), alignof ( maxon::BaseArray<DescLevel> )>::type _private ; UInt GetHashCode () const ; // Changed to maxon::HashInt GetHashCode () const ; } struct DescriptionLib { UInt (*DescID_GetHashCode)( const DescID *d); // Changed to maxon::HashInt (*DescID_GetHashCode)( const DescID *d); } class InstanceObject { maxon::Block<const maxon::HashValue> GetInstancePersistentHashes () const ; } struct InstanceObjectLibrary { maxon::Block<const maxon::HashValue> (iInstanceObject::*GetInstancePersistentHashes)() const ; } namespace maxon { class ThreadInterface; } #define PREFS_NODE_EDITOR 1055257 #define PREFS_PRI_NODE_EDITOR 10000095 ///< Node Editor. BaseList2D * AddMarker ( BaseDocument * doc, BaseList2D * pPred, BaseTime time, String name); // Changed to BaseList2D * AddMarker ( BaseDocument * doc, BaseList2D * pPred, BaseTime time, String name, maxon::Color color = maxon::Color (), BaseTime length = BaseTime (), LayerObject * obj = nullptr ); BaseList2D * (*AddMarker)( BaseDocument * doc, BaseList2D * pPred, BaseTime time, String name); // Changed to BaseList2D * (*AddMarker)( BaseDocument * doc, BaseList2D * pPred, BaseTime time, String name, maxon::Color color, BaseTime length, LayerObject * obj);c4d_libs/lib_viewport.h
//Removed class AtomArray ;//Removed class ViewportSelect ;
//Removed class GeClipMap ;
c4d_misc/utilities/apibasemath.h
static const Float32 MINVALUE_FLOAT32 // Changed to static constexpr Float32 MINVALUE_FLOAT32 static const Float32 MAXVALUE_FLOAT32 // Changed to static constexpr Float32 MAXVALUE_FLOAT32 static const Float64 MINVALUE_FLOAT64 // Changed to static constexpr Float64 MINVALUE_FLOAT64 static const Float64 MAXVALUE_FLOAT64 // Changed to static constexpr Float64 MAXVALUE_FLOAT64 static const Float32 MINVALUE_INT32_FLOAT32 // Changed to static constexpr Float32 MINVALUE_INT32_FLOAT32 static const Float32 MAXVALUE_INT32_FLOAT32 // Changed to static constexpr Float32 MAXVALUE_INT32_FLOAT32 static const Float64 MINVALUE_INT64_FLOAT64 // Changed to static constexpr Float64 MINVALUE_INT64_FLOAT64 static const Float64 MAXVALUE_INT64_FLOAT64 // Changed to static constexpr Float64 MAXVALUE_INT64_FLOAT64 static const Float32 MINRANGE_FLOAT32 // Changed to static constexpr Float32 MINRANGE_FLOAT32 static const Float32 MAXRANGE_FLOAT32 // Changed to static constexpr Float32 MAXRANGE_FLOAT32 static const Float64 MINRANGE_FLOAT64 // Changed to static constexpr Float64 MINRANGE_FLOAT64 static const Float64 MAXRANGE_FLOAT64 // Changed to static constexpr Float64 MAXRANGE_FLOAT64 static const Float MINVALUE_FLOAT // Changed to static constexpr Float MINVALUE_FLOAT static const Float MAXVALUE_FLOAT // Changed to static constexpr Float MAXVALUE_FLOAT static const Float MINRANGE_FLOAT // Changed to static constexpr Float MINRANGE_FLOAT static const Float MAXRANGE_FLOAT // Changed to static constexpr Float MAXRANGE_FLOAT template <> class LIMIT < Int64 > { static const Int64 MIN // Changed to static constexpr Int64 MIN static const Int64 MAX // Changed to static constexpr Int64 MAX// Removed static constexpr Int64 最小 ()
// Removed static constexpr Int64 最大 () }; template<> class LIMIT < UInt64 > { static const UInt64 MIN // Changed to static constexpr UInt64 MIN static const UInt64 MAX // Changed to static constexpr UInt64 MAX
// Removed static constexpr UInt64 最小 ()
// Removed static constexpr UInt64 最大 () }; template<> class LIMIT < Int32 > { static const Int32 MIN // Changed to static constexpr Int32 MIN static const Int32 MAX // Changed to static constexpr Int32 MAX
// Removed static constexpr Int32 最小 ()
// Removed static constexpr Int32 最大 () }; template<> class LIMIT < UInt32 > { public : static const UInt32 MIN // Changed to static constexpr UInt32 MIN static const UInt32 MAX // Changed to static constexpr UInt32 MAX
// Removed static constexpr UInt32 最小 ()
// Removed static constexpr UInt32 最大 () }; template<> class LIMIT < Int16 > { public : static const Int16 MIN // Changed to static constexpr Int16 MIN static const Int16 MAX // Changed to static constexpr Int16 MAX
// Removed static constexpr Int16 最小 ()
// Removed static constexpr Int16 最大 () }; template<> class LIMIT < UInt16 > { public : static const UInt16 MIN // Changed to static constexpr UInt16 MIN static const UInt16 MAX // Changed to static constexpr UInt16 MAX
// Removed static constexpr UInt16 最小 ()
// Removed static constexpr UInt16 最大 () }; template<> class LIMIT < Char > { public : static const Char MIN // Changed to static constexpr Char MIN static const Char MAX // Changed to static constexpr Char MAX
// Removed static constexpr Char 最小 ()
// Removed static constexpr Char 最大 () }; template<> class LIMIT < UChar > { public : static const UChar MIN // Changed to static constexpr UChar MIN static const UChar MAX // Changed to static constexpr UChar MAX
// Removed static constexpr UChar 最小 ()
// Removed static constexpr UChar 最大 () }; template<> class LIMIT < Float32 > { public : static constexpr Float32 最小 () // Changed to static constexpr Float32 MIN static constexpr Float32 最大 () // Changed to static constexpr Float32 MAX }; template<> class LIMIT < Float64 > { public : static constexpr Float64 最小 () // Changed to static constexpr Float64 MIN static constexpr Float64 最大 () // Changed to static constexpr Float64 MAX }; static const Int NOTOK // Changed to static constexpr Int NOTOK static const Float64 PI // Changed to static constexpr Float64 PI static const Float64 PI_INV // Changed to static constexpr Float64 PI_INV static const Float64 PI2 // Changed to static constexpr Float64 PI2 static const Float64 PI2_INV // Changed to static constexpr Float64 PI2_INV static const Float64 PI05 // Changed to static constexpr Float64 PI05
class ImageRef; class BaseDraw { Bool PointInRange ( const 向量 & p, Int32 x, Int32 y) const ; // Changed to Bool PointInRange ( const 向量 & p, Int32 x, Int32 y, Float range = 10.0_f) const ; void GetViewportImage (maxon::ImageRef& viewportImage) const ; void RenderViewportWithoutPostEffects (maxon::ImageRef& image) const ; } class BaseObject { Int32 GetEditorModeH ( void ) const ; Int32 GetRenderModeH ( void ) const ; } enum { COLOR_SB_CARET_TEXT , COLOR_TITLE_TEXT , COLOR_TITLE_BACKGROUND , COLOR_MANAGER_BG_TREEVIEW , COLOR_TEXT_EDIT_HELP , COLOR_SB_VISIBILITY_DOT_NONE , COLOR_SB_VISIBILITY_DOT_ENABLED , COLOR_SB_VISIBILITY_DOT_DISABLED , } enum DA { DA_DATA = 260 } class GeData { GeData ( const maxon::Data &n) const maxon::Data & GetData ( void ) const ; void SetData ( const maxon::Data & v); } VIEWPORTTYPE GeGetActiveViewportType ();c4d_includes.h
// Removed #include "description/oheadphone.h" #include "description/oloudspeaker.h" #include "description/omicrophone.h" #define LIBOFFSET(s, m) (Int32)((UInt)(&(((s*)0)->m))) // Changed to #define LIBOFFSET(s, m) (Int32)((UInt)(&(((s*)nullptr)->m))) struct TempUVHandle { maxon::Block<Int32> GetUVIslands (); } #define GETACTIVEUVSET_ISLANDS (1 << 10) ///< Get the UV islands. struct Multipass { 向量 * vp_magicBulletLooks ; } maxon::ThreadRef MaxonConvert ( BaseThread * thread); BaseThread * MaxonConvert ( const maxon::ThreadRef & thread); BaseThread * MaxonConvert ( const maxon::ThreadInterface * thread); struct Multipass { 向量 * vp_magicBulletLooks ; } // Removed class AtomArray ; class String ; class BaseContainer ; class BaseBitmap ; class BaseDocument ; class BaseObject ; class BaseDraw ; class BaseDrawHelp ; class BaseThread ; class CDialog; class EditorWindow ; #define VPMagicBulletLooks 1054755 #define VPBUFFER_MAGICBULLETLOOKS 206 #define VPPRIORITY_MAGICBULLETLOOKS -100 #define VPPRIORITY_WATERMARK -1000 #define PLUGINFLAG_VIDEOPOST_STATIC (1 << 8) #define PLUGINFLAG_VIDEOPOST_OFFBYDEFAULT (1 << 9) #define MSG_VIDEOPOST_SETPREVIEW_VIEWPORT 1055286 #define MSG_VIDEOPOST_SETPREVIEW 1055287 // Removed #define Omicrophone 5138 #define Oloudspeaker 5139 #define Oheadphone 5151 enum class LINESTILE { DASHED_BIG } enum class NBIT { NODE_TEMP = 96, } #define SKY_OBJECT 1011146 #define MDATA_UVSTRAIGHTEN_ALIGN 2270 #define MDATA_UVSTRAIGHTEN_KEEP_LENGTH 2271 #define MDATA_UVSTRAIGHTEN_EQUIDISTANT 2272 #define MDATA_UVRECTANGULARIZE_ALIGN 2280 #define MDATA_UVRECTANGULARIZE_EQUIDISTANT 2281 // Removed #define WPREF_REFRESHTIME 10008 #define WPREF_NODE_EDITOR_GRID 1055258 #define WPREF_NODE_EDITOR_NAVIGATOR 1055259 #define WPREF_NODE_EDITOR_WIRE_STYLE 1055260 #define WPREF_NODE_EDITOR_ERRORS 1055261 #define WPREF_NODE_EDITOR_SNAP_GRID 1055262 #define WPREF_NODE_EDITOR_WIRE_STYLE_BEZIER 0 #define WPREF_NODE_EDITOR_WIRE_STYLE_STRAIGHT 1 #define EVMSG_SETMODE 1055256 #define EVMSG_TL_FCURVE_POS -200000079 #define EVMSG_TL_FCURVE_ROT -200000080 #define EVMSG_TL_FCURVE_SCALE -200000081 #define VIEWCOLOR_UV_GRID_MAJOR 106 #define VIEWCOLOR_UV_GRID_MINOR 107 #define VIEWCOLOR_INACTIVE_MODIFIER 108 #define EXECUTIONPRIORITY_SCENENODE 10000 enum class OBJECTSTATE { EDITOR_HIERARCHICAL = 4, RENDER_HIERARCHICAL = 5, } enum class VIEWPORTTYPE { NONE = 0, MAIN_VIEW = 1, UV_VIEW = 2 } enum class DRAWFLAGS { // Removed NO_REDUCTION = (1 << 2) } enum class SCENENODES_IDS { SCENEHOOK_ID = 1054188, MSGUPDATE_LEGACYOBJ_ID = 180420109, PERSISTENT_HASH_LOW_ID = 180420112 } enum { FONT_ITALIC = 6 } using Matrix4d32 = maxon::SqMat4<Vector4d32>; // Changed to using Matrix4d32 = maxon::SqrMat4<Vector4d32> ; using Matrix4d64 = maxon::SqMat4<Vector4d64>; // Changed to using Matrix4d64 = maxon::SqrMat4<Vector4d64> ; using Matrix4d = maxon::SqMat4<Vector4d>; // Changed to using Matrix4d = maxon::SqrMat4<Vector4d> ; ///< Matrix4 for double-precision @C4D versions. class ObserverObjectRef; Bool (*SetMaxonData )( GeData *data, const maxon::Data * b); const maxon::Data & (*GetMaxonData )( const GeData *data); Bool (*PointInRange )( const BaseDraw *bd, const 向量 &p, Int32 x, Int32 y); // Changed to Bool (*PointInRange )( const BaseDraw *bd, const 向量 &p, Int32 x, Int32 y, Float range); void (*GetViewportImage )( const BaseDraw * bd, maxon::ImageRef& viewportImage); void (*RenderViewportWithoutPostEffects )( const BaseDraw * bd, maxon::ImageRef& image); VIEWPORTTYPE (* GeGetActiveViewportType )(); maxon::Block<Int32> (*UVGetIslands)( TempUVHandle * handle);// Removed static Int64 最小 () static Int64 最大 () } template <> class LIMIT < UInt64 > { static const UInt64 MIN // Changed to static constexpr UInt64 MIN static const UInt64 MAX // Changed to static constexpr UInt64 MAX
// Removed static UInt64 最小 () static UInt64 最大 () } template <> class LIMIT < Int32 > { static const Int32 MIN // Changed to static constexpr Int32 MIN static const Int32 MAX // Changed to static constexpr Int32 MAX
// Removed static Int32 最小 () static Int32 最大 () } template <> class LIMIT < UInt32 > { static const UInt32 MIN // Changed to static constexpr UInt32 MIN static const UInt32 MAX // Changed to static constexpr UInt32 MAX
// Removed static UInt32 最小 () static UInt32 最大 () } template <> class LIMIT < Int16 > { static const Int16 MIN // Changed to static constexpr Int16 MIN static const Int16 MAX // Changed to static constexpr Int16 MAX
// Removed static Int16 最小 () static Int16 最大 () } template <> class LIMIT < UInt16 > { static const UInt16 MIN // Changed to static constexpr UInt16 MIN static const UInt16 MAX // Changed to static constexpr UInt16 MAX
// Removed static UInt16 最小 () static UInt16 最大 () } template <> class LIMIT < Char > { static const Char MIN // Changed to static constexpr Char MIN static const Char MAX // Changed to static constexpr Char MAX
// Removed static Char 最小 () static Char 最大 () } template <> class LIMIT < UChar > { static const UChar MIN // Changed to static constexpr UChar MIN static const UChar MAX // Changed to static constexpr UChar MAX
// Removed static UChar 最小 () static UChar 最大 () } template <> class LIMIT < Float32 > { static Float32 最小 () // Changed to static constexpr Float32 MIN static Float32 最大 () // Changed to static constexpr Float32 MAX } template <> class LIMIT < Float64 > { static Float64 最小 () // Changed to static constexpr Float64 MIN static Float64 最大 () // Changed to static constexpr Float64 MAX } static const Int NOTOK // Changed to static constexpr Int NOTOK static const Float64 PI // Changed to static constexpr Float64 PI static const Float64 PI_INV // Changed to static constexpr Float64 PI_INV static const Float64 PI2 // Changed to static constexpr Float64 PI2 static const Float64 PI2_INV // Changed to static constexpr Float64 PI2_INV static const Float64 PI05 // Changed to static constexpr Float64 PI05 static constexpr Float64 PI05_INV static const Float64 SQRT2 // Changed to static constexpr Float64 SQRT2 static const Float64 SQRT_PI2 // Changed to static constexpr Float64 SQRT_PI2 static const Float64 SQRT2_INV // Changed to static constexpr Float64 SQRT2_INV static const Float64 SQRT3 // Changed to static constexpr Float64 SQRT3 static const Float64 LOG2 // Changed to static constexpr Float64 LOG2 template < Int X, Int ... Y> struct Sum<X, Y...> { static const Int value // Changed to static constexpr Int value static const Int value // Changed to static constexpr Int value static const T value // Changed to static constexpr T value static const T value // Changed to static constexpr T value }
maxon/utilities/classhelpers.h
// Removed #define PRIVATE_MAXON_HASHCODE1(m1) maxon::DefaultCompare::GetHashCode(m1) #define PRIVATE_MAXON_HASHCODE2(m1, m2) (PRIVATE_MAXON_HASHCODE1(m1) * 31 + maxon::DefaultCompare::GetHashCode(m2)) #define PRIVATE_MAXON_HASHCODE3(m1, m2, m3) (PRIVATE_MAXON_HASHCODE2(m1, m2) * 31 + maxon::DefaultCompare::GetHashCode(m3)) #define PRIVATE_MAXON_HASHCODE4(m1, m2, m3, m4) (PRIVATE_MAXON_HASHCODE3(m1, m2, m3) * 31 + maxon::DefaultCompare::GetHashCode(m4)) #define PRIVATE_MAXON_HASHCODE5(m1, m2, m3, m4, m5) (PRIVATE_MAXON_HASHCODE4(m1, m2, m3, m4) * 31 + maxon::DefaultCompare::GetHashCode(m5)) #define PRIVATE_MAXON_HASHCODE6(m1, m2, m3, m4, m5, m6) (PRIVATE_MAXON_HASHCODE5(m1, m2, m3, m4, m5) * 31 + maxon::DefaultCompare::GetHashCode(m6)) #define PRIVATE_MAXON_HASHCODE7(m1, m2, m3, m4, m5, m6, m7) (PRIVATE_MAXON_HASHCODE6(m1, m2, m3, m4, m5, m6) * 31 + maxon::DefaultCompare::GetHashCode(m7)) #define PRIVATE_MAXON_HASHCODE8(m1, m2, m3, m4, m5, m6, m7, m8) (PRIVATE_MAXON_HASHCODE7(m1, m2, m3, m4, m5, m6, m7) * 31 + maxon::DefaultCompare::GetHashCode(m8)) #define PRIVATE_MAXON_HASHCODE9(m1, m2, m3, m4, m5, m6, m7, m8, m9) (PRIVATE_MAXON_HASHCODE8(m1, m2, m3, m4, m5, m6, m7, m8) * 31 + maxon::DefaultCompare::GetHashCode(m9)) #define PRIVATE_MAXON_HASHCODE10(m1, m2, m3, m4, m5, m6, m7, m8, m9, m10) (PRIVATE_MAXON_HASHCODE9(m1, m2, m3, m4, m5, m6, m7, m8, m9) * 31 + maxon::DefaultCompare::GetHashCode(m10)) #define PRIVATE_MAXON_HASHCODE11(m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11) (PRIVATE_MAXON_HASHCODE10(m1, m2, m3, m4, m5, m6, m7, m8, m9, m10) * 31 + maxon::DefaultCompare::GetHashCode(m11)) #define PRIVATE_MAXON_HASHCODE12(m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11, m12) (PRIVATE_MAXON_HASHCODE11(m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11) * 31 + maxon::DefaultCompare::GetHashCode(m12)) #define PRIVATE_MAXON_HASHCODE13(m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11, m12, m13) (PRIVATE_MAXON_HASHCODE12(m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11, m12) * 31 + maxon::DefaultCompare::GetHashCode(m13)) #define PRIVATE_MAXON_HASHCODE14(m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11, m12, m13, m14) (PRIVATE_MAXON_HASHCODE13(m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11, m12, m13) * 31 + maxon::DefaultCompare::GetHashCode(m14)) #define PRIVATE_MAXON_HASHCODE15(m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11, m12, m13, m14, m15) (PRIVATE_MAXON_HASHCODE14(m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11, m12, m13, m14) * 31 + maxon::DefaultCompare::GetHashCode(m15)) #define PRIVATE_MAXON_HASHCODE_C(count, ...) MAXON_EXPAND(PRIVATE_MAXON_HASHCODE##count(__VA_ARGS__)) #define PRIVATE_MAXON_HASHCODE_B(count, ...) PRIVATE_MAXON_HASHCODE_C(count, __VA_ARGS__) #define PRIVATE_MAXON_HASHCODE_A(count, ...) PRIVATE_MAXON_HASHCODE_B(count, __VA_ARGS__) #define MAXON_HASHCODE(...) PRIVATE_MAXON_HASHCODE_A(MAXON_VA_NARGS(__VA_ARGS__), __VA_ARGS__) // Changed to #define MAXON_HASHCODE(...) maxon::DefaultCompare::GetCombinedHashCode(__VA_ARGS__) #define MAXON_OPERATOR_EQUALITY_HASHCODE(T, ...) maxon::Bool operator ==(const T& other) const { return (this == &other) || (MAXON_MAKE_LIST(PRIVATE_MAXON_EQUALITY_OPERATORS, , &&, , __VA_ARGS__)); } \ maxon::Bool operator !=(const T& other) const { return !this->operator ==(other); } \ maxon::UInt GetHashCode() const { return PRIVATE_MAXON_HASHCODE_A(MAXON_VA_NARGS(__VA_ARGS__), __VA_ARGS__); } // Changed to #define MAXON_OPERATOR_EQUALITY_HASHCODE(T, ...) maxon::Bool operator ==(const T& other) const { return (this == &other) || (MAXON_MAKE_LIST(PRIVATE_MAXON_EQUALITY_OPERATORS, , &&, , __VA_ARGS__)); } \ maxon::Bool operator !=(const T& other) const { return !this->operator ==(other); } \ maxon::HashInt GetHashCode() const { return MAXON_HASHCODE(__VA_ARGS__); } static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( UInt32 i) // Changed to static MAXON_ATTRIBUTE_FORCE_INLINE HashInt GetHashCode( UInt32 h) static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( UInt64 h) // Changed to static MAXON_ATTRIBUTE_FORCE_INLINE HashInt GetHashCode( UInt64 h) static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( Bool i) // Changed to static MAXON_ATTRIBUTE_FORCE_INLINE HashInt GetHashCode( Bool i) static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( Char i) // Changed to static MAXON_ATTRIBUTE_FORCE_INLINE HashInt GetHashCode( Char i) static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( UChar i) // Changed to static MAXON_ATTRIBUTE_FORCE_INLINE HashInt GetHashCode( UChar i) static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( Int16 i) // Changed to static MAXON_ATTRIBUTE_FORCE_INLINE HashInt GetHashCode( Int16 i) static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( UInt16 i) // Changed to static MAXON_ATTRIBUTE_FORCE_INLINE HashInt GetHashCode( UInt16 i) static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( Int32 h) // Changed to static MAXON_ATTRIBUTE_FORCE_INLINE HashInt GetHashCode( Int32 h) static UInt GetHashCode( Utf16Char i) // Changed to static HashInt GetHashCode( Utf16Char i) static UInt GetHashCode( Utf32Char i) // Changed to static HashInt GetHashCode( Utf32Char i) static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( Int64 h) // Changed to static MAXON_ATTRIBUTE_FORCE_INLINE HashInt GetHashCode( Int64 h) static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( Float32 h) // Changed to static MAXON_ATTRIBUTE_FORCE_INLINE HashInt GetHashCode( Float32 h) static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( Float64 h) // Changed to static MAXON_ATTRIBUTE_FORCE_INLINE HashInt GetHashCode( Float64 h) template < typename T> static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( const T* key) // Changed to template < typename T> static MAXON_ATTRIBUTE_FORCE_INLINE HashInt GetHashCode( const T* key) template < typename T> static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode(T* key) // Changed to template < typename T> static MAXON_ATTRIBUTE_FORCE_INLINE HashInt GetHashCode(T* key) static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode(std::nullptr_t) // Changed to static MAXON_ATTRIBUTE_FORCE_INLINE HashInt GetHashCode(std::nullptr_t) template < typename E> static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( const maxon::details::EnumWrapper<E>& key) // Changed to template < typename E> static MAXON_ATTRIBUTE_FORCE_INLINE HashInt GetHashCode( const maxon::details::EnumWrapper<E>& key) template < typename K> static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( const K& key) // Changed to template < typename K> static MAXON_ATTRIBUTE_FORCE_INLINE HashInt GetHashCode( const K& key) template < typename K> static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCodeHelper( const K& key, OverloadRank0 ) // Changed to template < typename K> static MAXON_ATTRIBUTE_FORCE_INLINE HashInt GetHashCodeHelper( const K& key, OverloadRank0 ) static UInt GetHashCode( const Char * key) // Changed to static constexpr HashInt GetHashCode( const Char * key) template < typename K> static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( const K& key) // Changed to template < typename K> static MAXON_ATTRIBUTE_FORCE_INLINE HashInt GetHashCode( const K& key) template < typename K> static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( const K& key) // Changed to template < typename K> static MAXON_ATTRIBUTE_FORCE_INLINE HashInt GetHashCode( const K& key) template < typename K> static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( const K& key) // Changed to template < typename K> static MAXON_ATTRIBUTE_FORCE_INLINE HashInt GetHashCode( const K& key)maxon/utilities/compilerdetection.h
#define MAXON_OFFSETOF_NON_STANDARD_LAYOUT(T, M) ((size_t)(&((T*) 0)->M)) // Changed to #define MAXON_OFFSETOF_NON_STANDARD_LAYOUT(T, M) ((size_t)(&((T*)nullptr)->M)) #define MAXON_OFFSETOF_NON_STANDARD_LAYOUT(T, M) ((size_t)(&((T*) 0)->M)) // Changed to #define MAXON_OFFSETOF_NON_STANDARD_LAYOUT(T, M) ((size_t)(&((T*)nullptr)->M))maxon/utilities/datadescriptiondefinition_include.h
class RenameList { RenameList( const RenameList* parent = nullptr ) Result< void > Add(const CString& from, const CString& to) Result<InternedId> Rename(const InternedId& original) const } struct IncludeHelper { IncludeHelper() = default ; IncludeHelper( const IncludeHelper& parent) Bool _ignoreExportFlag = false ; RenameList _includeRenameList; HashSet<Id> _includeFilterAttributes; Tuple<Id, InternedId> _includedFromId; InternedId _groupId; Result<void> PrepareInclude( const DataDescriptionEntry & props, const InternedId& groupId, const Tuple<Id, InternedId>& includedFromId, const HashSet<Id>& includeFilterAttributes) Result<Bool> IsFiltered( const InternedId& id ) const Result<void> Rename( const Id& category, const InternedId& id , DataDescriptionEntry & props) const } UInt GetHashCode() const ; // Changed to HashInt GetHashCode() const ; struct DefaultHash { static constexpr UInt32 Mix( UInt32 h) static constexpr UInt64 Mix( UInt64 h) static constexpr HashInt SplitMix( HashInt value) static constexpr HashInt EMPTY_HASH = 0 MAXON_IMPLICIT DefaultHash( HashInt start = EMPTY_HASH) void Combine( HashInt value) void CombineUnordered( HashInt value) operator HashInt () const template <typename... R > static HashInt CombineHashes( HashInt first, R ... rest) } struct FNV1aHash { using ValueType = HashInt ; #ifdef MAXON_TARGET_64BIT static constexpr HashInt PRIME = UINT64_C(1099511628211); static constexpr HashInt BASIS = UINT64_C(14695981039346656037); #else static constexpr HashInt PRIME = UINT32_C(16777619); static constexpr HashInt BASIS = UINT32_C(2166136261); #endif HashInt state = BASIS; void Combine( Char c) void Combine( UChar c) void Combine( Utf16Char c) void Combine( Utf32Char c) operator HashInt () const }maxon/utilities/memoryallocationbase.h
UInt GetHashCode() const // Changed to HashInt GetHashCode() const #define MAXON_API_ABI_VERSION 21014 // Changed to #define MAXON_API_ABI_VERSION 23008// Removed constexpr inline UInt UIntPow( UInt x, Int exp)
// Removed constexpr inline UInt PrivateGetHashCode( const char * str, Int len)
// Removed constexpr inline UInt PrivateGetHashCode( const Utf32Char * str, Int len) using HashInt = UInt ; static const void * const g_zeroPtr = 0; // Changed to static const void * const g_zeroPtr = nullptr ; class UnitType { UInt GetHashCode() const { return 0; } // Changed to HashInt GetHashCode() const { return 0; } } class GenericArithmetic { UInt GetHashCode() const { return 0; } // Changed to HashInt GetHashCode() const { return 0; } } template <> struct HasBaseHelper<Generic, InternedId, 0> : public std::false_type { } template < typename D> struct DefaultHasBase { template < typename I> struct Check { static const maxon::Bool value = std::is_base_of<I, D>::value; static I* Cast (D* ptr) { return ptr; } }; } template < typename DT, typename BT> struct CheckHasBaseHelper { static constexpr Int value = CheckHasBase<DT>::value; }; template < typename T> struct CheckHasBaseHelper<T, T> { static constexpr Int value = 2; }; template < typename D, typename B> struct HasBase { using Helper = maxon::details::HasBaseHelper <DT, BT, STD_IS_REPLACEMENT (same, DT, BT) ? 2 : Int (CheckHasBase<DT>::value)>; // Changed to using Helper = maxon::details::HasBaseHelper<DT, BT, maxon::details::CheckHasBaseHelper<DT, BT>::value >; } template < typename D, typename B> struct HasErasedBase { using Helper = maxon::details::HasBaseHelper <EDT, EBT, STD_IS_REPLACEMENT (same, EDT, EBT) ? 2 : Int (CheckHasBase<EDT>::value)>; // Changed to using Helper = maxon::details::HasBaseHelper<EDT, EBT, maxon::details::CheckHasBaseHelper<EDT, EBT>::value >; } struct HashValue { UInt64 low = 0; UInt64 high = 0; HashValue() = default ; HashValue( UInt64 l, UInt64 h) : low(l), high(h) { } MAXON_OPERATOR_EQUALITY_HASHCODE (HashValue, low, high); }; template < UInt64 MODULE_ID_HASH = PrivateGetHashCode(MAXON_MODULE_ID, SIZEOF (MAXON_MODULE_ID)-1)> struct ModuleInfoWrapper // Changed to template < UInt64 MODULE_ID_HASH = CStringCompare::GetHashCode(MAXON_MODULE_ID)> struct ModuleInfoWrapper enum class VALUEKIND : UInt64 { // Removed NAMED_TUPLE = 1 LL << 22, // Changed to NAMED_TUPLE = 1 LL << 60, STRUCT = 1 LL << 23, // Changed to STRUCT = 1 LL << 22, SIMD = 1 LL << 24, // Changed to SIMD = 1 LL << 23, BLOCK = 1 LL << 25, // Changed to BLOCK = 1 LL << 24, STRIDED_BLOCK = 1 LL << 26, // Changed to STRIDED_BLOCK = 1 LL << 25, ARRAY = 1 LL << 27, // Changed to ARRAY = 16 LL << 55, BASEARRAY = 1 LL << 28, // Changed to BASEARRAY = 1 LL << 26, BLOCKARRAY = 1 LL << 29, // Changed to BLOCKARRAY = 1 LL << 27, RESULT = 1 LL << 30, // Changed to RESULT = 1 LL << 28, DELEGATE = 1 LL << 31, // Changed to DELEGATE = 1 LL << 29, FUNCTION = 1 LL << 32, // Changed to FUNCTION = 1 LL << 30, CONST_QUALIFIED = 1 LL << 33, // Changed to CONST_QUALIFIED = 1 LL << 31, OPAQUE_QUALIFIED = 1 LL << 34, // Changed to OPAQUE_QUALIFIED = 1 LL << 32, SOURCE_LEVEL = 1 LL << 35, // Changed to SOURCE_LEVEL = 1 LL << 33, DEEP_CONSTNESS = 1 LL << 36, // Changed to DEEP_CONSTNESS = 1 LL << 34, INT_SIZE_OR_LESS = 1 LL << 37, // Changed to INT_SIZE_OR_LESS = 1 LL << 35, ZERO_INITIALIZED = 1 LL << 38, // Changed to ZERO_INITIALIZED = 1 LL << 36, ORDERED = 1 LL << 39, // Changed to ORDERED = 1 LL << 37, TRIVIALLY_CONSTRUCTIBLE = 1 LL << 40, // Changed to TRIVIALLY_CONSTRUCTIBLE = 1 LL << 38, TRIVIALLY_DESTRUCTIBLE = 1 LL << 41, // Changed to TRIVIALLY_DESTRUCTIBLE = 1 LL << 39, TRIVIALLY_COPYABLE = 1 LL << 42, // Changed to TRIVIALLY_COPYABLE = 1 LL << 40, TRIVIALLY_EQUATABLE = 1 LL << 43, // Changed to TRIVIALLY_EQUATABLE = 1 LL << 41, OBJECT_REF = 1 LL << 44, // Changed to OBJECT_REF = 1 LL << 42, VALUE = 1 LL << 45, // Changed to VALUE = 1 LL << 43, ELEMENT_TYPE_AS_ARG = 1 LL << 46, // Changed to ELEMENT_TYPE_AS_ARG = 1 LL << 44, NEVER_NULLPTR = 1 LL << 47, // Changed to NEVER_NULLPTR = 1 LL << 45, SIGNED = 1 LL << 48, // Changed to SIGNED = 1 LL << 46, GENERIC_INSTANTIATION = 1 LL << 49, // Changed to GENERIC_INSTANTIATION = 1 LL << 47, GLOBALLY_REFERENCED = 1 LL << 50, // Changed to GLOBALLY_REFERENCED = 1 LL << 48, ABSTRACT = 1 LL << 49, // Changed to ABSTRACT = 1 LL << 51, CONTAINER = 1 LL << 54, // Changed to CONTAINER = 1 LL << 55, EMPTY_CONTAINER = 2 LL << 54, // Changed to EMPTY_CONTAINER = 2 LL << 55, SINGLETON_CONTAINER = 3 LL << 54, // Changed to SINGLETON_CONTAINER = 3 LL << 55, STATIC_ARRAY_CONTAINER = 4 LL << 54, // Changed to STATIC_ARRAY_CONTAINER = 4 LL << 55, ARRAY_CONTAINER = 5 LL << 54, // Changed to ARRAY_CONTAINER = 5 LL << 55, CONTAINER_MASK = 15 LL << 54, // Changed to CONTAINER_MASK = 31 LL << 55, CONTAINER_REF = 1 LL << 58, // Changed to CONTAINER_REF = 1 LL << 51, GENERIC_CONTAINER = 1 LL << 52, // Changed to GENERIC_CONTAINER = 1 LL << 59, RECURSIVE_CONTAINER = 1 LL << 53, // Changed to RECURSIVE_CONTAINER = 1 LL << 60, NAMED = 1 LL << 50, RESOLVED_RECURSIVE_CONTAINER = 1 LL << 54, TUPLE_INHERIT_MASK = ZERO_INITIALIZED | TRIVIALLY_CONSTRUCTIBLE | TRIVIALLY_DESTRUCTIBLE | TRIVIALLY_COPYABLE | TRIVIALLY_EQUATABLE | ORDERED | VALUE , // Changed to TUPLE_INHERIT_MASK = ZERO_INITIALIZED | TRIVIALLY_CONSTRUCTIBLE | TRIVIALLY_DESTRUCTIBLE | TRIVIALLY_COPYABLE | TRIVIALLY_EQUATABLE | ORDERED | VALUE | NAMED , }
namespace APPLICATIONID { // Removed static const LiteralId PYTHON3{ "net.maxon.application.python3" }; static const LiteralId DRAWPORT_UNITTESTS { "net.maxon.application.drawport_unittests" }; } class PersistentIdGeneratorInterface { MAXON_INTERFACE_SIMPLE_VIRTUAL (PersistentIdGeneratorInterface, MAXON_REFERENCE_COPY_ON_WRITE ) public : MAXON_METHOD Result<void> InitializeBuffer( PersistentIdBuffer & buffer) const MAXON_METHOD void FreeBuffer( PersistentIdBuffer & buffer) const MAXON_METHOD Result<void> Move ( Int index, PersistentIdBuffer & buffer) const MAXON_METHOD Result<void> Advance( Int index, PersistentIdBuffer & buffer) const } template < typename TYPE> class StaticArrayInterface // Changed to template <typename TYPE > class StaticArrayInterface : public GenericContainerInterface MAXON_GENERIC_BASE (NamedTuple<TYPE>) template <typename TYPE> class StaticArrayInterface : public GenericContainerInterface MAXON_GENERIC_BASE (NamedTuple<TYPE>) { template < typename T> MAXON_FUNCTION ResultMem Set( Int index, T&& value) // changed to template < typename A> MAXON_FUNCTION ResultMem Set( Int index, A&& value)// Removed MAXON_METHOD Result<Int> GetWritableBlock( Int index, SimdBlock<TYPE>& block);
// Removed MAXON_METHOD Result<StaticArrayInterface*> MakeWritable( Bool cloneElements = true ) const ; MAXON_METHOD Result<Int> GetBlock( Int index, SimdBlock<NonConstValueType>& block); Int GetBlock( Int index, StridedBlock<NonConstValueType>& block); MAXON_METHOD const PersistentIdGenerator& GetPersistentIdGenerator() const ;
// Removed MAXON_METHOD String ToString ( const FormatStatement* formatStatement) const ;
// Removed MAXON_METHOD Bool IsEqual ( const StaticArrayInterface* other, EQUALITY equality) const ;
// Removed MAXON_METHOD UInt GetHashCode() const ; template < typename COLLECTION_TYPE> class IteratorTemplate { explicit IteratorTemplate(CollectionType& a) : _array(&a) explicit IteratorTemplate(CollectionType& a, Int start = 0) : _array(&a) // Changed to explicit IteratorTemplate(CollectionType& a, Int start) : _array(&a) IteratorTemplate() : _indexPtr(nullptr) // Changed to IteratorTemplate() : _index( LIMIT < Int >:: MIN ) } MAXON_FUNCTION ConstIterator Begin() const // Changed to MAXON_FUNCTION typename StaticArrayInterface< TYPE >::ConstIterator Begin() const MAXON_FUNCTION ConstIterator End() const // Changed to MAXON_FUNCTION typename StaticArrayInterface< TYPE >::ConstIterator End() const
// Removed using StaticArrayInterfaceMarker = void; }
// Removed template < typename T> struct StrongCOWRefHandler::MakeWritableHelper<T, typename T::StaticArrayInterfaceMarker>
// Removed template <typename TYPE> class VArrayInterface : public StaticArrayInterface<TYPE> template <typename TYPE> class ArrayInterface : public ArrayBase0<ArrayInterface<TYPE>, TYPE, VArrayInterface<TYPE>, DefaultCompare> // Changed to template <typename TYPE> class ArrayInterface : public ArrayBase0<ArrayInterface<TYPE>, TYPE, StaticArrayInterface<TYPE>, DefaultCompare> template <typename TYPE> class ArrayInterface : public ArrayBase0<ArrayInterface<TYPE>, TYPE, StaticArrayInterface<TYPE>, DefaultCompare> { // Removed using Super::CopyFrom; MAXON_METHOD Int GetBlock( Int index, Block<const TYPE, false>& block) const ; // Changed to MAXON_METHOD Int GetBlock( Int index, Block<const TYPE>& block) const ; Int GetBlock( Int index, Block<TYPE, false>& block) // Changed to Int GetBlock( Int index, Block<typename Super::NonConstValueType>& block);
// Removed Int GetBlock( Int index, StridedBlock<const TYPE>& block) const
// Removed Int GetBlock( Int index, StridedBlock<TYPE>& block) MAXON_METHOD ResultMem Resize( Int count, COLLECTION_RESIZE_FLAGS resizeFlags = COLLECTION_RESIZE_FLAGS::DEFAULT ); MAXON_METHOD ResultMem SetCapacityHint( Int requestedCapacity, COLLECTION_RESIZE_FLAGS resizeFlags = COLLECTION_RESIZE_FLAGS::ON_GROW_RESERVE_CAPACITY ); MAXON_METHOD ResultRef<TYPE> Insert( Int index); MAXON_FUNCTION ResultRef<TYPE> Insert( Int index, const TYPE & value) MAXON_FUNCTION ResultRef<TYPE> Insert( Int index, TYPE && value) MAXON_METHOD ResultMem Insert( Int index, const Block<const TYPE>& values); MAXON_METHOD ResultMem Insert( Int index, const MoveBlock<TYPE>& values); MAXON_METHOD ResultRef<TYPE> Append(); MAXON_FUNCTION ResultRef<TYPE> Append( const TYPE & value) MAXON_FUNCTION ResultRef<TYPE> Append( TYPE && value) template < typename A> MAXON_FUNCTION ResultRef<TYPE> Append(A&& value) MAXON_FUNCTION Bool Pop() MAXON_FUNCTION Bool Pop( TYPE * dst) MAXON_METHOD ResultMem Erase( Int index, Int count = 1); template <typename C> typename ArrayInterface::template IteratorTemplate<C> Erase(const typename ArrayInterface::template IteratorTemplate<C>& it) MAXON_METHOD ResultMem SwapErase( Int index, Int count = 1); MAXON_METHOD void 重置 (); MAXON_METHOD void Flush(); MAXON_METHOD Result< void > CopyFrom(const ArrayInterface& other); MAXON_METHOD void SetPersistentIdGenerator(const PersistentIdGenerator& generator); template <typename T> MAXON_FUNCTION void AssertType() const // Changed to template <typename DT> MAXON_FUNCTION void AssertType() const template <typename T> ArrayInterface<T>& AssertCast () // Changed to template <typename T2> ArrayInterface<T2>& AssertCast () template <typename T> const ArrayInterface<T>& AssertCast () const // Changed to template <typename T2> const ArrayInterface<T2>& AssertCast () const MAXON_FUNCTION ConstIterator Begin() const // Changed to MAXON_FUNCTION typename ArrayInterface< TYPE >::ConstIterator Begin() const MAXON_FUNCTION ConstIterator End() const // Changed to MAXON_FUNCTION typename ArrayInterface< TYPE >::ConstIterator End() const } inline void FreeArrayIteratorPersistentId ( PersistentIdBuffer * idBuffer, const PersistentIdGeneratorInterface* ig) inline Result< void > MoveArrayIteratorPersistentId ( Int index, PersistentIdBuffer * idBuffer, const PersistentIdGeneratorInterface* ig) template < Bool RANDOM_ACCESS, Bool LOAD_ELEMENTS, typename ARRAY > inline Result< Int > ValidateArrayIterator (const ARRAY & array, Int index, ViewIteratorMember* members, const MemberMap* map, Int * state, PersistentIdBuffer * idBuffer, const PersistentIdGeneratorInterface* ig) inline Result< void > InitArrayIteratorPersistentId ( PersistentIdBuffer * idBuffer, const PersistentIdGeneratorInterface* ig) template <typename ARRAY > inline Result< Int > InitArrayIterator (const ARRAY & array, ViewIteratorMember* members, const MemberMap* map, Int * state, PersistentIdBuffer * idBuffer, const PersistentIdGeneratorInterface* ig) inline Result< void > AdvanceArrayIteratorPersistentId ( Int index, PersistentIdBuffer & idBuffer, const PersistentIdGeneratorInterface* ig) template <typename ARRAY > class ArrayImpl { const ContainerDataType<>& GetContainerType() const GenericContainerInterface::INTERFACES GetInterfaces() const Int FindMemberIndex(const InternedId& name) const Int GetIteratorStateSize(const MemberMap* map) const Result< Int > InitIterator(ViewIteratorMember* members, const MemberMap* map, Char * state, PersistentIdBuffer * idBuffer) const Result< Int > ValidateIterator( Int index, ViewIteratorMember* members, const MemberMap* map, Char * state, PersistentIdBuffer * idBuffer) const void FreeIterator(ViewIteratorMember* members, const MemberMap* map, Char * state, PersistentIdBuffer * idBuffer) const Result< Int > MoveIterator( Int index, ViewIteratorMember* members, const MemberMap* map, Char * state, PersistentIdBuffer * idBuffer) const Result< void > AdvancePersistentId( Int index, const Char * state, PersistentIdBuffer & idBuffer) const const PersistentIdGenerator& GetPersistentIdGenerator() const void SetPersistentIdGenerator(const PersistentIdGenerator& generator)
// Removed Result< Int > GetWritableBlock( Int index, SimdBlock<ValueType>& block) Result< Int > GetBlock( Int index, SimdBlock<NonConstValueType>& block) Int GetBlock( Int index, Block<const ValueType, false>& block) const // Changed to Int GetBlock( Int index, Block<const ValueType>& block) const Int GetBlock( Int index, Block<NonConstValueType>& block) Result< void > CopyFrom(const VArrayInterface<ValueType>& other) // Changed to Result< void > CopyFrom(const ArrayInterface<ValueType>& other) Result<Interface*> MakeWritable( Bool cloneElements) const // Changed to Result<GenericContainerInterface*> MakeWritable( Bool cloneElements) const Result<GenericContainerInterface*> Clone( Bool cloneElements) const Bool IsEqual (const StaticArrayInterface<ValueType>* other, EQUALITY equality) const // Changed to Bool IsEqual (const GenericContainerInterface* o, EQUALITY equality) const UInt GetHashCode() const // Changed to HashInt GetHashCode() const HashValue GetHashValue() const template <typename T> inline typename std ::enable_if<GetCollectionKind<T>::value == COLLECTION_KIND :: ARRAY , Result< void >>::type Data::SetImpl(T&& data, OverloadRank1 ) // Changed to template <typename DEST, typename SRC> inline typename std ::enable_if<GetCollectionKind<SRC>::value == COLLECTION_KIND :: ARRAY , Result< void >>::type Data::SetImpl(SRC&& data, OverloadRank1 ) }
template < typename ARRAY, typename ENTRY, typename COMPARE> class ArrayMapSortedArray : public SortedArray<ArrayMapSortedArray<ARRAY, ENTRY, COMPARE>, typename ARRAY::template Type<ENTRY>> { static UInt GetHashCode( const ENTRY& a) { return COMPARE::GetHashCode(a); } // Changed to static HashInt GetHashCode( const ENTRY& a) { return COMPARE::GetHashCode(a); } } template < typename ALLOCATOR = DefaultAllocator> class BaseBitSet { UInt GetHashCode() const // Changed to HashInt GetHashCode() const } template < typename T> StrongReferenceCounter& PrivateGetReferenceCounter ( const T* obj); // Changed to inline StrongReferenceCounter& PrivateGetReferenceCounter ( const void * obj); template < typename T> void PrivateFreeWithDestructor ( const T* obj); // Changed to template < typename T> inline void PrivateFreeWithDestructor ( const T* obj); template < typename T, typename HANDLER> class BaseRef { const T& operator []( Int ) const = delete ; UInt GetHashCode() const // Changed to HashInt GetHashCode() const static const BaseRef& NullValue () // Changed to static const BaseRef& NullValueRef() static typename std ::conditional< Bool (HANDLER::KIND & VALUEKIND :: UNIQUE_REFERENCE ), BaseRef, const BaseRef&>::type NullValue () } template < typename COLLECTION, Bool STRIDED> class BaseIterator { template < typename SUPER> class ResultFunctions : public SUPER { Bool operator != ( const Result<BaseIterator>& other) const void operator ++ () Result<BaseIterator::ValueType&> operator *() } } const Bool MAXON_CONCAT (V,DefaultValue) // Changed to const maxon::Bool MAXON_CONCAT (V,DefaultValue) Bool V = false ; //Changed to maxon::Bool V = false ; class BytesValue { UInt GetHashCode() const // Changed to HashInt GetHashCode() const } template < typename COLLECTION, typename VALUETYPE, typename SUPER, typename HASH> class ArrayBase0 : public Collection<COLLECTION, VALUETYPE, SUPER> { UInt GetHashCode() const // Changed to HashInt GetHashCode() const } template <typename COLLECTION, typename VALUETYPE, typename SUPER, typename HASH> class SetBase0 : public Collection<COLLECTION, VALUETYPE, SUPER> { UInt GetHashCode() const // Changed to HashInt GetHashCode() const } template <typename COLLECTION, typename KEYTYPE, typename VALUETYPE, typename SUPER, typename HASH> class MapBase0 : public BaseCollection<COLLECTION, SUPER> { UInt GetHashCode() const // Changed to HashInt GetHashCode() const } class 配置 { // Removed static MAXON_METHOD void DeprecatedQueryBool( const String & key, Bool & result, CONFIGURATIONENTRY_ORIGIN & origin, CONFIGURATIONENTRY_STATE & state);// Removed static MAXON_METHOD void DeprecatedQueryInt( const String & key, Int & result, CONFIGURATIONENTRY_ORIGIN & origin, CONFIGURATIONENTRY_STATE & state);
// Removed static MAXON_METHOD void DeprecatedQueryFloat( const String & key, Float & result, CONFIGURATIONENTRY_ORIGIN & origin, CONFIGURATIONENTRY_STATE & state);
// Removed static MAXON_METHOD void DeprecatedQueryString( const String & key, String & result, CONFIGURATIONENTRY_ORIGIN & origin, CONFIGURATIONENTRY_STATE & state); }
class GenericContainerInterface { enum class INTERFACES { NONE = 0, SINGLETON_CONTAINER = 1, ARRAY_CONTAINER = 2, XFORM_CONTAINER = 4, CONCAT_CONTAINER = 8, STATIC_ARRAY = 16, V_ARRAY = 32, ARRAY = 64, SINGLE_VALUE_ARRAY = 128 } MAXON_ENUM_FLAGS_CLASS (INTERFACES); MAXON_METHOD const ContainerDataType<>& GetContainerType() const ; MAXON_METHOD INTERFACES GetInterfaces() const ; MAXON_METHOD Result<GenericContainerInterface*> MakeWritable( Bool cloneElements = true ) const ; MAXON_METHOD Result<GenericContainerInterface*> Clone( Bool cloneElements = true ) const ; MAXON_METHOD String ToString ( const FormatStatement* formatStatement) const ; MAXON_METHOD HashInt GetHashCode() const ; MAXON_METHOD HashValue GetHashValue() const ; MAXON_METHOD Bool IsEqual ( const GenericContainerInterface* other, EQUALITY equality) const ; MAXON_METHOD Int FindMemberIndex( const InternedId& name) const ; MAXON_FUNCTION Int FindMemberIndex( const Member& member) const ; MAXON_METHOD Result<Int> GetCount () const ; MAXON_METHOD Int GetIteratorStateSize( const MemberMap* map) const ; MAXON_METHOD Result<Int> InitIterator(ViewIteratorMember* members, const MemberMap* map, Char * state, PersistentIdBuffer * idBuffer) const ; MAXON_METHOD Result<Int> ValidateIterator( Int index, ViewIteratorMember* members, const MemberMap* map, Char * state, PersistentIdBuffer * idBuffer) const ; MAXON_METHOD void FreeIterator(ViewIteratorMember* members, const MemberMap* map, Char * state, PersistentIdBuffer * idBuffer) const ; MAXON_METHOD Result<Int> MoveIterator( Int index, ViewIteratorMember* members, const MemberMap* map, Char * state, PersistentIdBuffer * idBuffer) const ; MAXON_METHOD Result<void> AdvancePersistentId( Int index, const Char * state, PersistentIdBuffer & idBuffer) const ; }; template < typename K, typename V, typename MAP = BurstTrieMapSelector<>> class ContiguousRangeMap { UInt GetHashCode() const // Changed to HashInt GetHashCode() const } class DataDescriptionInterface { MAXON_METHOD UInt GetHashCode() const ; // Changed to MAXON_METHOD HashInt GetHashCode() const ; } using VariadicIdsType = BaseArray<VariadicIdsElement>; // Changed to using VariadicIdsType = Array<VariadicIdsElement>; namespace DESCRIPTION { namespace BASE { MAXON_ATTRIBUTE ( Int , DBVERSION , "net.maxon.description.base.dbversion" ); MAXON_ATTRIBUTE ( Bool , LIMITVALUE, "net.maxon.description.data.base.limitvalue" ); // Changed to MAXON_ATTRIBUTE (Id, LIMITVALUE, "net.maxon.description.data.base.limitvalue" , RESOURCE_DEFINE (ENUM_NONE, Id( "none" )) RESOURCE_DEFINE (ENUM_MIN, Id( "min" )) RESOURCE_DEFINE (ENUM_MAX, Id( "max" )) RESOURCE_DEFINE (ENUM_BOTH, Id( "both" ))); MAXON_ATTRIBUTE (BaseArray<maxon::Id>, INCLUDERENAME, "net.maxon.description.data.base.includerename" ); // Changed to MAXON_ATTRIBUTE (Array<Id>, INCLUDERENAME, "net.maxon.description.data.base.includerename" ); MAXON_ATTRIBUTE (BaseArray<maxon::Id>, INCLUDEFILTER, "net.maxon.description.data.base.includefilter" ); // Changed to MAXON_ATTRIBUTE (Array<Id>, INCLUDEFILTER, "net.maxon.description.data.base.includefilter" ); MAXON_ATTRIBUTE (MAXON_MACROARG_TYPE(BaseArray< maxon::Tuple<maxon::Id, maxon::Data> >), ENUM , "net.maxon.description.data.base.enum" ); // Changed to MAXON_ATTRIBUTE (MAXON_MACROARG_TYPE(Array<Tuple<Id, Data>>), ENUM , "net.maxon.description.data.base.enum" ); MAXON_ATTRIBUTE (BaseArray<maxon::Id>, VARIADICCOMMANDS, "net.maxon.description.data.base.variadiccommands" ); // Changed to MAXON_ATTRIBUTE (Array<Id>, VARIADICCOMMANDS, "net.maxon.description.data.base.variadiccommands" ); MAXON_ATTRIBUTE ( String , WARNINGS, "net.maxon.description.data.base.warnings" ); MAXON_ATTRIBUTE (MAXON_MACROARG_TYPE(Tuple<maxon::Id, maxon::InternedId>), INCLUDEDFROM, "net.maxon.description.data.base.includedfrom" ); // Changed to MAXON_ATTRIBUTE (MAXON_MACROARG_TYPE(Tuple<Id, InternedId>), INCLUDEDFROM, "net.maxon.description.data.base.includedfrom" ); MAXON_ATTRIBUTE ( Group , GROUPINFO, "net.maxon.description.data.base.groupinfo" ); } namespace INFO { // Removed RESOURCE_DEFINE (ENUM_TYPE, Id( "type" )) // Removed RESOURCE_DEFINE (ENUM_STRUCT, Id("struct")) // Removed RESOURCE_DEFINE (ENUM_GLOBAL, Id("global"))); RESOURCE_DEFINE (ENUM_ATTRIBUTE, Id("attribute")));// Removed MAXON_ATTRIBUTE ( Int , ICON, "net. maxon .description.data.info.icon"); MAXON_ATTRIBUTE ( Bool , DYNAMICBUNDLE, "net. maxon .description.data.info.dynamicbundle"); } }
namespace DESCRIPTION { namespace UI { namespace BASE { MAXON_ATTRIBUTE (Id, DEFAULTCLASSIFICATION, "net.maxon.description.ui.base.defaultclassification" , RESOURCE_DEFINE (ENUM_NONE, Id( "none" )) RESOURCE_DEFINE (ENUM_INPUT, Id( "input" )) RESOURCE_DEFINE (ENUM_OUTPUT, Id( "output" ))); MAXON_ATTRIBUTE (BaseArray<maxon::Id>, BASELINK_ACCEPT, "net.maxon.description.ui.base.baselink.accept" ); // Changed to MAXON_ATTRIBUTE (Array<Id>, BASELINK_ACCEPT, "net.maxon.description.ui.base.baselink.accept" ); MAXON_ATTRIBUTE (MAXON_MACROARG_TYPE(BaseArray< maxon::Tuple<maxon::InternedId, maxon::InternedId> >), PRESETMEMBERS, "net.maxon.description.ui.base.presetmembers" ); // Changed to MAXON_ATTRIBUTE (MAXON_MACROARG_TYPE(Array<Tuple<InternedId, InternedId>>), PRESETMEMBERS, "net.maxon.description.ui.base.presetmembers" ); MAXON_ATTRIBUTE (BaseArray<maxon::Id>, ENUM , "net.maxon.description.ui.base.enum" ); // Changed to MAXON_ATTRIBUTE (Array<Id>, ENUM , "net.maxon.description.ui.base.enum" ); } } }maxon/datadescriptiondatabase.h
static MAXON_METHOD Result<BaseArray<Tuple<Id, Data, String>>> GetEffectiveEnumList( const DataDictionary& dataEntry, const DataDictionary& guiEntry, const DataDescription& stringDescription, Bool resolveExtensionPointsAndGui, const AssetRepositoryRef& repository); // Changed to static MAXON_METHOD Result<BaseArray<Tuple<Id, Data, String>>> GetEffectiveEnumList( const DataDictionary& dataEntry, const DataDictionary& guiEntry, const DataDescription& stringDescription, Bool resolveExtensionPointsAndGui, const AssetRepositoryRef& repository, const Data* filterData); using ProcessEnumListDelegate = Delegate<Result<void>( const Id& epId, const DataDictionary& guiEntry, const AssetRepositoryRef& repository, const ValueReceiver <Tuple<Id, Data, String>&&>& addValue)>; // Changed to using ProcessEnumListDelegate = Delegate<Result<void>( const Id& epId, const DataDictionary& guiEntry, const AssetRepositoryRef& repository, const Data* filterData, const ValueReceiver <Tuple<Id, Data, String>&&>& addValue)>; inline Bool UseFilterData ( const Data* filterData, const Data& compare)maxon/datadescriptiondefinition_conversion.h
enum class DBVERSION { S22 = 1, R23_CONVERTLIMIT , R23_CONVERTENUM , R23_CONVERTENUM2 , R23_DBVERSIONIDTYPE , CURRENT , } MAXON_ENUM_ORDERED_LIST ( DBVERSION );maxon/datadescriptiondefinitiondatabase.h
enum class DBVERSION ; class DataDescriptionDefinitionDatabaseInterface { static MAXON_METHOD Result<void> FixDatabaseProps( DBVERSION version, DataDictionary& entry); } class DataDictionaryInterface { template < typename KEY> MAXON_FUNCTION Bool Existing( KEY && key) const // Changed to template < typename KEY> MAXON_FUNCTION Bool Contains ( KEY && key) const MAXON_METHOD UInt GetHashCode() const ; // Changed to MAXON_METHOD HashInt GetHashCode() const ; MAXON_FUNCTION Result<typename std::conditional<IsFidClass<KEY>::value, typename IsFidClass<KEY>::type, T>::type> Get ( KEY && key) const // Changed to MAXON_FUNCTION Result<typename std::conditional<std::is_void<T>::value, typename IsFidClass<KEY>::type, T>::type> Get ( KEY && key) const MAXON_FUNCTION typename std::conditional<IsFidClass<KEY>::value, typename IsFidClass<KEY>::type, T>::type Get ( KEY && key, const T& defaultValue) const // Changed to MAXON_FUNCTION typename std::conditional<IsFidClass<KEY>::value&& GetCollectionKind<T>::value != COLLECTION_KIND::ARRAY , typename IsFidClass<KEY>::type, T>::type Get ( KEY && key, const T& defaultValue) const MAXON_FUNCTION typename std::conditional<IsFidClass<KEY>::value, typename IsFidClass<KEY>::type, T>::type Get ( KEY && key, T&& defaultValue) const // Changed to MAXON_FUNCTION typename std::conditional<IsFidClass<KEY>::value&& GetCollectionKind<T>::value != COLLECTION_KIND::ARRAY , typename IsFidClass<KEY>::type, T>::type Get ( KEY && key, T&& defaultValue) const MAXON_FUNCTION typename IsFidClass<KEY>::type GetOrDefault( KEY && key) const ; // Changed to MAXON_FUNCTION typename std::conditional<std::is_void<T>::value, typename IsFidClass<KEY>::type, T>::type GetOrDefault( KEY && key) const ; } static Result<typename IsFidClass<ATTRIBUTETYPE>::type> GetDataDescriptionValue2 (ATTRIBUTETYPE&& attribute, const ConstDataPtr& key) // Changed to static Result<TT> GetDataDescriptionValue2 (ATTRIBUTETYPE&& attribute, const ConstDataPtr& key) template < typename KEY> inline typename IsFidClass<KEY>::type GetDefaultFromFidIfAvailable ( KEY && key, OverloadRank0 ) // Changed to template < typename TT, typename KEY> inline TT GetDefaultFromFidIfAvailable ( KEY && key, OverloadRank0 ) inline typename SFINAEHelper<typename IsFidClass<KEY>::type, decltype( std::remove_reference<KEY>::type::DEFAULTVALUE )>::type // Changed to inline typename SFINAEHelper<TT, decltype( std::remove_reference<KEY>::type::DEFAULTVALUE )>::type template < typename KEY> typename IsFidClass<KEY>::type DataDictionaryInterface::GetOrDefault( KEY && key) const // Changed to template < typename T, typename KEY> typename std::conditional<std::is_void<T>::value, typename IsFidClass<KEY>::type, T>::type DataDictionaryInterface::GetOrDefault( KEY && key) const } class DataDictionaryObjectInterface { template < typename KEY> MAXON_FUNCTION Bool Existing( KEY && key) const // Changed to template < typename KEY> MAXON_FUNCTION Bool Contains ( KEY && key) const MAXON_FUNCTION Result<typename std::conditional<IsFidClass<KEY>::value, typename IsFidClass<KEY>::type, T>::type> Get ( KEY && key) const // Changed to MAXON_FUNCTION Result<typename std::conditional<std::is_void<T>::value, typename IsFidClass<KEY>::type, T>::type> Get ( KEY && key) const MAXON_FUNCTION typename std::conditional<IsFidClass<KEY>::value, typename IsFidClass<KEY>::type, T>::type Get ( KEY && key, const T& defaultValue) const // Changed to MAXON_FUNCTION typename std::conditional<IsFidClass<KEY>::value&& GetCollectionKind<T>::value != COLLECTION_KIND::ARRAY , typename IsFidClass<KEY>::type, T>::type Get ( KEY && key, const T& defaultValue) const MAXON_FUNCTION typename std::conditional<IsFidClass<KEY>::value, typename IsFidClass<KEY>::type, T>::type Get ( KEY && key, T&& defaultValue) const // Changed to MAXON_FUNCTION typename std::conditional<IsFidClass<KEY>::value&& GetCollectionKind<T>::value != COLLECTION_KIND::ARRAY , typename IsFidClass<KEY>::type, T>::type Get ( KEY && key, T&& defaultValue) const template < typename KEY> MAXON_FUNCTION typename IsFidClass<KEY>::type GetOrDefault( KEY && key) const ; // Changed to template < typename T = void , typename KEY> MAXON_FUNCTION typename std::conditional<std::is_void<T>::value, typename IsFidClass<KEY>::type, T>::type GetOrDefault( KEY && key) const ; } template < typename KEY> typename IsFidClass<KEY>::type DataDictionaryObjectInterface::GetOrDefault( KEY && key) const // Changed to template < typename T, typename KEY> typename std::conditional<std::is_void<T>::value, typename IsFidClass<KEY>::type, T>::type DataDictionaryObjectInterface::GetOrDefault( KEY && key) const } struct IDENT_VOID { UInt GetHashCode() const // Changed to HashInt GetHashCode() const } #define CONSTHASH(x) static const maxon::UInt MAXON_CONCAT(x, Hash) = maxon::PrivateGetHashCode(#x, (maxon::Int)sizeof(#x) - 1) // subtract one as sizeof includes the terminating 0C // Changed to #define CONSTHASH(x) static const maxon::UInt MAXON_CONCAT(x, Hash) = maxon::CStringCompare::GetHashCode(#x) #define PRIVATE_MAXON_DATATYPE_REGISTER_ENUM(enumtype, id, size, flags, names, ...) // Changed to #define PRIVATE_MAXON_DATATYPE_REGISTER_ENUM(enumtype, cppname, id, size, flags, names, ...) \ MAXON_DATATYPE_SCALAR (HashValue, "net.maxon.datatype.hash" ); template < typename T> struct MemberTypeBase<T, typename std ::enable_if<STD_IS_REPLACEMENT(base_of, InternedId, T), typename SFINAEHelper<void, typename T::ValueType>::type>::type> // Changed to template <typename T> struct MemberTypeBase<T, typename std::enable_if<maxon::details::HasBaseHelper<T, InternedId, 0>::value, typename SFINAEHelper<void, typename T::ValueType>::type>::type> template <typename T> struct MemberType : public MemberTypeBase<T> // Changed to template <typename T, Bool GENERIC_FOR_UNKNOWN_TYPE = false> struct MemberType : public MemberTypeBase<T> template <typename T> struct MemberType<T&> : public MemberTypeBase<T> // Changed to template <typename T, Bool GENERIC_FOR_UNKNOWN_TYPE> struct MemberType<T&, GENERIC_FOR_UNKNOWN_TYPE> : public MemberTypeBase<T> template <typename T> struct MemberType<T&&> : public MemberTypeBase<T> // Changed to template <typename T, Bool GENERIC_FOR_UNKNOWN_TYPE> struct MemberType<T&&, GENERIC_FOR_UNKNOWN_TYPE> : public MemberTypeBase<T> template <typename T> inline Result<void> Data::SetImpl(T&& data, OverloadRank0) // Changed to template <typename DEST, typename SRC> inline Result<void> Data::SetImpl(SRC&& data, OverloadRank0) template <typename DEST> inline Result<void> Data::SetImpl(Data&& data, OverloadRank1) template <typename DEST> inline Result<void> Data::SetImpl(const Data& data, OverloadRank1) template <typename DEST> inline Result<void> Data::SetImpl(Data& data, OverloadRank1) #define FOLDER_BASIC Id("#$01Basic") #define FOLDER_ADVANCED Id("#$02Advanced") #define FOLDER_STRUCTURE Id("#$03Structure") #define FOLDER_MODULES Id("#$04Modules") enum class DATATYPEBUILDERNAME { HUMAN_READABLE , CODE_CPP , } MAXON_ENUM_LIST ( DATATYPEBUILDERNAME ); class ParametricTypeInterface; struct DataTypeComponent { Int _identifier = -1; String _compName, _name; DataType _type; Id _typeId; Id _parametricTypeId; const ParametricTypeInterface* _additionalRefType = nullptr ; BaseArray<DataTypeComponent> _children; String ToString ( const FormatStatement* formatStatement) const }; class DataTypeBuilderInterface : MAXON_INTERFACE_BASES (Object) { static MAXON_METHOD Result<String> GetDataTypeName( const DataType& dt, DATATYPEBUILDERNAME category); static MAXON_METHOD Result<Tuple<String, Bool>> RecurseDataType( DATATYPEBUILDERNAME category, const Member& dt, const ParametricTypeInterface* parentTypeId, Int & globalIdentifier, BaseArray<DataTypeComponent>& components); }; class DataTypeBuilderEntry { MAXON_DISALLOW_COPY_AND_ASSIGN (DataTypeBuilderEntry); public : Result<void> CopyFrom( const DataTypeBuilderEntry& src ) GetFolderDelegate getFolder; GetDataTypeNameDelegate getName; GetChildrenCountDelegate getChildrenCount; InstantiateDataTypeDelegate instantiateDataType; GetParentTypeSupportDelegate getParentTypeSupport; }; MAXON_DATATYPE (DataTypeBuilderEntry, "net.maxon.datatype.datatypebuilderentry" ); MAXON_REGISTRY (DataTypeBuilderEntry, DataTypeBuilderRegistry, "net.maxon.registry.datatypebuilderregistry" ); #define MAXON_REGISTER_DATATYPEBUILDER_TYPE(TYPE, STRING, HUMAN, FOLDER) class DataTypePtr { UInt GetHashCode() const // Changed to HashInt GetHashCode() const } class DataTypeImpl { template < typename T, typename C> DataTypeImpl( const Id& type, const DataTypeImpl* underlying, const DataTypeImpl* element, const T* dummy1, const C* dummy2, VALUEKIND flags = VALUEKIND::NONE , const NonvirtualInterfaceImplementation* impl = nullptr , VALUEKIND kind = ValueKindHelper<T, GetDirectlyReferencedType<T>::value>::KIND, const ParametricTypeInterface* pt = nullptr ) // Changed to template <typename T, typename C> DataTypeImpl(const Id& type, const DataTypeImpl* underlying, const DataTypeImpl* element, const T* dummy1, const C* dummy2, VALUEKIND flags = VALUEKIND :: NONE , const NonvirtualInterfaceImplementation* impl = nullptr , VALUEKIND kind = ValueKindHelper<T, GetDirectlyReferencedType<T>::value>::KIND, const ParametricTypeInterface* pt = nullptr , const DataTypeImpl* extra = nullptr ) template <typename C> DataTypeImpl(const Id& type, const DataTypeImpl* underlying, const DataTypeImpl* element, Int size, Int alignment , const C* dummy2, VALUEKIND kind, const ParametricTypeInterface* pt = nullptr ) // Changed to template <typename C> DataTypeImpl(const Id& type, const DataTypeImpl* underlying, const DataTypeImpl* element, Int size, Int alignment , const C* dummy2, VALUEKIND kind, const ParametricTypeInterface* pt = nullptr , const DataTypeImpl* extra = nullptr ) void Construct ( void * dest) const void Construct ( void * dest, Int count) const // Changed to void Construct ( void * dest, Int dstride, Int count) const void Destruct (const void * dest) const void Destruct (const void * dest, Int count) const // Changed to void Destruct (const void * dest, Int dstride, Int count) const void MoveConstruct( void * dest, void * src ) const void MoveConstruct( void * dest, void * src , Int count) const // Changed to void MoveConstruct( void * dest, Int dstride, void * src , Int sstride, Int count) const void MoveFrom( void * dest, void * src ) const void MoveFrom( void * dest, void * src , Int count) const // Changed to void MoveFrom( void * dest, Int dstride, void * src , Int sstride, Int count) const Result< void > CopyFrom( void * dest, const void * src , Int count) const // Changed to Result< void > CopyFrom( void * dest, const void * src ) const// Removed Result< Bool > UpdateFrom( void * dest, const void * src ) const Result< void > CopyFrom( void * dest, Int dstride, const void * src , Int sstride, Int count) const UInt GetHashCode(const void * s1) const // Changed to HashInt GetHashCode(const void * s1) const HashValue GetHashValue(const void * s1) const const StrongRef <const DataTypeImpl>& PrivateGetExtraType() const } class DataTypeImpl::Primary { template < typename ... ARGS> explicit Primary(ARGS&&... args) : type( std ::forward<ARGS>(args)...) // Changed to template <typename... ARGS> explicit Primary(const Char * cppName, const ModuleInfo* module, ARGS&&... args) const Char * _cppName = nullptr; const ModuleInfo* _module = nullptr ; } class DataType { UInt GetHashCode() const // Changed to HashInt GetHashCode() const } class Data { friend class DataDictionaryInterface; friend class DataDictionaryObjectInterface; UInt GetHashCode() const // Changed to HashInt GetHashCode() const template <typename DEST, typename SRC> Result< void > SetImpl(SRC&& data, OverloadRank0 ); template <typename DEST> Result< void > SetImpl(const Data& data, OverloadRank1 ); template <typename DEST> Result< void > SetImpl(Data& data, OverloadRank1 ); template <typename T> Result< void > SetImpl(T&& data, OverloadRank0 ); // Changed to template <typename DEST> Result< void > SetImpl(Data&& data, OverloadRank1 ); template <typename T> typename std ::enable_if<GetCollectionKind<T>::value == COLLECTION_KIND :: ARRAY , Result< void >>::type SetImpl(T&& data, OverloadRank1 ); // Changed to template <typename DEST, typename SRC> typename std ::enable_if<GetCollectionKind<SRC>::value == COLLECTION_KIND :: ARRAY , Result< void >>::type SetImpl(SRC&& data, OverloadRank1 ); } class ConstDataPtr { UInt GetHashCode() const // Changed to HashInt GetHashCode() const } class MoveDataPtr { static void Construct ( const DataTypeImpl* type, void * dest, Int count); // Changed to static void Construct ( const DataTypeImpl* type, void * dest, Int dstride, Int count); static void Destruct ( const DataTypeImpl* type, const void * dest, Int count); // Changed to static void Destruct ( const DataTypeImpl* type, const void * dest, Int dstride, Int count); static void MoveConstruct( const DataTypeImpl* type, void * dest, void * src , Int count); // Changed to static void MoveConstruct( const DataTypeImpl* type, void * dest, Int dstride, void * src , Int sstride, Int count); static void MoveFrom( const DataTypeImpl* type, void * dest, void * src , Int count); src ); // Changed to static void MoveFrom( const DataTypeImpl* type, void * dest, Int dstride, void * src , Int sstride, Int count); static Result<void> CopyFrom( const DataTypeImpl* type, void * dest, const void * src , Int count); // Changed to static Result<void> CopyFrom( const DataTypeImpl* type, void * dest, Int dstride, const void * src , Int sstride, Int count);
// Removed static Result<Bool> UpdateFrom( const DataTypeImpl* type, void * dest, const void * src ); static UInt GetHashCode( const DataTypeImpl* type, const void * a); // Changed to static HashInt GetHashCode( const DataTypeImpl* type, const void * a); static HashValue GetHashValue( const DataTypeImpl* type, const void * a); }
template < typename T> class DefaultDataTypeFunctionsBase : public DataTypeReferenceFunctions<T, EmptyClass> { static void Construct ( const DataTypeImpl*, void * dest, Int count) // Changed to static void Construct ( const DataTypeImpl*, void * dest, Int dstride, Int count) static void Destruct ( const DataTypeImpl*, const void * dest, Int count) // Changed to static void Destruct ( const DataTypeImpl*, const void * dest, Int dstride, Int count) static void MoveConstruct( const DataTypeImpl*, void * dest, void * src , Int count) // Changed to static void MoveConstruct( const DataTypeImpl*, void * dest, Int dstride, void * src , Int sstride, Int count) static void MoveFrom( const DataTypeImpl*, void * dest, void * src , Int count) // Changed to static void MoveFrom( const DataTypeImpl*, void * dest, Int dstride, void * src , Int sstride, Int count) static Result<void> CopyFrom( const DataTypeImpl*, void * dest, const void * src , Int count) // Changed to static Result<void> CopyFrom( const DataTypeImpl*, void * dest, Int dstride, const void * src , Int sstride, Int count)// Removed static Result<Bool> UpdateFrom( const DataTypeImpl* type, void * dest, const void * src ) static UInt GetHashCode( const DataTypeImpl*, const void * s1) { return CompareTemplate<true>::GetHashCode(*( const T*)s1); } // Changed to static HashInt GetHashCode( const DataTypeImpl*, const void * s1) { return CompareTemplate<true>::GetHashCode(*( const T*)s1); } static HashValue GetHashValue( const DataTypeImpl*, const void * s1) { return {CompareTemplate<true>::GetHashCode(*( const T*)s1), 0}; } } template < typename T> class InterfaceDataTypeFunctions : public DataTypeReferenceFunctions<T, AbstractDataTypeFunctions> { static UInt GetHashCode( const DataTypeImpl* type, const void * a) // Changed to static HashInt GetHashCode( const DataTypeImpl* type, const void * a) }
class InternedId { UInt GetHashCode() const // Changed to HashInt GetHashCode() const } struct Member { Member() = default ; MAXON_IMPLICIT Member( const DataType& t = DataType::NullValue (), const InternedId& n = InternedId()) : type(t), name(n) // Changed to MAXON_IMPLICIT Member(const DataType& t, const InternedId& n = InternedId()) : type(t), name(n) MAXON_IMPLICIT Member(DataType&& t, InternedId&& n = InternedId()) : type( std ::move(t)), name( std ::move(n)) } struct TypeArguments { UInt GetHashCode() const // Changed to HashInt GetHashCode() const } class DataTypeLib { static MAXON_METHOD Result<const MemberMap*> PrivateGetMemberMap( const DataTypeImpl* containerType, const DataTypeImpl* runtimeType); // Changed to static MAXON_METHOD Result<const MemberMap*> GetMemberMap( const DataTypeImpl* containerType, const DataTypeImpl* runtimeType); } class LocalDateTime { UInt GetHashCode() const // Changed to HashInt GetHashCode() const } class UniversalDateTime { UInt GetHashCode() const // Changed to HashInt GetHashCode() const } // Removed #define MAXON_ERROR_REGISTERX(error, baseclass, id) template < typename C> class AutoIterator : public ForEachIterator<AutoIterator<C>> { template < typename SUPER> using ResultFunctions = ResultIteratorFunctions<SUPER>; } template < typename FILTER, typename I> class FilterForEachIterator : public ForEachIterator<FilterForEachIterator<FILTER, I>> { FilterForEachIterator() = default ; } class GenericBaseArray : private BaseArray<Char> { ResultMem EnsureCapacity( const DataType& elementType, Int requestedCapacity, COLLECTION_RESIZE_FLAGS resizeFlags); // Changed to ResultMem EnsureCapacity( const DataType& elementType, Int requestedCapacity, COLLECTION_RESIZE_FLAGS resizeFlags = COLLECTION_RESIZE_FLAGS::DEFAULT ); ResultMem SetCapacityHint( const DataType& elementType, Int requestedCapacity, COLLECTION_RESIZE_FLAGS resizeFlags) // Changed to ResultMem SetCapacityHint( const DataType& elementType, Int requestedCapacity, COLLECTION_RESIZE_FLAGS resizeFlags = COLLECTION_RESIZE_FLAGS::DEFAULT ) ResultRef<Generic> Append( const DataType& elementType); UInt GetHashCode( const DataType& elementType) const ; // Changed to HashInt GetHashCode( const DataType& elementType) const ; Int GetMemorySize( const DataType& elementType) const } template < typename K, typename V, typename ENTRY, typename ENTRY_HANDLER, HASHMAP_ENTRY_LAYOUT LAYOUT = ENTRY_HANDLER::LAYOUT> class HashMapEntryBase { UInt GetHashCode() const // Changed to HashInt GetHashCode() const } template <typename K, typename V, typename ENTRY, typename ENTRY_HANDLER> class HashMapEntryBase<K, V, ENTRY, ENTRY_HANDLER, HASHMAP_ENTRY_LAYOUT :: KEY_VALUE > { UInt GetHashCode() const // Changed to HashInt GetHashCode() const } template <typename K, typename V, typename ENTRY, typename ENTRY_HANDLER> class HashMapEntryBase<K, V, ENTRY, ENTRY_HANDLER, HASHMAP_ENTRY_LAYOUT :: KEY_HASH_VALUE > { UInt GetHashCode() const // Changed to HashInt GetHashCode() const } template <typename K, typename V, typename ENTRY, typename ENTRY_HANDLER> class HashMapEntryBase<K, V, ENTRY, ENTRY_HANDLER, HASHMAP_ENTRY_LAYOUT :: VALUE_KEY > { UInt GetHashCode() const // Changed to HashInt GetHashCode() const } template <typename K, typename ENTRY, typename ENTRY_HANDLER> class HashMapEntryBase<K, UnitType, ENTRY, ENTRY_HANDLER, HASHMAP_ENTRY_LAYOUT :: KEY_VALUE > { UInt GetHashCode() const // Changed to HashInt GetHashCode() const } template <typename K, typename ENTRY, typename ENTRY_HANDLER> class HashMapEntryBase<K, UnitType, ENTRY, ENTRY_HANDLER, HASHMAP_ENTRY_LAYOUT :: KEY_HASH_VALUE > { UInt GetHashCode() const // Changed to HashInt GetHashCode() const } template <typename K, typename ENTRY, typename ENTRY_HANDLER> class HashMapEntryBase<K, UnitType, ENTRY, ENTRY_HANDLER, HASHMAP_ENTRY_LAYOUT :: VALUE_KEY > { UInt GetHashCode() const // Changed to HashInt GetHashCode() const } template <typename K, typename V, typename HASH = DefaultCompare, typename ENTRY_HANDLER = HashMapKeyValuePair, typename ALLOCATOR = DefaultAllocator, HASHMAP_MODE MODE = HASHMAP_MODE :: DEFAULT , Int INITIAL_CAPACITY = 16, Int LOAD_FACTOR = ( MODE == HASHMAP_MODE :: SYNCHRONIZED ) ? 0 : 10> class HashMap : public MapBase<HashMap<K, V, HASH, ENTRY_HANDLER, ALLOCATOR, MODE , INITIAL_CAPACITY, LOAD_FACTOR>, K, V, EmptyClass, HASH> { template < typename VALUEHASH> class Hash { static UInt GetHashCode( const HashMap& m) // Changed to static HashInt GetHashCode( const HashMap& m) } } template < typename T, typename HASH = DefaultCompare, typename ENTRY_HANDLER = HashMapKeyValuePair, typename ALLOCATOR = DefaultAllocator, HASHMAP_MODE MODE = HASHMAP_MODE::DEFAULT, Int INITIAL_CAPACITY = 16, Int LOAD_FACTOR = (MODE == HASHMAP_MODE::SYNCHRONIZED) ? 0 : 10> class HashSet : public SetBase<HashSet<T, HASH, ENTRY_HANDLER, ALLOCATOR, MODE, INITIAL_CAPACITY, LOAD_FACTOR>, T, Protected<HashMap<T, UnitType, HASH, ENTRY_HANDLER, ALLOCATOR, MODE, INITIAL_CAPACITY, LOAD_FACTOR>>, HASH> { UInt GetHashCode() const // Changed to HashInt GetHashCode() const } class HierarchyObjectInterface : MAXON_INTERFACE_BASES (ObserverObjectInterface) { // Removed MAXON_OBSERVABLE (Result<void>, DeprecatedObservableHierarchyInsert, ( const HierarchyObjectRef<>& sender, const HierarchyObjectRef<>& object ), ObservableCombinerRunAllComponent);// Removed MAXON_OBSERVABLE (Result<void>, DeprecatedObservableHierarchyRemove, ( const HierarchyObjectRef<>& sender, const HierarchyObjectRef<>& object ), ObservableCombinerRunAllComponent); }
class ClassInterface; class ClassInfo; class NonvirtualInterfaceImplementation { template < typename C> NonvirtualInterfaceImplementation(C* dummy, const Char * clsName, const NonvirtualInterfaceReference& ref, NonvirtualInterfaceReference::MTableInitializer init, EntityBase::FLAGS flags, TranslationUnit* unit, const Char * file) // Changed to template < typename C> NonvirtualInterfaceImplementation(C* dummy, const Char * clsName, const Char * cppName, const NonvirtualInterfaceReference& ref, NonvirtualInterfaceReference::MTableInitializer init, EntityBase::FLAGS flags, TranslationUnit* unit, const Char * file) } template < typename SUPER> class RefBaseFunctions : public SUPER { UInt GetHashCode() const // Changed to HashInt GetHashCode() const } #include " maxon/observable.h " class IoConnectionInterface { MAXON_OBSERVABLE_STATIC ( Bool , ObservableErrorOpenFile, ( const Url& url, OPENSTREAMFLAGS flags), ObservableCombinerRunAllBoolUntilFalse); } enum class OPENSTREAMFLAGS { ASK_FOR_REMOVE_WRITE_PROTECTION = (1 << 4), } class JobQueueInterface { MAXON_METHOD void EnableThreadAffinity( UInt ownerId); } #define PRIVATE_MAXON_HASHCODE1(m1) maxon::LegacyHash::GetHashCode(m1) #define PRIVATE_MAXON_HASHCODE2(m1, m2) (PRIVATE_MAXON_HASHCODE1(m1) * 31 + maxon::LegacyHash::GetHashCode(m2)) #define PRIVATE_MAXON_HASHCODE3(m1, m2, m3) (PRIVATE_MAXON_HASHCODE2(m1, m2) * 31 + maxon::LegacyHash::GetHashCode(m3)) #define PRIVATE_MAXON_HASHCODE4(m1, m2, m3, m4) (PRIVATE_MAXON_HASHCODE3(m1, m2, m3) * 31 + maxon::LegacyHash::GetHashCode(m4)) #define PRIVATE_MAXON_HASHCODE5(m1, m2, m3, m4, m5) (PRIVATE_MAXON_HASHCODE4(m1, m2, m3, m4) * 31 + maxon::LegacyHash::GetHashCode(m5)) #define PRIVATE_MAXON_HASHCODE6(m1, m2, m3, m4, m5, m6) (PRIVATE_MAXON_HASHCODE5(m1, m2, m3, m4, m5) * 31 + maxon::LegacyHash::GetHashCode(m6)) #define PRIVATE_MAXON_HASHCODE7(m1, m2, m3, m4, m5, m6, m7) (PRIVATE_MAXON_HASHCODE6(m1, m2, m3, m4, m5, m6) * 31 + maxon::LegacyHash::GetHashCode(m7)) #define PRIVATE_MAXON_HASHCODE8(m1, m2, m3, m4, m5, m6, m7, m8) (PRIVATE_MAXON_HASHCODE7(m1, m2, m3, m4, m5, m6, m7) * 31 + maxon::LegacyHash::GetHashCode(m8)) #define PRIVATE_MAXON_HASHCODE9(m1, m2, m3, m4, m5, m6, m7, m8, m9) (PRIVATE_MAXON_HASHCODE8(m1, m2, m3, m4, m5, m6, m7, m8) * 31 + maxon::LegacyHash::GetHashCode(m9)) #define PRIVATE_MAXON_HASHCODE10(m1, m2, m3, m4, m5, m6, m7, m8, m9, m10) (PRIVATE_MAXON_HASHCODE9(m1, m2, m3, m4, m5, m6, m7, m8, m9) * 31 + maxon::LegacyHash::GetHashCode(m10)) #define PRIVATE_MAXON_HASHCODE11(m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11) (PRIVATE_MAXON_HASHCODE10(m1, m2, m3, m4, m5, m6, m7, m8, m9, m10) * 31 + maxon::LegacyHash::GetHashCode(m11)) #define PRIVATE_MAXON_HASHCODE12(m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11, m12) (PRIVATE_MAXON_HASHCODE11(m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11) * 31 + maxon::LegacyHash::GetHashCode(m12)) #define PRIVATE_MAXON_HASHCODE13(m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11, m12, m13) (PRIVATE_MAXON_HASHCODE12(m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11, m12) * 31 + maxon::LegacyHash::GetHashCode(m13)) #define PRIVATE_MAXON_HASHCODE14(m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11, m12, m13, m14) (PRIVATE_MAXON_HASHCODE13(m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11, m12, m13) * 31 + maxon::LegacyHash::GetHashCode(m14)) #define PRIVATE_MAXON_HASHCODE15(m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11, m12, m13, m14, m15) (PRIVATE_MAXON_HASHCODE14(m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11, m12, m13, m14) * 31 + maxon::LegacyHash::GetHashCode(m15)) #define PRIVATE_MAXON_HASHCODE_C(count, ...) MAXON_EXPAND(PRIVATE_MAXON_HASHCODE##count(__VA_ARGS__)) #define PRIVATE_MAXON_HASHCODE_B(count, ...) PRIVATE_MAXON_HASHCODE_C(count, __VA_ARGS__) #define PRIVATE_MAXON_HASHCODE_A(count, ...) PRIVATE_MAXON_HASHCODE_B(count, __VA_ARGS__) #define MAXON_HASHCODE_LEGACY(...) PRIVATE_MAXON_HASHCODE_A(MAXON_VA_NARGS(__VA_ARGS__), __VA_ARGS__) struct LegacyHash : public DefaultCompare { #ifdef MAXON_TARGET_64BIT static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( UInt32 i) static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( UInt64 h) #else static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( UInt32 h) static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( UInt64 h) #endif static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( Bool i) static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( Char i) static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( UChar i) static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( Int16 i) static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( UInt16 i) static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( Int32 h) static UInt GetHashCode( Utf16Char i) static UInt GetHashCode( Utf32Char i) static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( Int64 h) static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( Float32 h) static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( Float64 h) template < typename T> static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( const T* key) template < typename T> static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode(T* key) static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode(std::nullptr_t) static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( const Tuple<Int, Int>& tuple) }; #define MATH_SQUAREMATRIX SqrMat3<Vec3<FLOAT>> template < typename FLOAT> MATH_SQUAREMATRIX VectorToSquareMatrix ( const MATH_VECTOR & dirVector, const MATH_VECTOR & upVector); template < typename FLOAT> MATH_SQUAREMATRIX CheckedVectorToSquareMatrix ( const MATH_VECTOR & dirVector, const MATH_VECTOR & upVector); template < typename FLOAT> MATH_MATRIX VectorToMatrix ( const MATH_VECTOR & dirVector, const MATH_VECTOR & upVector); #define MATH_SQUAREMATRIX2 SqrMat2<Vec2<FLOAT>> namespace MACHINEINFO { MAXON_ATTRIBUTE (BaseArray<maxon::Id>, LANGUAGES, "net.maxon.machineinfo.languages" ); // Changed to MAXON_ATTRIBUTE (BaseArray<Id>, LANGUAGES, "net.maxon.machineinfo.languages" ); } template < typename K, typename V> class MapInterface : public MapBase0<MapInterface<K, V>, K, V, EmptyClass, DefaultCompare> { MAXON_ADD_TO_CONST_REFERENCE_CLASS ( UInt GetHashCode() const { CriticalStop ( "Not implemented." ); return 0; };); // Changed to MAXON_ADD_TO_CONST_REFERENCE_CLASS ( HashInt GetHashCode() const { CriticalStop ( "Not implemented." ); return 0; };); } template < typename V> struct SqMat3 // Changed to template <typename V> struct SqrMat3 { SqMat3() : v1(ValueType(1), ValueType(0), ValueType(0)), v2(ValueType(0), ValueType(1), ValueType(0)), v3(ValueType(0), ValueType(0), ValueType(1)) // Changed to constexpr SqrMat3() : v1(ValueType(1), ValueType(0), ValueType(0)), v2(ValueType(0), ValueType(1), ValueType(0)), v3(ValueType(0), ValueType(0), ValueType(1)) SqMat3(const V& v1_in, const V& v2_in, const V& v3_in) : v1(v1_in), v2(v2_in), v3(v3_in) { } // Changed to constexpr SqrMat3( const V& v1_in, const V& v2_in, const V& v3_in) : v1(v1_in), v2(v2_in), v3(v3_in) { } template < typename V2> explicit SqMat3( const SqMat3<V2>& m) : v1(m.v1), v2(m.v2), v3(m.v3) { } // Changed to template < typename V2> explicit constexpr SqrMat3( const SqrMat3<V2>& m) : v1(m.v1), v2(m.v2), v3(m.v3) { } explicit SqMat3( ENUM_DONT_INITIALIZE v) : v1( maxon :: DONT_INITIALIZE ), v2( maxon :: DONT_INITIALIZE ), v3( maxon :: DONT_INITIALIZE ) { } // Changed to explicit constexpr SqrMat3( ENUM_DONT_INITIALIZE v) : v1( maxon :: DONT_INITIALIZE ), v2( maxon :: DONT_INITIALIZE ), v3( maxon :: DONT_INITIALIZE ) { } template < typename V2> explicit SqMat3( const SqMat2<V2>& m) : // Changed to template <typename V2> explicit constexpr SqrMat3(const SqrMat2<V2>& m) : template <typename V2> SqMat3<typename MultiplicativePromotion<V, typename V2::ValueType>::type> operator *(const SqMat3<V2>& m2) const // Changed to template <typename V2> SqrMat3<typename MultiplicativePromotion<V, typename V2::ValueType>::type> operator *(const SqrMat3<V2>& m2) const friend SqMat3 operator *(ValueTypeParam s, const SqMat3& m) // Changed to friend SqrMat3 operator *(ValueTypeParam s, const SqrMat3& m) SqMat3 operator *(ValueTypeParam s) const // Changed to SqrMat3 operator *(ValueTypeParam s) const SqMat3 operator /(ValueTypeParam s) const // Changed to SqrMat3 operator /(ValueTypeParam s) const SqMat3 operator +(const SqMat3& m2) const // Changed to SqrMat3 operator +(const SqrMat3& m2) const SqMat3 operator -(const SqMat3& m2) const // Changed to SqrMat3 operator -(const SqrMat3& m2) const BoolType operator ==(const SqMat3& other) const // Changed to BoolType operator ==(const SqrMat3& other) const BoolType operator !=(const SqMat3& other) const // Changed to BoolType operator !=(const SqrMat3& other) const SqMat3 operator ~() const // Changed to SqrMat3 operator ~() const SqMat3 GetNormalized() const // Changed to SqrMat3 GetNormalized() const SqMat3 GetTransposed() const // Changed to SqrMat3 GetTransposed() const SqMat3 GetTensorMatrix() const // Changed to SqrMat3 GetTensorMatrix() const SqMat3& operator *=(const V& v) // Changed to SqrMat3& operator *=(const V& v) SqMat3& operator *=(ValueTypeParam r) // Changed to SqrMat3& operator *=(ValueTypeParam r) UInt GetHashCode() const // Changed to HashInt GetHashCode() const static const SqMat3& NullValue () // Changed to static const SqrMat3& NullValue () SqMat3<V> sqmat; // Changed to SqrMat3<V> sqmat; Mat3() : off(), sqmat() { } // Changed to constexpr Mat3() : off(), sqmat() { } Mat3( const V& off_in, const V& v1_in, const V& v2_in, const V& v3_in) : off(off_in), sqmat(v1_in, v2_in, v3_in) { } // Changed to constexpr Mat3( const V& off_in, const V& v1_in, const V& v2_in, const V& v3_in) : off(off_in), sqmat(v1_in, v2_in, v3_in) { } Mat3( const V& off_in, const SqMat3<V>& mat_in) : off(off_in), sqmat(mat_in) { } // Changed to constexpr Mat3( const V& off_in, const SqrMat3<V>& mat_in) : off(off_in), sqmat(mat_in) { } MAXON_IMPLICIT Mat3( const SqMat3<V>& mat_in) : off(), sqmat(mat_in) { } // Changed to MAXON_IMPLICIT constexpr Mat3( const SqrMat3<V>& mat_in) : off(), sqmat(mat_in) { } template < typename V2> explicit Mat3( const Mat3<V2>& m) : off(m.off), sqmat(m.sqmat) { } // Changed to template < typename V2> explicit constexpr Mat3( const Mat3<V2>& m) : off(m.off), sqmat(m.sqmat) { } explicit Mat3( ENUM_DONT_INITIALIZE v) : off( maxon :: DONT_INITIALIZE ), sqmat( maxon :: DONT_INITIALIZE ) { } // Changed to explicit constexpr Mat3( ENUM_DONT_INITIALIZE v) : off( maxon :: DONT_INITIALIZE ), sqmat( maxon :: DONT_INITIALIZE ) { } template < typename V2> explicit Mat3( const Mat2<V2>& m) : off(m.off), sqmat(m.sqmat) { } // Changed to template < typename V2> explicit constexpr Mat3( const Mat2<V2>& m) : off(m.off), sqmat(m.sqmat) { } template < typename V2> Mat3<typename MultiplicativePromotion<V, typename V2::ValueType>::type> operator * ( const SqMat3<V2>& m2) const // Changed to template < typename V2> Mat3<typename MultiplicativePromotion<V, typename V2::ValueType>::type> operator * ( const SqrMat3<V2>& m2) const UInt GetHashCode() const // Changed to HashInt GetHashCode() const } template <typename V, typename V2> inline Mat3<typename MultiplicativePromotion<V, typename V2::ValueType>::type> operator *(const SqMat3<V>& m, const Mat3<V2>& m2) // Changed to template <typename V, typename V2> inline Mat3<typename MultiplicativePromotion<V, typename V2::ValueType>::type> operator *(const SqrMat3<V>& m, const Mat3<V2>& m2) using SquareMatrix32 = SqMat3< Vector32 >; // Changed to using SquareMatrix32 = SqrMat3< Vector32 >; using SquareMatrix64 = SqMat3< Vector64 >; // Changed to using SquareMatrix64 = SqrMat3< Vector64 >; using SquareMatrix = SqMat3< 向量 >; // Changed to using SquareMatrix = SqrMat3< 向量 >; template < GET_DATATYPE_POLICY POLICY, typename T> inline Result<DataType> PrivateGetDataType (SqMat3<T>**, OverloadRank1 ) // Changed to template < GET_DATATYPE_POLICY POLICY, typename T> inline Result<DataType> PrivateGetDataType (SqrMat3<T>**, OverloadRank1 ) template <typename T> struct IsZeroInitialized<SqMat3<T>> : public IsZeroInitialized<T> { }; // Changed to template < typename T> struct IsZeroInitialized<SqrMat3<T>> : public IsZeroInitialized<T> { }; template < typename V> struct SqMat2 // Changed to template <typename V> struct SqrMat2 { SqMat2() : v1(ValueType(1), ValueType(0)), v2(ValueType(0), ValueType(1)) // Changed to constexpr SqrMat2() : v1(ValueType(1), ValueType(0)), v2(ValueType(0), ValueType(1)) SqMat2(const V& v1_in, const V& v2_in) : v1(v1_in), v2(v2_in) { } // Changed to constexpr SqrMat2( const V& v1_in, const V& v2_in) : v1(v1_in), v2(v2_in) { } template < typename V2> explicit SqMat2( const SqMat2<V2>& m) : v1(m.v1), v2(m.v2) { } // Changed to template < typename V2> explicit constexpr SqrMat2( const SqrMat2<V2>& m) : v1(m.v1), v2(m.v2) { } explicit SqMat2( ENUM_DONT_INITIALIZE v) : v1(v), v2(v) { } // Changed to explicit constexpr SqrMat2( ENUM_DONT_INITIALIZE v) : v1(v), v2(v) { } template < typename V2> SqMat2<typename MultiplicativePromotion<V, typename V2::ValueType>::type> operator * ( const SqMat2<V2>& m2) const // Changed to template < typename V2> SqrMat2<typename MultiplicativePromotion<V, typename V2::ValueType>::type> operator * ( const SqrMat2<V2>& m2) const friend SqMat2 operator * (ValueTypeParam s, const SqMat2& m) // Changed to friend SqrMat2 operator * (ValueTypeParam s, const SqrMat2& m) SqMat2 operator * (ValueTypeParam s) const // Changed to SqrMat2 operator * (ValueTypeParam s) const SqMat2 operator / (ValueTypeParam s) const // Changed to SqrMat2 operator / (ValueTypeParam s) const SqMat2 operator + ( const SqMat2& m2) const // Changed to SqrMat2 operator + ( const SqrMat2& m2) const SqMat2 operator // Changed to SqrMat2 operator BoolType operator == ( const SqMat2& other) const // Changed to BoolType operator == ( const SqrMat2& other) const BoolType operator != ( const SqMat2& other) const // Changed to BoolType operator != ( const SqrMat2& other) const SqMat2 operator ~ () const // Changed to SqrMat2 operator ~() const SqMat2 GetNormalized() const // Changed to SqrMat2 GetNormalized() const SqMat2& operator *=(const V& v) // Changed to SqrMat2& operator *=(const V& v) SqMat2& operator *=(ValueTypeParam r) // Changed to SqrMat2& operator *=(ValueTypeParam r) UInt GetHashCode() const // Changed to HashInt GetHashCode() const static const SqMat2& NullValue () // Changed to static const SqrMat2& NullValue () SqMat2<V> sqmat; // Changed to SqrMat2<V> sqmat; Mat2(const V& off_in, const SqMat2<V>& mat_in) : off(off_in), sqmat(mat_in) { } // Changed to Mat2( const V& off_in, const SqrMat2<V>& mat_in) : off(off_in), sqmat(mat_in) { } MAXON_IMPLICIT Mat2( const SqMat2<V>& mat_in) : off(), sqmat(mat_in) { } // Changed to MAXON_IMPLICIT Mat2( const SqrMat2<V>& mat_in) : off(), sqmat(mat_in) { } template < typename V2> Mat2<typename MultiplicativePromotion<V, typename V2::ValueType>::type> operator * ( const SqMat2<V2>& m2) const // Changed to template < typename V2> Mat2<typename MultiplicativePromotion<V, typename V2::ValueType>::type> operator * ( const SqrMat2<V2>& m2) const UInt GetHashCode() const // Changed to HashInt GetHashCode() const } template <typename V, typename V2> inline Mat2<typename MultiplicativePromotion<V, typename V2::ValueType>::type> operator *(const SqMat2<V>& m, const Mat2<V2>& m2) // Changed to template <typename V, typename V2> inline Mat2<typename MultiplicativePromotion<V, typename V2::ValueType>::type> operator *(const SqrMat2<V>& m, const Mat2<V2>& m2) using SquareMatrix2d32 = SqMat2< Vector2d32 >; // Changed to using SquareMatrix2d32 = SqrMat2< Vector2d32 >; using SquareMatrix2d64 = SqMat2< Vector2d64 >; // Changed to using SquareMatrix2d64 = SqrMat2< Vector2d64 >; using SquareMatrix2d = SqMat2< Vector2d >; // Changed to using SquareMatrix2d = SqrMat2< Vector2d >; template < GET_DATATYPE_POLICY POLICY, typename T> inline Result<DataType> PrivateGetDataType (SqMat2<T>**, OverloadRank1 ) // Changed to template < GET_DATATYPE_POLICY POLICY, typename T> inline Result<DataType> PrivateGetDataType (SqrMat2<T>**, OverloadRank1 ) template <typename T> struct IsZeroInitialized<SqMat2<T>> : public IsZeroInitialized<T> { }; // Changed to template < typename T> struct IsZeroInitialized<SqrMat2<T>> : public IsZeroInitialized<T> { }; template < typename V> struct SqMat4 // Changed to template <typename V> struct SqrMat4 { SqMat4() : v1(ValueType(1), ValueType(0), ValueType(0), ValueType(0)), v2(ValueType(0), ValueType(1), ValueType(0), ValueType(0)), // Changed to constexpr SqrMat4() : v1(ValueType(1), ValueType(0), ValueType(0), ValueType(0)), v2(ValueType(0), ValueType(1), ValueType(0), ValueType(0)), SqMat4(const V& v1_in, const V& v2_in, const V& v3_in, const V& v4_in) : v1(v1_in), v2(v2_in), v3(v3_in), v4(v4_in) { } // Changed to constexpr SqrMat4( const V& v1_in, const V& v2_in, const V& v3_in, const V& v4_in) : v1(v1_in), v2(v2_in), v3(v3_in), v4(v4_in) { } template < typename V2> explicit SqMat4( const SqMat4<V2>& m) : v1(m.v1), v2(m.v2), v3(m.v3), v4(m.v4) { } // Changed to template < typename V2> explicit constexpr SqrMat4( const SqrMat4<V2>& m) : v1(m.v1), v2(m.v2), v3(m.v3), v4(m.v4) { } template < typename V2> explicit SqMat4( const Mat3<V2>& m) : v1(m.sqmat.v1, typename V2::ValueType(0)), v2(m.sqmat.v2, typename V2::ValueType(0)), v3(m.sqmat.v3, typename V2::ValueType(0)), v4(m.off, typename V2::ValueType(1)) { } // Changed to template < typename V2> explicit constexpr SqrMat4( const Mat3<V2>& m) : v1(m.sqmat.v1, typename V2::ValueType(0)), v2(m.sqmat.v2, typename V2::ValueType(0)), v3(m.sqmat.v3, typename V2::ValueType(0)), v4(m.off, typename V2::ValueType(1)) { } explicit SqMat4( ENUM_DONT_INITIALIZE v) : v1(v), v2(v), v3(v), v4(v) { } // Changed to explicit constexpr SqrMat4( ENUM_DONT_INITIALIZE v) : v1(v), v2(v), v3(v), v4(v) { } template < typename V2> SqMat4<typename MultiplicativePromotion<V, typename V2::ValueType>::type> operator * ( const SqMat4<V2>& m2) const // Changed to template < typename V2> SqrMat4<typename MultiplicativePromotion<V, typename V2::ValueType>::type> operator * ( const SqrMat4<V2>& m2) const friend SqMat4 operator * (ValueTypeParam s, const SqMat4& m) // Changed to friend SqrMat4 operator * (ValueTypeParam s, const SqrMat4& m) SqMat4 operator * (ValueTypeParam s) const // Changed to SqrMat4 operator * (ValueTypeParam s) const SqMat4 operator / (ValueTypeParam s) const // Changed to SqrMat4 operator / (ValueTypeParam s) const SqMat4 operator + ( const SqMat4& m2) const // Changed to SqrMat4 operator + ( const SqrMat4& m2) const SqMat4 operator // Changed to SqrMat4 operator BoolType operator == ( const SqMat4& other) const // Changed to BoolType operator == ( const SqrMat4& other) const BoolType operator != ( const SqMat4& other) const // Changed to BoolType operator != ( const SqrMat4& other) const SqMat4 operator ~ () const // Changed to SqrMat4 operator ~() const SqMat4 GetNormalized() const // Changed to SqrMat4 GetNormalized() const SqMat4 GetTransposed() const // Changed to SqrMat4 GetTransposed() const SqMat4& operator *=(const V& v) // Changed to SqrMat4& operator *=(const V& v) SqMat4& operator *=(ValueTypeParam r) // Changed to SqrMat4& operator *=(ValueTypeParam r) UInt GetHashCode() const // Changed to HashInt GetHashCode() const static const SqMat4& NullValue () // Changed to static const SqrMat4& NullValue () } using SquareMatrix4d32 = SqMat4< Vector4d32 >; // Changed to using SquareMatrix4d32 = SqrMat4< Vector4d32 >; using SquareMatrix4d64 = SqMat4< Vector4d64 >; // Changed to using SquareMatrix4d64 = SqrMat4< Vector4d64 >; using SquareMatrix4d = SqMat4< Vector4d >; // Changed to using SquareMatrix4d = SqrMat4< Vector4d >; template < GET_DATATYPE_POLICY POLICY, typename T> inline Result<DataType> PrivateGetDataType (SqMat4<T>**, OverloadRank1 ) // Changed to template < GET_DATATYPE_POLICY POLICY, typename T> inline Result<DataType> PrivateGetDataType (SqrMat4<T>**, OverloadRank1 ) template <typename T> struct IsZeroInitialized<SqMat4<T>> : public IsZeroInitialized<T> { }; // Changed to template < typename T> struct IsZeroInitialized<SqrMat4<T>> : public IsZeroInitialized<T> { }; namespace MODULEVERSIONINFO { MAXON_ATTRIBUTE (BaseArray<maxon::String>, USEDINMODULE, "net.maxon.moduleversioninfo.usedinmodule" ); // Changed to MAXON_ATTRIBUTE (BaseArray<String>, USEDINMODULE, "net.maxon.moduleversioninfo.usedinmodule" ); } class InterfaceDefinition { InterfaceDefinition( const InterfaceReference& ref, TranslationUnit* unit, EntityBase::FLAGS flags); // Changed to InterfaceDefinition( const InterfaceReference& ref, TranslationUnit* unit, EntityBase::FLAGS flags, const Char * cppName); inline const Char * GetCppName() const } class ObjectInterface : protected ObjectSuper { MAXON_METHOD Result<void> InitObject(); // Changed to MAXON_METHOD Result<void> InitObject( const void * argument); MAXON_METHOD Result<void> HandleMessage( const InternedId& message, const void * argument); MAXON_FUNCTION UInt GetHashCode() const { return GetHashCodeImpl(); } // Changed to MAXON_FUNCTION HashInt GetHashCode() const { return GetHashCodeImpl(); } MAXON_METHOD UInt GetHashCodeImpl() const ; //Changed to MAXON_METHOD HashInt GetHashCodeImpl() const ; MAXON_METHOD HashValue GetHashValueImpl() const ; } template <typename R, typename SRC, typename RESULT = typename CastHelper<R, SRC>::AssertCastType> inline RESULT AssertCast (SRC&& ref) // Changed to template <typename R, typename SRC, typename RESULT = typename maxon::details::CastHelper<R, SRC>::AssertCastType> inline RESULT AssertCast (SRC&& ref) template <typename R, typename SRC, typename RESULT = typename CastHelper<R, SRC>::type> inline RESULT Cast (SRC&& ref) // Changed to template <typename R, typename SRC, typename RESULT = typename maxon::details::CastHelper<R, SRC>::type> inline RESULT Cast (SRC&& ref) template < typename R, typename SRC> inline typename SFINAEHelper<Result<R>, typename R::ReferencedType, typename SRC::ReferencedType>::type Cast (Result<SRC>&& src ) // Changed to template <typename R, typename SRC, typename RESULT = typename maxon::details::CastHelper<R, SRC>::type> inline Result<RESULT> Cast (Result<SRC>&& src ) template < typename R, typename SRC> inline typename SFINAEHelper<Result<R>, typename R::ReferencedType, typename SRC::ReferencedType>::type AssertCast (Result<SRC>&& src ) // Changed to template <typename R, typename SRC, typename RESULT = typename maxon::details::CastHelper<R, SRC>::type> inline Result<RESULT> AssertCast (Result<SRC>&& src ) { #define MAXON_COMPONENT_SIMPLE(I) } template < typename ... INTERFACES> const InterfaceReference* const InterfacesBlock<INTERFACES...>::value[ sizeof ...(INTERFACES)] = { &INTERFACES::_interface... }; // Changed to template < typename ... INTERFACES> const InterfaceReference* const InterfacesBlock<INTERFACES...>::value[ sizeof ...(INTERFACES)] = { INTERFACES::PrivateGetInterface()... }; inline Id GetFunctionName ( const Char * funcName) // Changed to constexpr inline const Char * GetFunctionName ( const Char * funcName) #define MAXON_FUNCTIONNAME maxon::GetFunctionName(__FUNCTION__) // Changed to #define MAXON_FUNCTIONNAME maxon::Id(maxon::GetFunctionName(__FUNCTION__)) static constexpr Int ADDOBSERVER_DEFAULTPRIORITY = 0; class ObservableBaseInterface { MAXON_METHOD Result<void> AddObserver(ObserverObjectInterface* observer, const FunctionBaseRef& observerFunction); // Changed to MAXON_METHOD Result<void> AddObserver(ObserverObjectInterface* observer, const FunctionBaseRef& observerFunction, Int priority = ADDOBSERVER_DEFAULTPRIORITY ); } template < typename DELEGATE> class MAXON_WARN_UNUSED_CLASS ObservableRef : public ObservableNotifyRef<typename DELEGATE::Super> { template < typename FN> Result<FunctionBaseRef> AddObserver(ObserverObjectInterface* observer, FN&& fn) const // Changed to template < typename FN> Result<FunctionBaseRef> AddObserver(ObserverObjectInterface* observer, FN&& fn, Int priority = ADDOBSERVER_DEFAULTPRIORITY ) const template < typename FN> Result<FunctionBaseRef> AddObserver(ObserverObjectInterface* observer, FN&& fn, const JobQueueRef& queue) const // Changed to template < typename FN> Result<FunctionBaseRef> AddObserver(ObserverObjectInterface* observer, FN&& fn, const JobQueueRef& queue, Int priority = ADDOBSERVER_DEFAULTPRIORITY ) const template < typename FN> Result<FunctionBaseRef> AddObserver(FN&& fn) const // Changed to template < typename FN> Result<FunctionBaseRef> AddObserver(FN&& fn, Int priority = ADDOBSERVER_DEFAULTPRIORITY ) const template < typename FN, typename = typename std::enable_if<!STD_IS_REPLACEMENT(convertible, typename std::decay<FN>::type, ObserverObjectInterface*)>::type> Result<FunctionBaseRef> AddObserver(FN&& fn, const JobQueueRef& queue) const // Changed to template < typename FN, typename = typename std::enable_if<!STD_IS_REPLACEMENT(convertible, typename std::decay<FN>::type, ObserverObjectInterface*)>::type> Result<FunctionBaseRef> AddObserver(FN&& fn, const JobQueueRef& queue, Int priority = ADDOBSERVER_DEFAULTPRIORITY ) const } class Opt { UInt GetHashCode() const // Changed to HashInt GetHashCode() const } template <typename T> class Opt<const T&> { const T& GetValueOr(T&& defaultValue) const = delete ; // Changed to T GetValueOr(T&& defaultValue) const } class ParametricTypeDecorator { static Result<DataType> Instantiate( const DataType& type, const ParametricType& decoType) template < typename TYPEDECORATOR1, typename ... TYPEDECORATOR> static Result<DataType> Instantiate( const DataType& type, TYPEDECORATOR1 decoType, TYPEDECORATOR... decoTypes) } template < typename T, typename ARRAY = BaseArraySelector<>, typename COMPARE = DefaultCompare, Bool KEEP_DUPLICATES = false, Bool MINIMAL = false> class MaximalElements : private ARRAY::template Type<T> { using Super::operator [];// Removed const T& operator []( Int index) const { return Super::operator [](index); } }
template < typename T> class Range { Range() : _minValue( LIMIT <ScalarType>:: 最大 ()), _maxValue( LIMIT <ScalarType>:: 最小 ()) { } // Changed to constexpr Range() : _minValue( LIMIT <ScalarType>:: MAX ), _maxValue( LIMIT <ScalarType>:: MIN ) { } explicit Range( const T& v) : _minValue(v), _maxValue(v) { } // Changed to explicit constexpr Range( const T& v) : _minValue(v), _maxValue(v) { } Range( const T& rangeMin, const T& rangeMax) : _minValue(rangeMin), _maxValue(rangeMax) { } // Changed to constexpr Range( const T& rangeMin, const T& rangeMax) : _minValue(rangeMin), _maxValue(rangeMax) { } void 重置 () { _minValue = T( LIMIT<ScalarType>::Max ()); _maxValue = T( LIMIT<ScalarType>::Min ()); } // Changed to void 重置 () { _minValue = T( LIMIT<ScalarType>::MAX ); _maxValue = T( LIMIT<ScalarType>::MIN ); } } template < typename K> struct RangeSetPair { UInt GetHashCode() const // Changed to HashInt GetHashCode() const } template <typename K, typename V, typename MAP = BurstTrieMapSelector<>> class RangeMap { UInt GetHashCode() const // Changed to HashInt GetHashCode() const } template <typename T, typename MAP = BurstTrieMapSelector<>> class RangeSet : private RangeMap<T, UnitType, MAP > { // Removed using Super::GetHashCode; HashInt GetHashCode() const } template <typename RANGETYPE> Int GetRangeItemCount (const RANGETYPE& data); template < typename TYPE> class SetInterface : public SetBase0<SetInterface<TYPE>, TYPE, EmptyClass, DefaultCompare> { MAXON_ADD_TO_CONST_REFERENCE_CLASS ( UInt GetHashCode() const { CriticalStop ( "Not implemented." ); return 0; };); // Changed to MAXON_ADD_TO_CONST_REFERENCE_CLASS ( HashInt GetHashCode() const { CriticalStop ( "Not implemented." ); return 0; };); }maxon/sse_vector4i32.h
class Vector4i32 { MAXON_ATTRIBUTE_FORCE_INLINE explicit Vector4i32( Int32 i) // Changed to MAXON_ATTRIBUTE_FORCE_INLINE explicit Vector4i32( Int32 i, Bool setAll = true ) static MAXON_ATTRIBUTE_FORCE_INLINE Vector4i32 UnpackLow(const Vector4i32& a, const Vector4i32& b) static MAXON_ATTRIBUTE_FORCE_INLINE Vector4i32 UnpackHigh(const Vector4i32& a, const Vector4i32& b) } namespace STREAMCONVERSIONTEST { MAXON_ATTRIBUTE (BaseArray<ConversionTestSet>, CONVERSIONTESTSET, "net.maxon.streamconversiontest.conversiontestset" ); // Changed to MAXON_ATTRIBUTE (Array<ConversionTestSet>, CONVERSIONTESTSET, "net.maxon.streamconversiontest.conversiontestset" ); MAXON_ATTRIBUTE (Array<ConversionTestSet>, CONVERSIONTESTSET, "net.maxon.streamconversiontest.conversiontestset" ); // Changed to MAXON_ATTRIBUTE (Array<UChar>, SRCDATA, "net.maxon.streamconversiontest.srcdata" ); MAXON_ATTRIBUTE (BaseArray<UChar>, COMPAREDATA, "net.maxon.streamconversiontest.comparedata" ); // Changed to MAXON_ATTRIBUTE (Array<UChar>, COMPAREDATA, "net.maxon.streamconversiontest.comparedata" ); } template < typename INTERFACETYPE, typename REFTYPE, typename CHARTYPE> class StringTemplate { MAXON_METHOD UInt GetHashCode() const ; // Changed to MAXON_METHOD HashInt GetHashCode() const ; } namespace details { template < typename T> StrongReferenceCounter& PrivateGetReferenceCounter ( const T* object ) // Changed to StrongReferenceCounter& PrivateGetReferenceCounter ( const void * object ) } // Removed #ifdef USE_API_MAXON// Removed class BaseThread ;
// Removed BaseThread * MaxonConvert ( const maxon::ThreadRef & thread);
// Removed BaseThread * MaxonConvert ( const maxon::ThreadInterface * thread);
// Removed maxon::ThreadRef MaxonConvert ( BaseThread * thread);
// Removed #endif
class TimeValue { UInt GetHashCode() const // Changed to HashInt GetHashCode() const } template <UInt32 INDEX, UInt32 PRE_OFFSET, UInt32 PRE_MAX_ALIGN> class TupleStorageLayout<INDEX, PRE_OFFSET, PRE_MAX_ALIGN> { static void GetOffset(); } template < UInt32 INDEX, UInt32 PRE_OFFSET, UInt32 PRE_MAX_ALIGN, UInt64 SZ_ALIGN, UInt64 ... REST> class TupleStorageLayout<INDEX, PRE_OFFSET, PRE_MAX_ALIGN, SZ_ALIGN, REST...> : public TupleStorageLayout<INDEX + 1, UInt32(Align(PRE_OFFSET, UInt32(SZ_ALIGN >> 33))) + UInt32 (SZ_ALIGN), 最大 (PRE_MAX_ALIGN, UInt32(SZ_ALIGN >> 33)), REST...> { using Super = TupleStorageLayout<INDEX + 1, UInt32 (Align(PRE_OFFSET, UInt32 (SZ_ALIGN >> 33))) + UInt32 (SZ_ALIGN), 最大 (PRE_MAX_ALIGN, UInt32 (SZ_ALIGN >> 33)), REST...>; using Super::GetOffset; } template < typename T1, typename T2> class TupleStorage<T1, T2> { // Removed static Int GetOffset( typename std::integral_constant<UInt32, 1>::type*) { return MAXON_OFFSETOF_NON_STANDARD_LAYOUT (TupleStorage, second); } static Int GetOffset( typename std::integral_constant<UInt32, 0>::type*) { return MAXON_OFFSETOF_NON_STANDARD_LAYOUT (TupleStorage, first); } template < typename I> static Int GetOffset(I* x) { return TupleStorageLayout<0, 0, 1, GetSizeAndAlignment<T1>(), GetSizeAndAlignment<T2>()>::GetOffset(x); }// Removed static Int GetOffset( typename std::integral_constant<UInt32, 0>::type*) { return MAXON_OFFSETOF_NON_STANDARD_LAYOUT (TupleStorage, first); } static Int GetOffset( typename std::integral_constant<UInt32, 1>::type*) { return MAXON_OFFSETOF_NON_STANDARD_LAYOUT (TupleStorage, second); } static Int GetOffset( typename std::integral_constant<UInt32, 2>::type*) { return MAXON_OFFSETOF_NON_STANDARD_LAYOUT (TupleStorage, third); } template < typename I> static Int GetOffset(I* x) { return TupleStorageLayout<0, 0, 1, GetSizeAndAlignment<T1>(), GetSizeAndAlignment<T2>(), GetSizeAndAlignment<T3>()>::GetOffset(x); }
// Removed static Int GetOffset( typename std::integral_constant<UInt32, 0>::type*) { return MAXON_OFFSETOF_NON_STANDARD_LAYOUT (TupleStorage, first); } static Int GetOffset( typename std::integral_constant<UInt32, 1>::type*) { return MAXON_OFFSETOF_NON_STANDARD_LAYOUT (TupleStorage, second); } static Int GetOffset( typename std::integral_constant<UInt32, 2>::type*) { return MAXON_OFFSETOF_NON_STANDARD_LAYOUT (TupleStorage, third); } static Int GetOffset( typename std::integral_constant<UInt32, 3>::type*) { return MAXON_OFFSETOF_NON_STANDARD_LAYOUT (TupleStorage, fourth); } template < typename I> static Int GetOffset(I* x) { return TupleStorageLayout<0, 0, 1, GetSizeAndAlignment<T1>(), GetSizeAndAlignment<T2>(), GetSizeAndAlignment<T3>(), GetSizeAndAlignment<T4>()>::GetOffset(x); }
// Removed static Int GetOffset( typename std::integral_constant<UInt32, 0>::type*) { return MAXON_OFFSETOF_NON_STANDARD_LAYOUT (TupleStorage, first); } static Int GetOffset( typename std::integral_constant<UInt32, 1>::type*) { return MAXON_OFFSETOF_NON_STANDARD_LAYOUT (TupleStorage, second); } static Int GetOffset( typename std::integral_constant<UInt32, 2>::type*) { return MAXON_OFFSETOF_NON_STANDARD_LAYOUT (TupleStorage, third); } static Int GetOffset( typename std::integral_constant<UInt32, 3>::type*) { return MAXON_OFFSETOF_NON_STANDARD_LAYOUT (TupleStorage, fourth); } static Int GetOffset( typename std::integral_constant<UInt32, 4>::type*) { return MAXON_OFFSETOF_NON_STANDARD_LAYOUT (TupleStorage, fifth); } template < typename I> static Int GetOffset(I* x) { return TupleStorageLayout<0, 0, 1, GetSizeAndAlignment<T1>(), GetSizeAndAlignment<T2>(), GetSizeAndAlignment<T3>(), GetSizeAndAlignment<T4>(), GetSizeAndAlignment<T5>()>::GetOffset(x); } }
// Removed template < typename HASH> inline UInt TupleGetHashCode()
// Removed template <typename HASH, typename T1, typename... T> inline UInt TupleGetHashCode(const T1& a1, const T&... rest) template <typename... T> class Tuple : public maxon :: details ::TupleStorage<T...> { UInt GetHashCode() const // Changed to HashInt GetHashCode() const template <typename HASH> UInt GetHashCode() const // Changed to template <typename HASH> HashInt GetHashCode() const } template <> class Tuple<> { UInt GetHashCode() cons // Changed to HashInt GetHashCode() const template <typename HASH> UInt GetHashCode() const // Changed to template <typename HASH> HashInt GetHashCode() const } class IgnoredPlaceholder { template < typename T> void operator =( const T&) const { } // Changed to const IgnoredPlaceholder& operator =( const T&) const }
enum class CHARACTERTYPE : UChar { UNKNOWN = 0, LU , // Letter, Uppercase LL , // Letter, Lowercase LT , // Letter, Titlecase LM , // Letter, Modifier LO , // Letter, Other MN , // Mark, Nonspacing MC , // Mark, Spacing Combining ME , // Mark, Enclosing ND , // Number, Decimal Digit NL , // Number, Letter NO , // Number, Other PC , // Punctuation, Connector PD , // Punctuation, Dash PS , // Punctuation, Open PE , // Punctuation, Close PI , // Punctuation, Initial quote(may behave like Ps or Pe depending on usage) PF , // Punctuation, Final quote(may behave like Ps or Pe depending on usage) PO , // Punctuation, Other SM , // Symbol, Math SC , // Symbol, Currency SK , // Symbol, Modifier SO , // Symbol, Other ZS , // Separator, Space ZL , // Separator, Line ZP , // Separator, Paragraph CC , // Other, Control CF , // Other, Format CS , // Other, Surrogate CO , // Other, Private Use CN , // Other, Not Assigned(no characters in the file have this property) } class UnicodeUtils { static MAXON_METHOD CHARACTERTYPE GetCharacterType( Utf32Char chr); } template < typename TYPE> MAXON_ATTRIBUTE_FORCE_INLINE Bool IsUnicodeLetter ( TYPE chr); class UrlInterface { MAXON_FUNCTION UInt GetHashCode() const ; // Changed to MAXON_FUNCTION HashInt GetHashCode() const ; } class UuidInterface { MAXON_FUNCTION UInt GetHashCode() const ; // Changed to MAXON_FUNCTION HashInt GetHashCode() const ; } template < typename T> struct SqMat4; // Changed to template < typename T> struct SqrMat4; namespace ParametricTypes { MAXON_DECLARATION (ParametricType, SqMat, "net.maxon.parametrictype.sqmat" ); // Changed to MAXON_DECLARATION (ParametricType, SqrMat, "net.maxon.parametrictype.sqmat" ); } struct ViewIteratorMember { template <Bool ENABLE_SIMD = true> void Advance() // Changed to template < Bool ENABLE_SIMD> void Advance() template < Bool ENABLE_SIMD = true> void Advance( Int advanceCount) // Changed to template < Bool ENABLE_SIMD> void Advance( Int advanceCount) } template < typename REFERENCE> class WeakRef : public WeakRefBase { UInt GetHashCode() const // Changed to HashInt GetHashCode() const } class GUIDHASH { static MAXON_ATTRIBUTE_FORCE_INLINE UInt GetHashCode( const GUID& guid) // Changed to static MAXON_ATTRIBUTE_FORCE_INLINE HashInt GetHashCode( const GUID& guid) }// Removed ConversionSequence( const CoreNode& c1, CONVERSION_FLAGS flags) : _flags(flags), _count(1)
// Removed ConversionSequence(const CoreNode& c1, const CoreNode& c2, CONVERSION_FLAGS flags) : _flags(flags), _count(2)
// Removed ConversionSequence(const Block<const CoreNode>& seq, CONVERSION_FLAGS flags) : _flags(flags), _count(seq. GetCount ()) CoreNode& operator []( Int index); ~ConversionSequence(); }
enum class WIRETYPE { SUBTRACTIVE_DOMAIN = 0x40000, // The subtractive domain of the source node shall be subtracted from the target node's domain. If the source node introduces factors, then these are subtracted. ELEMENT_DOMAIN = 0x80000, // The element domain is used for array/container output ports to transport the domain of their elements. MATCH_DOMAIN = 0x100000, INDUCED_DOMAIN = 0x200000, FIX_DOMAIN = 0x400000, CONDITIONAL_DOMAIN = 0x800000, // Only used when the target node receives subtractive domains through SUBTRACTIVE_DOMAIN wires: Add the domain of the source node to the target node. INTERSECTION_DOMAIN = 0x1000000, INDUCED_MASK = INDUCED_SEQUENCED | INDUCED_DOMAIN , FLAG_MASK = LAZY | TRG_MARK | BLOCK_NESTING , // Changed to FLAG_MASK = LAZY | TRG_MARK | BLOCK_NESTING | CONDITIONAL_DOMAIN | INTERSECTION_DOMAIN , DEFAULT_INPUT = ALL & ~( SUBTRACTIVE_DOMAIN | ELEMENT_DOMAIN | MATCH_DOMAIN | INDUCED_DOMAIN | FIX_DOMAIN ), DEFAULT_OUTPUT = DEFAULT_INPUT | INDUCED_DOMAIN } class InPortId : public PortId { static constexpr WIRETYPE DEFAULT_WIRE = WIRETYPE::DEFAULT_INPUT ; } class OutPortId : public PortId { static constexpr WIRETYPE DEFAULT_WIRE = WIRETYPE::DEFAULT_OUTPUT ; } class IdBuilder { template < typename ... INSTANTIATIONTYPE, typename BASETYPE> static corenodes::IdBuilder Create(BASETYPE baseId); template < Bool B, typename ... T> IdBuilder&& Append() '; void AppendParam(const Char* str); } class MicroNode { enum class TYPE { SUBTRACTIVE_DOMAIN ,// Removed PARAMETER_MASK = 0x800,
// Removed PARAMETERS = PARAMETER_MASK + 1,
// Removed CONTAINER_PARAMETER = CONTAINER_OUTPUT_ELEMENT | PARAMETER_MASK,
// Removed ARRAY_PARAMETER = ARRAY_OUTPUT_ELEMENT | PARAMETER_MASK,
// Removed FACTOR_REFERENCE_MASK = 0x400000,
// Removed FACTOR_REFERENCE , ARRAY_CONTAINER , } enum class FLAGS { // Removed HIDDEN = 1 << 5, DONT_WRAP = 1 << 5,
// Removed PORT_MODIFIERS = PERMANENT | CACHED | HIDDEN | CURRENT_ITV | NEXT_ITV , SUSPEND = 1 << 16, KEEP_LETTER_CASE = 1 << 17, INDEPENDENT = 1 << 18, INCLUDE_IN_PREDECESSORS = 1 << 19, FACTOR_REFERENCE = 1 << 20, OPTIONAL_INPUT = 1 << 21, CURRENT_ITV_GROUP = 1 << 22, NEXT_ITV_GROUP = 1 << 23, HIDDEN = 1 << 24, ITV_MASK = CURRENT_ITV | NEXT_ITV , ITV_GROUP_MASK = CURRENT_ITV_GROUP | NEXT_ITV_GROUP , PORT_MODIFIERS = PERMANENT | CACHED | DONT_WRAP | ITV_MASK | KEEP_LETTER_CASE | OPTIONAL_INPUT | HIDDEN , MODIFIERS = PORT_MODIFIERS | COMMUTATIVE | STATE_MAPPER | STATE_MODIFIER | OUTER_DOMAIN , // Changed to MODIFIERS = PORT_MODIFIERS | COMMUTATIVE | STATE_MAPPER | STATE_MODIFIER | OUTER_DOMAIN | SUSPEND | INDEPENDENT | FACTOR_REFERENCE | ITV_GROUP_MASK , } } template < typename T, Bool OUTPUT = false> class VariadicPort; // Changed to template < typename T, Bool OUTPUT = false, Bool AS_INPUT = false> class VariadicPort; class MicroNodeInterface : public CoreNodeInstanceBaseInterface { MAXON_FUNCTION void AddFlags(MicroNode::FLAGS flags) // Changed to MAXON_METHOD void AddFlags(MicroNode::FLAGS flags); template < typename VARIADIC_ACCESS, typename MN> MAXON_FUNCTION Result<BaseArray<typename VARIADIC_ACCESS::VPort::PortId>> AddVariadicPort(VARIADIC_ACCESS MN ::* acc, const CString& prefix, const Data& arg, WIRETYPE wires = WIRETYPE::ALL , const DataType& type = GetZeroRef<DataType>()) // Changed to template <typename VARIADIC_ACCESS, typename MN > MAXON_FUNCTION Result<BaseArray<typename VARIADIC_ACCESS::VPort::PortId>> AddVariadicPort(VARIADIC_ACCESS MN ::* acc, const CString& prefix, const Data& arg, WIRETYPE wires = VARIADIC_ACCESS::VPort::DEFAULT_WIRE, const DataType& type = GetZeroRef <DataType>(), MicroNode::FLAGS flags = MicroNode::FLAGS:: NONE ) template <typename VARIADIC_ACCESS, typename MN > MAXON_FUNCTION Result<BaseArray<typename VARIADIC_ACCESS::VPort::PortId>> AddVariadicPort(VARIADIC_ACCESS MN ::* acc, const CString& prefix, Int count, Int base = 0, WIRETYPE wires = WIRETYPE :: ALL ) // Changed to template <typename VARIADIC_ACCESS, typename MN > MAXON_FUNCTION Result<BaseArray<typename VARIADIC_ACCESS::VPort::PortId>> AddVariadicPort(VARIADIC_ACCESS MN ::* acc, const CString& prefix, Int count, Int base = 0, WIRETYPE wires = VARIADIC_ACCESS::VPort::DEFAULT_WIRE, MicroNode::FLAGS flags = MicroNode::FLAGS:: NONE ) template <typename VARIADIC_ACCESS, typename MN > MAXON_FUNCTION Result<BaseArray<typename VARIADIC_ACCESS::VPort::PortId>> AddVariadicPort(VARIADIC_ACCESS MN ::* acc, const Block<const Member>& members, WIRETYPE wires = WIRETYPE :: ALL ) // Changed to template <typename VARIADIC_ACCESS, typename MN > MAXON_FUNCTION Result<BaseArray<typename VARIADIC_ACCESS::VPort::PortId>> AddVariadicPort(VARIADIC_ACCESS MN ::* acc, const Block<const Member>& members, WIRETYPE wires = VARIADIC_ACCESS::VPort::DEFAULT_WIRE, MicroNode::FLAGS flags = MicroNode::FLAGS:: NONE ) MAXON_FUNCTION Result<InPortId> Export(const InPortId& parentPort, WIRETYPE wires = WIRETYPE :: ALL , ACCESS_INDEX index = ACCESS_INDEX :: UNUSED , const DataType& type = DataType:: NullValue ()) // Changed to MAXON_FUNCTION Result<InPortId> Export(const InPortId& parentPort, WIRETYPE wires = WIRETYPE :: DEFAULT_INPUT , ACCESS_INDEX index = ACCESS_INDEX :: UNUSED , const DataType& type = DataType:: NullValue (), MicroNode::FLAGS flags = MicroNode::FLAGS:: NONE ) MAXON_FUNCTION Result<OutPortId> Export(const OutPortId& parentPort, WIRETYPE wires = WIRETYPE :: ALL , ACCESS_INDEX index = ACCESS_INDEX :: UNUSED , const DataType& type = DataType:: NullValue ()) // Changed to MAXON_FUNCTION Result<OutPortId> Export(const OutPortId& parentPort, WIRETYPE wires = WIRETYPE :: DEFAULT_OUTPUT , ACCESS_INDEX index = ACCESS_INDEX :: UNUSED , const DataType& type = DataType:: NullValue (), MicroNode::FLAGS flags = MicroNode::FLAGS:: NONE ) template <typename PORT > MAXON_FUNCTION Result<typename PORT ::PortIdType> Export(const PORT & parentPort, WIRETYPE wires = WIRETYPE :: ALL , ACCESS_INDEX index = ACCESS_INDEX :: UNUSED ) // Changed to template <typename PORT > MAXON_FUNCTION Result<typename PORT ::PortIdType> Export(const PORT & parentPort, WIRETYPE wires = PORT ::PortIdType::DEFAULT_WIRE, ACCESS_INDEX index = ACCESS_INDEX :: UNUSED , MicroNode::FLAGS flags = MicroNode::FLAGS:: NONE ) } class CoreNodeInstanceInterface : public CoreNodeInstanceBaseInterface { MAXON_FUNCTION Result<InPortId> Export( const InPortId& inport, const InPortId& parentPort = InPortId::NullValue (), WIRETYPE wires = WIRETYPE::ALL ) // Changed to MAXON_FUNCTION Result<InPortId> Export( const InPortId& inport, const InPortId& parentPort = InPortId::NullValue (), WIRETYPE wires = WIRETYPE::DEFAULT_INPUT ) MAXON_FUNCTION Result<OutPortId> Export( const OutPortId& outport, const OutPortId& parentPort = OutPortId::NullValue (), WIRETYPE wires = WIRETYPE::ALL ) // Changed to MAXON_FUNCTION Result<OutPortId> Export( const OutPortId& outport, const OutPortId& parentPort = OutPortId::NullValue (), WIRETYPE wires = WIRETYPE::DEFAULT_OUTPUT ) }
class CoreNodesLib { // Removed static MAXON_METHOD Result<const ConversionSequence*> GetConversion( const DataType& to, const DataType& from); static MAXON_METHOD Result<const ConversionSequence*> GetConversion( const DataType& to, const DataType& from, Bool allowIterations); // Changed to static MAXON_METHOD Result<const ConversionSequence*> GetConversion( const DataType& to, const DataType& from, Bool allowIterations = false ); } class VariableMicroNode final : public VariableBase { static const WIRETYPE IS_SOURCE_OF = WIRETYPE::DOMAIN_FLOW_PURE_VALUE_SEQUENCED_LIFETIME | WIRETYPE::ALIAS | WIRETYPE::MARK ; // Changed to static const WIRETYPE IS_SOURCE_OF = WIRETYPE::DOMAIN_FLOW_PURE_VALUE_SEQUENCED_LIFETIME | WIRETYPE::ALIAS } class BasicMicroNode : public MicroNode { static const WIRETYPE IS_TARGET_OF = WIRETYPE::DOMAIN_FLOW_SEQUENCED | WIRETYPE::PORT ; // Changed to static const WIRETYPE IS_TARGET_OF = WIRETYPE::DOMAIN_FLOW_SEQUENCED | WIRETYPE::PORT | WIRETYPE::LIFETIME | WIRETYPE::SUBTRACTIVE_DOMAIN | WIRETYPE::ELEMENT_DOMAIN | WIRETYPE::MATCH_DOMAIN | WIRETYPE::FIX_DOMAIN ; static const WIRETYPE IS_SOURCE_OF = WIRETYPE::DOMAIN_FLOW_SEQUENCED | WIRETYPE::PORT ; // Changed to static const WIRETYPE IS_SOURCE_OF = WIRETYPE::DOMAIN_FLOW_SEQUENCED | WIRETYPE::PORT | WIRETYPE::MATCH_DOMAIN | WIRETYPE::FIX_DOMAIN ; } class BatchMicroNode : public MicroNode { static const WIRETYPE IS_TARGET_OF = WIRETYPE::DOMAIN_FLOW_SEQUENCED | WIRETYPE::PORT ; // Changed to static const WIRETYPE IS_TARGET_OF = WIRETYPE::DOMAIN_FLOW_SEQUENCED | WIRETYPE::PORT | WIRETYPE::LIFETIME | WIRETYPE::SUBTRACTIVE_DOMAIN | WIRETYPE::ELEMENT_DOMAIN | WIRETYPE::MATCH_DOMAIN | WIRETYPE::FIX_DOMAIN ; static const WIRETYPE IS_SOURCE_OF = WIRETYPE::DOMAIN_FLOW_SEQUENCED | WIRETYPE::PORT ; // Changed to static const WIRETYPE IS_SOURCE_OF = WIRETYPE::DOMAIN_FLOW_SEQUENCED | WIRETYPE::PORT | WIRETYPE::MATCH_DOMAIN | WIRETYPE::FIX_DOMAIN ; } namespace corenodes { #define MAXON_PORT_INPUT_NAMED(T, name, portId) PRIVATE_MAXON_INPUT_PORT_NAMED(T, name, portId, false, false, -1) #define MAXON_PORT_OUTPUT_NAMED(T, name, portId) PRIVATE_MAXON_OUTPUT_PORT_NAMED(T, name, portId, VariableMicroNode, false, false, -1) namespace details { struct SourceCodePortId { // Removed MAXON_OPERATOR_EQUALITY_HASHCODE (SourceCodePortId, hash, linearIndex); MAXON_OPERATOR_STRUCT (SourceCodePortId, hash, linearIndex); } template < typename PORTIDTYPE> inline constexpr UInt GetPortHashCodeHelper (PORTIDTYPE const & inId) inline constexpr UInt GetPortHashCodeHelper (LiteralId const & inId) template <Int LENGTH> inline constexpr UInt GetPortHashCodeHelper ( const char (&inId)[ LENGTH ]) } } class MicroNodeRuntime { // Removed static MAXON_METHOD ExecutionTime GetTime( const Context& ctx); } template <Int PORTCOUNT> class BatchVarAccess { explicit BatchVarAccess( const VarAccess& access) : _access(&access), _context(access._context), _index(access._frame->GetIndex()), _blockEnd(access._frame->GetBlockEnd()) // Changed to explicit BatchVarAccess(const VarAccess& access) : _context(access._context), _index(access._frame->GetIndex()), _blockEnd(access._frame->GetBlockEnd()) explicit BatchVarAccess( ENUM_DONT_INITIALIZE ) : _access(nullptr) // Changed to explicit BatchVarAccess( ENUM_DONT_INITIALIZE ) } template <> void Destruct <corenodes::FrameData>(corenodes::FrameData* data); template < typename T, Bool OUTPUT> class VariadicPort // Changed to template <typename T, Bool OUTPUT , Bool AS_INPUT> class VariadicPort { static constexpr WIRETYPE DEFAULT_WIRE = OUTPUT ? WIRETYPE::DEFAULT_OUTPUT : WIRETYPE::DEFAULT_INPUT ; static Result<VariadicPort> Create(MicroNodeGroupInterface* node, const CString& prefix, Int count, Int base) // Changed to static Result<VariadicPort> Create(MicroNodeGroupInterface* node, const CString& prefix, Int count, Int base, MicroNode::FLAGS flags = MicroNode::FLAGS::NONE ) static Result<VariadicPort> Create(MicroNodeGroupInterface* node, const CString& prefix, const Data& arg, const DataType& type = GetPortType<T>()) // Changed to static Result<VariadicPort> Create(MicroNodeGroupInterface* node, const CString& prefix, const Data& arg, const DataType& type = GetPortType <T>(), MicroNode::FLAGS flags = MicroNode::FLAGS:: NONE ) static Result<VariadicPort> Create(MicroNodeGroupInterface* node, const Block<const Member>& members) // Changed to static Result<VariadicPort> Create(MicroNodeGroupInterface* node, const Block<const Member>& members, MicroNode::FLAGS flags = MicroNode::FLAGS:: NONE ) template <typename PORTS > class Ports { using ValueType = typename std::conditional<OUTPUT, typename std::remove_const<T>::type&, T>::type; corenodes::details::PortOps<T, corenodes::details::PortArrayAccess<typename PORTS::Ports::Access>, void > operator []( Int index) const // Changed to corenodes::details::PortOps<ValueType, corenodes::details::PortArrayAccess<typename PORTS::Ports::Access>, void > operator []( Int index) const corenodes::details::PortOps<T, corenodes::details::PortArrayAccess<typename PORTS::Ports::Access>, void > operator * () const // Changed to corenodes:: details ::PortOps<ValueType, corenodes:: details ::PortArrayAccess<typename PORTS ::Ports::Access>, void > operator *() const class Iterator { corenodes::details::PortOps<T, corenodes::details::PortArrayAccess<typename PORTS::Ports::Access>, void > operator * () const // Changed to corenodes:: details ::PortOps<ValueType, corenodes:: details ::PortArrayAccess<typename PORTS ::Ports::Access>, void > operator *() const } } class Access { Access() = default ; explicit Access( ACCESS_INDEX b = ACCESS_INDEX::UNUSED , Int cnt = 0) : _base(b), _count(cnt) // Changed to explicit Access( ACCESS_INDEX b, Int cnt = 0) : _base(b), _count(cnt) } template <typename MNI> Result<void> ConnectMicroNode(MicroNodePtr<MNI> node, Access MNI::* a, WIRETYPE wtype = WIRETYPE :: ALL ) // Changed to template <typename MNI> Result<void> ConnectMicroNode(MicroNodePtr<MNI> node, Access MNI::* a, WIRETYPE wtype = DEFAULT_WIRE) }maxon/gfx_image_colorprofile.h
class ColorProfileInterface { MAXON_METHOD UInt GetHashCode() const ; // Changed to MAXON_METHOD HashInt GetHashCode() const ; } class ColorProfileConvertInterface { MAXON_METHOD UInt GetHashCode() const ; // Changed to MAXON_METHOD HashInt GetHashCode() const ; } namespace EXIFDATA { namespace PROPERTIES { MAXON_ATTRIBUTE (BaseArray<UInt16>, CFA_REPEAT_PATTERN_DIM, UInt16 (0x828D)); // Changed to MAXON_ATTRIBUTE (Array<UInt16>, CFA_REPEAT_PATTERN_DIM, UInt16 (0x828D)); MAXON_ATTRIBUTE (BaseArray<UInt16>, ISO_SPEED_RATINGS, UInt16 (0x8827)); // Changed to MAXON_ATTRIBUTE (Array<UInt16>, ISO_SPEED_RATINGS, UInt16 (0x8827)); MAXON_ATTRIBUTE (BaseArray<UInt16>, SUBJECT_AREA, UInt16 (0x9214)); // Changed to MAXON_ATTRIBUTE (Array<UInt16>, SUBJECT_AREA, UInt16 (0x9214)); MAXON_ATTRIBUTE (BaseArray<UIntVector2d32>, WHITE_POINT, UInt16 (0x013E)); // Changed to MAXON_ATTRIBUTE (Array<UIntVector2d32>, WHITE_POINT, UInt16 (0x013E)); MAXON_ATTRIBUTE (BaseArray<UIntVector2d32>, YCBCR_COEFFICIENTS, UInt16 (0x0211)); // Changed to MAXON_ATTRIBUTE (Array<UIntVector2d32>, YCBCR_COEFFICIENTS, UInt16 (0x0211)); } namespace GPS { MAXON_ATTRIBUTE (BaseArray<UIntVector2d32>, DEST_LATITUDE, UInt16 (0x0014)); // Changed to MAXON_ATTRIBUTE (Array<UIntVector2d32>, DEST_LATITUDE, UInt16 (0x0014)); MAXON_ATTRIBUTE (BaseArray<UIntVector2d32>, DEST_LONGITUDE, UInt16 (0x0016)); // Changed to MAXON_ATTRIBUTE (Array<UIntVector2d32>, DEST_LONGITUDE, UInt16 (0x0016)); MAXON_ATTRIBUTE (BaseArray<UIntVector2d32>, LATITUDE, UInt16 (0x0002)); // Changed to MAXON_ATTRIBUTE (Array<UIntVector2d32>, LATITUDE, UInt16 (0x0002)); MAXON_ATTRIBUTE (BaseArray<UIntVector2d32>, LONGITUDE, UInt16 (0x0008)); // Changed to MAXON_ATTRIBUTE (Array<UIntVector2d32>, LONGITUDE, UInt16 (0x0008)); MAXON_ATTRIBUTE (BaseArray<UIntVector2d32>, TIME_STAMP, UInt16 (0x0007)); // Changed to MAXON_ATTRIBUTE (Array<UIntVector2d32>, TIME_STAMP, UInt16 (0x0007)); } }maxon/gfx_image_pixelformat_template.h
MAXON_ATTRIBUTE_FORCE_INLINE void ConvertPixel ( Pix16f & dst, const Pix32u src ) { Pix32f d; ConvertPixel (d, src ); dst = ClampValue (d, LIMIT<Pix16f>::Min (), LIMIT<Pix16f>::Max ()); } // Changed to MAXON_ATTRIBUTE_FORCE_INLINE void ConvertPixel ( Pix16f & dst, const Pix32u src ) { Pix32f d; ConvertPixel (d, src ); dst = ClampValue (d, LIMIT<Pix16f>::MIN , LIMIT<Pix16f>::MAX ); } MAXON_ATTRIBUTE_FORCE_INLINE void ConvertPixel ( Pix16f & dst, const Pix32s src ) { Pix32f d; ConvertPixel (d, src ); dst = ClampValue (d, LIMIT<Pix16f>::Min (), LIMIT<Pix16f>::Max ()); } // Changed to MAXON_ATTRIBUTE_FORCE_INLINE void ConvertPixel ( Pix16f & dst, const Pix32s src ) { Pix32f d; ConvertPixel (d, src ); dst = ClampValue (d, LIMIT<Pix16f>::MIN , LIMIT<Pix16f>::MAX ); } MAXON_ATTRIBUTE_FORCE_INLINE void ConvertPixel ( Pix16f & dst, const Pix32f src ) { Pix32f d; ConvertPixel (d, src ); dst = ClampValue (d, LIMIT<Pix16f>::Min (), LIMIT<Pix16f>::Max ()); } // Changed to MAXON_ATTRIBUTE_FORCE_INLINE void ConvertPixel ( Pix16f & dst, const Pix32f src ) { Pix32f d; ConvertPixel (d, src ); dst = ClampValue (d, LIMIT<Pix16f>::MIN , LIMIT<Pix16f>::MAX ); } MAXON_ATTRIBUTE_FORCE_INLINE void ConvertPixel ( Pix16f & dst, const Pix64f src ) { Pix32f d; ConvertPixel (d, src ); dst = ClampValue (d, LIMIT<Pix16f>::Min (), LIMIT<Pix16f>::Max ()); } // Changed to MAXON_ATTRIBUTE_FORCE_INLINE void ConvertPixel ( Pix16f & dst, const Pix64f src ) { Pix32f d; ConvertPixel (d, src ); dst = ClampValue (d, LIMIT<Pix16f>::MIN , LIMIT<Pix16f>::MAX ); } template <> class LIMIT <HalfFloat< Float32 >> { static constexpr Float32 最小 () { return 6.10e-5f; } // Changed to static constexpr Float32 MIN = -6.55e+4f; static constexpr Float32 最大 () { return 6.55e+4f; } // Changed to static constexpr Float32 MAX = 6.55e+4f; } class LayerSetInterface { MAXON_METHOD UInt GetHashCode() const ; // Changed to MAXON_METHOD HashInt GetHashCode() const ; } namespace MEDIASESSION { namespace EXPORT { MAXON_ATTRIBUTE (BaseArray<maxon::Char>, CUSTOMDATA, "net.maxon.mediasession.export.customdata" ); // Changed to MAXON_ATTRIBUTE (Array<Char>, CUSTOMDATA, "net.maxon.mediasession.export.customdata" ); } } namespace MEDIAFORMAT { namespace IMAGELAYER { namespace ADJUSTMENT { MAXON_ATTRIBUTE (BaseArray<Char>, PSD_DATA, "net.maxon.mediaformat.layer.psd_data" ); // Changed to MAXON_ATTRIBUTE (Array<Char>, PSD_DATA, "net.maxon.mediaformat.layer.psd_data" ); } } namespace VIDEO { static const Float UNKNOWNFPS = LIMIT<Float>::Max (); // Changed to static const Float UNKNOWNFPS = LIMIT<Float>::MAX ; } namespace AUDIO { MAXON_ATTRIBUTE (BaseArray<DataDictionary>, MARKERARRAY, "net.maxon.mediaformat.audio.markerarray" ); // Changed to MAXON_ATTRIBUTE (Array<DataDictionary>, MARKERARRAY, "net.maxon.mediaformat.audio.markerarray" ); } }maxon/mediasession_export_rla.h
namespace MEDIASESSION { namespace RLA { namespace EXPORT { MAXON_ATTRIBUTE ( maxon::rla::MAXRenderInfo , MAXRENDERINFO, "net.maxon.mediasession.rla.export.maxrenderinfo" ); // Changed to MAXON_ATTRIBUTE (rla::MAXRenderInfo, MAXRENDERINFO, "net.maxon.mediasession.rla.export.maxrenderinfo" ); MAXON_ATTRIBUTE (BaseArray<maxon::Char>, NAMETAB, "net.maxon.mediasession.rla.export.nametab" ); // Changed to MAXON_ATTRIBUTE (Array<Char>, NAMETAB, "net.maxon.mediasession.rla.export.nametab" ); } } }// Removed StringEncodingRef _defaultStringEncoder; } enum class CPyMemAllocatorDomain { CPYMEM_DOMAIN_RAW , CPYMEM_DOMAIN_MEM , CPYMEM_DOMAIN_OBJ } MAXON_ENUM_LIST ( CPyMemAllocatorDomain ); struct CPyMemAllocatorEx { void * ctx; void * (*malloc) ( void * ctx, size_t size); void * (*calloc) ( void * ctx, size_t nelem, size_t elsize); void * (*realloc) ( void * ctx, void * ptr, size_t new_size); void (*free) ( void * ctx, void * ptr); } ; class CPythonLibraryInterface { // Removed MAXON_METHOD void PrivateCPyRandom_Init();
// Removed MAXON_METHOD CPyRef CPy_InitModule( const ModuleDefinition& module); MAXON_METHOD CPyRef CPyModule_Create( const ModuleDefinition& module); MAXON_METHOD Result<void> CPy_SetPath( const BaseArray<Url>& paths); MAXON_METHOD Bool CPyString_Check( const CPyRef& o); // Changed to MAXON_METHOD Bool CPyUnicode_Check( const CPyRef& o); MAXON_METHOD CPyRef CPyString_FromString( const Char * str) const ; // Changed to MAXON_METHOD CPyRef CPyUnicode_FromString( const Char * str) const ; MAXON_METHOD CPyRef CPyString_FromStringAndSize( const Block<const Char>& block); // Changed to MAXON_METHOD CPyRef CPyUnicode_FromStringAndSize( const Block<const Char>& block); MAXON_METHOD Result<String> CPyString_AsString( const CPyRef& str); // Changed to MAXON_METHOD Result<String> CPyUnicode_AsString( const CPyRef& str); MAXON_METHOD const Char * CPyString_AsCString( const CPyRef& str); // Changed to MAXON_METHOD const Char * CPyUnicode_AsCString( const CPyRef& str); MAXON_METHOD Int CPyString_Size( const CPyRef& str); // Changed to MAXON_METHOD Int CPyUnicode_GetLength( const CPyRef& str); MAXON_METHOD CPyRef CPyImport_GetModuleDict();
// Removed MAXON_METHOD void CPyEval_AcquireLock();
// Removed MAXON_METHOD void CPyEval_ReleaseLock(); MAXON_METHOD Bool CPyInt_Check( const CPyRef& o); // Changed to MAXON_METHOD Bool CPyLong_Check( const CPyRef& o); MAXON_METHOD CPyRef CPyInt_FromInt16( Int16 value); // Changed to MAXON_METHOD CPyRef CPyLong_FromInt16( Int16 value); MAXON_METHOD CPyRef CPyInt_FromUInt16( UInt16 value); // Changed to MAXON_METHOD CPyRef CPyLong_FromUInt16( UInt16 value); MAXON_METHOD CPyRef CPyInt_FromInt32( Int32 value); // Changed to MAXON_METHOD CPyRef CPyLong_FromInt32( Int32 value); MAXON_METHOD CPyRef CPyInt_FromUInt32( UInt32 value); // Changed to MAXON_METHOD CPyRef CPyLong_FromUInt32( UInt32 value); MAXON_METHOD CPyRef CPyInt_FromInt64( Int64 value); // Changed to MAXON_METHOD CPyRef CPyLong_FromInt64( Int64 value); MAXON_METHOD CPyRef CPyInt_FromUInt64( UInt64 value); // Changed to MAXON_METHOD CPyRef CPyLong_FromUInt64( UInt64 value); MAXON_METHOD Int16 CPyInt_AsInt16( const CPyRef& o); // Changed to MAXON_METHOD Int16 CPyLong_AsInt16( const CPyRef& o); MAXON_METHOD UInt16 CPyInt_AsUInt16( const CPyRef& o); // Changed to MAXON_METHOD UInt16 CPyLong_AsUInt16( const CPyRef& o); MAXON_METHOD Int32 CPyInt_AsInt32( const CPyRef& o); // Changed to MAXON_METHOD Int32 CPyLong_AsInt32( const CPyRef& o); MAXON_METHOD UInt32 CPyInt_AsUInt32( const CPyRef& o); // Changed to MAXON_METHOD UInt32 CPyLong_AsUInt32( const CPyRef& o); MAXON_METHOD Int64 CPyInt_AsInt64( const CPyRef& o); // Changed to MAXON_METHOD Int64 CPyLong_AsInt64( const CPyRef& o); MAXON_METHOD UInt64 CPyInt_AsUInt64( const CPyRef& o); // Changed to MAXON_METHOD UInt64 CPyLong_AsUInt64( const CPyRef& o); MAXON_FUNCTION T CPyInt_As( const CPyRef& o); // Changed to MAXON_FUNCTION T CPyLong_As( const CPyRef& o); MAXON_FUNCTION CPyRef CPyInt_From(std::enable_if_t< STD_IS_REPLACEMENT (same, T, Int32 ), Int32 > o); // Changed to MAXON_FUNCTION CPyRef CPyLong_From(std::enable_if_t<std::is_same<T, Int32>::value, Int32 > o); MAXON_FUNCTION CPyRef CPyInt_From(std::enable_if_t< STD_IS_REPLACEMENT (same, T, Int64 ), Int64 > o); // Changed to MAXON_FUNCTION CPyRef CPyLong_From(std::enable_if_t<std::is_same<T, Int64>::value, Int64 > o); MAXON_METHOD Result<void> CPyMem_SetAllocator( CPyMemAllocatorDomain domain, CPyMemAllocatorEx* allocator);
// Removed MAXON_METHOD Int32 * CPy_UseClassExceptionsFlag();
// Removed MAXON_METHOD Int32 * CPy_TabcheckFlag();
// Removed MAXON_METHOD Int32 * CPy_UnicodeFlag();
// Removed MAXON_METHOD Int32 * CPy_DivisionWarningFlag();
// Removed MAXON_METHOD Int32 * CPy_QnewFlag();
// Removed MAXON_METHOD Int32 * CPy_Py3kWarningFlag();
// Removed MAXON_METHOD Int32 * CPy_CheckInterval(); MAXON_METHOD CPyTypeConstRef CPyString_Type(); // Changed to MAXON_METHOD CPyTypeConstRef CPyUnicode_Type();
// Removed MAXON_METHOD CPyTypeConstRef CPyInt_Type(); MAXON_METHOD const PyChar * ConvertAndCacheString( const String & str, const StringEncodingRef& encoding); // Changed to MAXON_METHOD const PyChar * ConvertAndCacheString( const String & str, PyStringEncodings encoding, UInt * size = nullptr ); } class PyModuleInterface : MAXON_INTERFACE_BASES (LibraryInterface) { MAXON_METHOD Result<void> GetFunctions27(BaseArray<NativePyCFunctionTable>& functions); // Changed to MAXON_METHOD Result<void> GetFunctions37(BaseArray<NativePyCFunctionTable>& functions); } template < typename T> MAXON_FUNCTION T CPythonLibraryInterface::CPyInt_As( const CPyRef& o) // Changed to template < typename T> MAXON_FUNCTION T CPythonLibraryInterface::CPyLong_As( const CPyRef& o) template < typename T> MAXON_FUNCTION CPyRef CPythonLibraryInterface::CPyInt_From(std::enable_if_t< STD_IS_REPLACEMENT (same, T, Int32 ), Int32 > o) // Changed to template < typename T> MAXON_FUNCTION CPyRef CPythonLibraryInterface::CPyLong_From(std::enable_if_t<std::is_same<T, Int32>::value, Int32 > o) template < typename T> MAXON_FUNCTION CPyRef CPythonLibraryInterface::CPyInt_From(std::enable_if_t< STD_IS_REPLACEMENT (same, T, Int64 ), Int64 > o) // Changed to template < typename T> MAXON_FUNCTION CPyRef CPythonLibraryInterface::CPyLong_From(std::enable_if_t<std::is_same<T, Int64>::value, Int64 > o) } namespace CPythonLibs { MAXON_DECLARATION (Class<LibraryRef>, Lib27, "net.maxon.python.cpythonlibs.cpy27" ); // Changed to MAXON_DECLARATION (Class<LibraryRef>, Lib37, "net.maxon.python.cpythonlibs.cpy37" ); }
// Removed #define Python27Output(formatString, ...)
#define Python37Output(formatString, ...) enum class PYTHONFLAG { // Removed USECLASSEXCEPTIONS = 1 << 8,// Removed TABCHECK = 1 << 10,
// Removed UNICODE_ = 1 << 11,
// Removed QNEW = 1 << 16, }
maxon/cpython27_raw.h changed to maxon/cpython37_raw.h
namespace maxon::py27 // Changed to namespace maxon ::py37 struct TpFlags { // Removed static const Int64 INT_SUBCLASS = (1L << 23); } struct NativePyModuleDefBase : public NativePyObject { NativePyObject * (*m_init)(void); Int m_index = 0; NativePyObject * m_copy = nullptr ; }; struct NativePyCodeObject { Int32 co_kwonlyargcount; // #keyword only arguments Int32 co_firstlineno; // first source line number Int * co_cell2arg; // Maps cell vars which are arguments void * co_extra; } class NativePyErr_StackItem { NativePyObject * exc_type; NativePyObject * exc_value; NativePyObject * exc_traceback; NativePyErr_StackItem* previous_item = nullptr ; } struct NativePyThreadState { struct _ts *prev = nullptr ; Int32 recursion_depth; // Changed to Int32 recursion_depth = 0; Char overflowed = 0; Char recursion_critical = 0; Int32 stackcheck_counter = 0;// Removed NativePyObject *curexc_type;
// Removed NativePyObject *curexc_value;
// Removed NativePyObject *curexc_traceback;
// Removed NativePyObject *exc_type;
// Removed NativePyObject *exc_value;
// Removed NativePyObject *exc_traceback; NativePyErr_StackItem _exc_state; NativePyErr_StackItem exc_info; NativePyObject *dict; // Changed to NativePyObject *dict = nullptr ;
// Removed Int32 tick_counter; Int32 gilstate_counter; // Changed to Int32 gilstate_counter = 0; void(*on_delete)( void *); void *on_delete_data; Int32 coroutine_origin_tracking_depth = 0; NativePyObject * coroutine_wrapper = nullptr ; Int32 in_coroutine_wrapper = 0; NativePyObject * async_get_firstiter = nullptr ; NativePyObject * async_gen_finalizer = nullptr ; NativePyObject * context = nullptr ; UInt64 context_ver = 0; UInt64 id; } struct NativePyFrameObject { Char f_trace_lines = 0; Char f_trace_opcodes = 0;
// Removed NativePyObject *f_exc_type, *f_exc_value, *f_exc_traceback;
// Removed NativePyThreadState *f_tstate; NativePyObject * f_gen = nullptr ; Char f_executing = 0; } struct NativePyTypeObject { void * tp_finalize = nullptr ; }
// Removed #if defined(MAXON_TARGET_LINUX)// Removed #ifdef MAXON_TARGET_64BIT
// Removed #define LIBSDIRECTORY "linux64"
// Removed #else
// Removed #define LIBSDIRECTORY "linux32"
// Removed #endif
// Removed #elif defined(_WINDOWS)
// Removed #ifdef MAXON_TARGET_64BIT
// Removed #define LIBSDIRECTORY "win64"
// Removed #else
// Removed #define LIBSDIRECTORY "win32"
// Removed #endif
// Removed #elif defined(__APPLE__)
// Removed #define LIBSDIRECTORY "osx"
// Removed #endif enum class PYTHONFLAG { USECLASSEXCEPTIONS = 1 << 8, // Changed to // USECLASSEXCEPTIONS = 1 << 8, TABCHECK = 1 << 10, // Changed to // TABCHECK = 1 << 10, UNICODE_ = 1 << 11, // Changed to // UNICODE_ = 1 << 11, QNEW = 1 << 16, // Changed to // QNEW = 1 << 16, }
MAXON_REGISTRY (Class<CPyRef>, CPyReferences27, "net.maxon.python.registry.pyreferences27" ); // Changed to MAXON_REGISTRY (Class<CPyRef>, CPyReferences37, "net.maxon.python.registry.pyreferences37" ); namespace CPyReferences27 // Changed to namespace CPyReferences37 { MAXON_DECLARATION (Class<CPyRef>, CPy, "net.maxon.python.pyreference27.cpy" ); //Changed to MAXON_DECLARATION (Class<CPyRef>, CPy, "net.maxon.python.pyreference37.cpy" ); MAXON_DECLARATION (Class<CPyTypeRef>, CPyType, "net.maxon.python.pyreference27.cpytype" ); //Changed to MAXON_DECLARATION (Class<CPyTypeRef>, CPyType, "net.maxon.python.pyreference37.cpytype" ); MAXON_DECLARATION (Class<CPyFrameRef>, CPyFrame, "net.maxon.python.pyreference27.cpyframe" ); //Changed to MAXON_DECLARATION (Class<CPyFrameRef>, CPyFrame, "net.maxon.python.pyreference37.cpyframe" ); MAXON_DECLARATION (Class<CPyTracebackRef>, CPyTraceback, "net.maxon.python.pyreference27.cpytraceback" ); //Changed to MAXON_DECLARATION (Class<CPyTracebackRef>, CPyTraceback, "net.maxon.python.pyreference37.cpytraceback" ); MAXON_DECLARATION (Class<CPyCodeRef>, CPyCode, "net.maxon.python.pyreference27.cpycode" ); //Changed to MAXON_DECLARATION (Class<CPyCodeRef>, CPyCode, "net.maxon.python.pyreference37.cpycode" ); MAXON_DECLARATION (Class<MPyClassRef>, MPyClass, "net.maxon.python.pyreference27.mpyclass" ); //Changed to MAXON_DECLARATION (Class<MPyClassRef>, MPyClass, "net.maxon.python.pyreference37.mpyclass" ); MAXON_DECLARATION (Class<MPyMemberRef>, MPyMember, "net.maxon.python.pyreference27.mpymember" ); //Changed to MAXON_DECLARATION (Class<MPyMemberRef>, MPyMember, "net.maxon.python.pyreference37.mpymember" ); MAXON_DECLARATION (Class<MPyFunctionRef>, MPyFunction, "net.maxon.python.pyreference27.mpyfunction" ); //Changed to MAXON_DECLARATION (Class<MPyFunctionRef>, MPyFunction, "net.maxon.python.pyreference37.mpyfunction" ); MAXON_DECLARATION (Class<MPyDataTypeRef>, MPyDataType, "net.maxon.python.pyreference27.mpydatatype" ); //Changed to MAXON_DECLARATION (Class<MPyDataTypeRef>, MPyDataType, "net.maxon.python.pyreference37.mpydatatype" ); MAXON_DECLARATION (Class<MPyDataRef>, MPyData, "net.maxon.python.pyreference27.mpydata" ); //Changed to MAXON_DECLARATION (Class<MPyDataRef>, MPyData, "net.maxon.python.pyreference37.mpydata" ); MAXON_DECLARATION (Class<MPyCallerContextRef>, MPyCallerContext, "net.maxon.python.pyreference27.mpycallercontext" ); // Changed to MAXON_DECLARATION (Class<MPyCallerContextRef>, MPyCallerContext, "net.maxon.python.pyreference37.mpycallercontext" ); } { enum class DEFAULTRUNTIME { // Removed SYSTEM_27,// Removed SYSTEM_36,
// #ifdef MAXON_TARGET_WINDOWS // Removed DEBUG_27_VS2008, // For Windows Only // Removed DEBUG_27_VS2013, // For Windows Only // Removed DEBUG_27_VS2015, // For Windows Only DEBUG_36_VS2015, // For Windows Only // Changed to DEBUG_37_VS2015 , // For Windows Only
// Removed RELEASE_27_VS2008, // For Windows Only
// Removed RELEASE_27_VS2015, // For Windows Only RELEASE_36_VS2015, // For Windows Only // Changed to RELEASE_37_VS2015 , // For Windows Only
// #else // Removed DEBUG_27,
// Removed RELEASE_27, DEBUG_36, // Changed to DEBUG_37 , RELEASE_36, // Changed to RELEASE_37 , // #endif
// Removed DEFAULT_27, // auto detect of debug (and vs version on win) DEFAULT_36, // auto detect of debug (and vs version on win) // Changed to DEFAULT_37 , // auto detect of debug (and vs version on win) DEFAULT } MAXON_ENUM_LIST ( DEFAULTRUNTIME ); #define MAXON_CPYTHONVM() maxon::PythonVms::Get(maxon::Id("net.maxon.python.virtualmachine.c4dpy27")) // Changed to #define MAXON_CPYTHONVM() maxon::PythonVms::Get(maxon::Id("net.maxon.python.virtualmachine.c4dpy37"))
// Removed #define MAXON_CPYTHON27VM() maxon::PythonVms::Get(maxon::Id("net.maxon.python.virtualmachine.c4dpy27"))
#define MAXON_CPYTHON37VM() maxon::PythonVms::Get(maxon::Id("net.maxon.python.virtualmachine.c4dpy37")) }