File tree 3 files changed +11
-1
lines changed
GeneralsMD/Code/GameEngine
3 files changed +11
-1
lines changed Original file line number Diff line number Diff line change @@ -531,9 +531,13 @@ class GlobalData : public SubsystemInterface
531
531
GlobalData *newOverride ( void ); /* * create a new override, copy data from previous
532
532
override, and return it */
533
533
534
-
534
+ # if defined(_MSC_VER) && _MSC_VER < 1300
535
535
GlobalData (const GlobalData& that) { DEBUG_CRASH ((" unimplemented" )); }
536
536
GlobalData& operator =(const GlobalData& that) { DEBUG_CRASH ((" unimplemented" )); return *this ; }
537
+ #else
538
+ GlobalData (const GlobalData& that) = delete;
539
+ GlobalData& operator =(const GlobalData& that) = default ;
540
+ #endif
537
541
538
542
};
539
543
Original file line number Diff line number Diff line change @@ -351,10 +351,15 @@ class ThingTemplate : public Overridable
351
351
MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE (ThingTemplate, " ThingTemplatePool" )
352
352
353
353
private:
354
+
355
+ #if defined(_MSC_VER) && _MSC_VER < 1300
354
356
ThingTemplate (const ThingTemplate& that) : m_geometryInfo(that.m_geometryInfo)
355
357
{
356
358
DEBUG_CRASH ((" This should never be called\n " ));
357
359
}
360
+ #else
361
+ ThingTemplate (const ThingTemplate& that) = delete;
362
+ #endif
358
363
359
364
public:
360
365
Original file line number Diff line number Diff line change @@ -1129,6 +1129,7 @@ Bool GlobalData::setTimeOfDay( TimeOfDay tod )
1129
1129
// -------------------------------------------------------------------------------------------------
1130
1130
GlobalData *GlobalData::newOverride ( void )
1131
1131
{
1132
+ // TheSuperHackers @info This copy is not implemented in VS6 builds
1132
1133
GlobalData *override = NEW GlobalData;
1133
1134
1134
1135
// copy the data from the latest override (TheWritableGlobalData) to the newly created instance
You can’t perform that action at this time.
0 commit comments