sfxsfl 8 месяцев назад
Родитель
Сommit
aee84d8dca

+ 1 - 0
Callback_19/Callback_19.cpp

@@ -146,6 +146,7 @@ struct cb_event_t
 class EventDriver
 {
 public:
+
 	EventDriver(myData& val) : val_(val), callbacks_()
 	{
 	}

+ 8 - 4
Callback_19/Callback_19.vcxproj

@@ -29,26 +29,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -88,6 +88,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -102,6 +103,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -116,6 +118,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -130,6 +133,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

BIN
Callback_19/Debug/Callback_19.exe


BIN
Callback_19/Debug/Callback_19.ilk


BIN
Callback_19/Debug/Callback_19.obj


BIN
Callback_19/Debug/Callback_19.pdb


BIN
Callback_19/Debug/Callback_19.tlog/CL.command.1.tlog


BIN
Callback_19/Debug/Callback_19.tlog/CL.read.1.tlog


BIN
Callback_19/Debug/Callback_19.tlog/CL.write.1.tlog


+ 1 - 1
Callback_19/Debug/Callback_19.tlog/Callback_19.lastbuildstate

@@ -1,2 +1,2 @@
-PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.29.30133:VCServicingVersionMFC=14.29.30136:VCServicingVersionCrtHeaders=14.29.30136:TargetPlatformVersion=10.0.17763.0:
+PlatformToolSet=v143:VCToolArchitecture=Native32Bit:VCToolsVersion=14.32.31326:TargetPlatformVersion=10.0.19041.0:
 Debug|Win32|C:\Users\wruser\source\repos\Callback_19\|

BIN
Callback_19/Debug/Callback_19.tlog/link.read.1.tlog


BIN
Callback_31/.vs/Callback_31/FileContentIndex/c715d0d7-a8f0-4df8-93e7-a0b826cb7953.vsidx


BIN
Callback_31/.vs/Callback_31/v17/.suo


BIN
Callback_31/.vs/Callback_31/v17/Browse.VC.db


+ 8 - 4
Callback_31/Callback_31/Callback_31.cpp

@@ -4,11 +4,14 @@
 using std::cout;
 using std::endl;
 
+class NodeBase {
+    int val = 32; 
+};
 
 /**********************************************************************************************
  *
  */
-class MyClass
+class MyClass : NodeBase
 {
 public:
     MyClass() {
@@ -25,7 +28,7 @@ private:
 /**********************************************************************************************
  *
  */
-class YourClass
+class YourClass : NodeBase
 {
 public:
     YourClass()
@@ -40,7 +43,7 @@ private:
 /**********************************************************************************************
  *
  */
-class AnotherClass
+class AnotherClass : NodeBase
 {
 public:
     AnotherClass() {
@@ -77,7 +80,7 @@ class EventHandler
 {
 public:
 
-    std::function<void(MyClass *, YourClass *)> cb = nullptr;
+    std::function<void(NodeBase *, NodeBase *)> cb = nullptr;
 
     template<typename T1, typename T2>
     void addHandler(T1* a, T2* b, std::function<void(T1*, T2*)> callback)
@@ -86,6 +89,7 @@ public:
         auto cb1 = callback;
         auto t1 = a;
         auto t2 = b; 
+        // cb = callback;
     }
 
     template<typename T1, typename T2>

BIN
Callback_31/Callback_31/x64/Debug/Callback_31.ilk


BIN
Callback_31/Callback_31/x64/Debug/Callback_31.obj


BIN
Callback_31/Callback_31/x64/Debug/vc143.idb


BIN
Callback_31/Callback_31/x64/Debug/vc143.pdb


BIN
Callback_31/x64/Debug/Callback_31.exe


BIN
Callback_31/x64/Debug/Callback_31.pdb