File tree Expand file tree Collapse file tree 3 files changed +20
-19
lines changed Expand file tree Collapse file tree 3 files changed +20
-19
lines changed Original file line number Diff line number Diff line change @@ -1997,17 +1997,17 @@ public void TestPointerToClass()
1997
1997
}
1998
1998
1999
1999
[ Test ]
2000
- public void TestObjectPassByValue1451 ( )
2000
+ public void TestCallByValueCopyConstructor ( )
2001
2001
{
2002
- using ( var s = new Issue1451 ( ) )
2002
+ using ( var s = new CallByValueCopyConstructor ( ) )
2003
2003
{
2004
2004
s . A = 500 ;
2005
- Assert . IsTrue ( CSharp . CSharp . TestObjectPassByValue ( s ) ) ;
2005
+ CSharp . CSharp . CallByValueCopyConstructorFunction ( s ) ;
2006
2006
Assert . That ( s . A , Is . EqualTo ( 500 ) ) ;
2007
2007
}
2008
2008
2009
- Assert . That ( Issue1451 . ConstructorCalls , Is . EqualTo ( 1 ) ) ;
2010
- Assert . That ( Issue1451 . CopyConstructorCalls , Is . EqualTo ( 1 ) ) ;
2011
- Assert . That ( Issue1451 . DestructorCalls , Is . EqualTo ( 2 ) ) ;
2009
+ Assert . That ( CallByValueCopyConstructor . ConstructorCalls , Is . EqualTo ( 1 ) ) ;
2010
+ Assert . That ( CallByValueCopyConstructor . CopyConstructorCalls , Is . EqualTo ( 1 ) ) ;
2011
+ Assert . That ( CallByValueCopyConstructor . DestructorCalls , Is . EqualTo ( 2 ) ) ;
2012
2012
}
2013
2013
}
Original file line number Diff line number Diff line change @@ -1791,29 +1791,29 @@ bool PointerTester::IsValid()
1791
1791
}
1792
1792
1793
1793
PointerTester* PointerToClass = &internalPointerTesterInstance;
1794
- int Issue1451::constructorCalls = 0 ;
1795
- int Issue1451::destructorCalls = 0 ;
1796
- int Issue1451::copyConstructorCalls = 0 ;
1797
1794
1798
- Issue1451::Issue1451 ()
1795
+ int CallByValueCopyConstructor::constructorCalls = 0 ;
1796
+ int CallByValueCopyConstructor::destructorCalls = 0 ;
1797
+ int CallByValueCopyConstructor::copyConstructorCalls = 0 ;
1798
+
1799
+ CallByValueCopyConstructor::CallByValueCopyConstructor ()
1799
1800
{
1800
1801
a = 0 ;
1801
1802
constructorCalls++;
1802
1803
}
1803
1804
1804
- Issue1451::Issue1451 (const Issue1451 & other)
1805
+ CallByValueCopyConstructor::CallByValueCopyConstructor (const CallByValueCopyConstructor & other)
1805
1806
{
1806
1807
a = other.a ;
1807
1808
copyConstructorCalls++;
1808
1809
}
1809
1810
1810
- Issue1451 ::~Issue1451 ()
1811
+ CallByValueCopyConstructor ::~CallByValueCopyConstructor ()
1811
1812
{
1812
1813
destructorCalls++;
1813
1814
}
1814
1815
1815
- bool TestObjectPassByValue (Issue1451 s)
1816
+ void CallByValueCopyConstructorFunction (CallByValueCopyConstructor s)
1816
1817
{
1817
1818
s.a = 99999 ;
1818
- return true ;
1819
1819
}
Original file line number Diff line number Diff line change @@ -1603,15 +1603,16 @@ class DLL_API PointerTester
1603
1603
};
1604
1604
1605
1605
DLL_API extern PointerTester* PointerToClass;
1606
- struct DLL_API Issue1451 {
1606
+
1607
+ struct DLL_API CallByValueCopyConstructor {
1607
1608
int a;
1608
1609
static int constructorCalls;
1609
1610
static int destructorCalls;
1610
1611
static int copyConstructorCalls;
1611
1612
1612
- Issue1451 ();
1613
- ~Issue1451 ();
1614
- Issue1451 (const Issue1451 & other);
1613
+ CallByValueCopyConstructor ();
1614
+ ~CallByValueCopyConstructor ();
1615
+ CallByValueCopyConstructor (const CallByValueCopyConstructor & other);
1615
1616
};
1616
1617
1617
- bool DLL_API TestObjectPassByValue (Issue1451 s);
1618
+ DLL_API void CallByValueCopyConstructorFunction (CallByValueCopyConstructor s);
You can’t perform that action at this time.
0 commit comments