Hygine cleanups in holders.h

ellismg · ellismg · commit 21567a766221 · 2015-10-26T13:28:11.000-07:00
Use "= delete" syntax to make it clear the IcuHolder copy constructor
and assignment opperators are removed.

Remove superfluous "public" modifier on the struct closers used by the
IcuHolders.
diff --git a/src/corefx/System.Globalization.Native/holders.h b/src/corefx/System.Globalization.Native/holders.h
@@ -34,13 +34,12 @@ class IcuHolder
 
   private:
     T* m_p;
-    IcuHolder(const IcuHolder&);
-    IcuHolder operator=(const IcuHolder&);
+    IcuHolder(const IcuHolder&) = delete;
+    IcuHolder operator=(const IcuHolder&) = delete;
 };
 
 struct UCalendarCloser
 {
-  public:
     void operator()(UCalendar* pCal) const
     {
         ucal_close(pCal);
@@ -49,7 +48,6 @@ struct UCalendarCloser
 
 struct UEnumerationCloser
 {
-  public:
     void operator()(UEnumeration* pEnum) const
     {
         uenum_close(pEnum);
@@ -58,7 +56,6 @@ struct UEnumerationCloser
 
 struct UDateTimePatternGeneratorCloser
 {
-  public:
     void operator()(UDateTimePatternGenerator* pGenerator) const
     {
         udatpg_close(pGenerator);
@@ -67,7 +64,6 @@ struct UDateTimePatternGeneratorCloser
 
 struct UDateFormatCloser
 {
-  public:
     void operator()(UDateFormat* pDateFormat) const
     {
         udat_close(pDateFormat);

Original file line number	Diff line number	Diff line change
`@@ -34,13 +34,12 @@ class IcuHolder`
`34`	`34`
`35`	`35`	`private:`
`36`	`36`	`T* m_p;`
`37`		`- IcuHolder(const IcuHolder&);`
`38`		`- IcuHolder operator=(const IcuHolder&);`
	`37`	`+ IcuHolder(const IcuHolder&) = delete;`
	`38`	`+ IcuHolder operator=(const IcuHolder&) = delete;`
`39`	`39`	`};`
`40`	`40`
`41`	`41`	`struct UCalendarCloser`
`42`	`42`	`{`
`43`		`- public:`
`44`	`43`	`void operator()(UCalendar* pCal) const`
`45`	`44`	`{`
`46`	`45`	`ucal_close(pCal);`
`@@ -49,7 +48,6 @@ struct UCalendarCloser`
`49`	`48`
`50`	`49`	`struct UEnumerationCloser`
`51`	`50`	`{`
`52`		`- public:`
`53`	`51`	`void operator()(UEnumeration* pEnum) const`
`54`	`52`	`{`
`55`	`53`	`uenum_close(pEnum);`
`@@ -58,7 +56,6 @@ struct UEnumerationCloser`
`58`	`56`
`59`	`57`	`struct UDateTimePatternGeneratorCloser`
`60`	`58`	`{`
`61`		`- public:`
`62`	`59`	`void operator()(UDateTimePatternGenerator* pGenerator) const`
`63`	`60`	`{`
`64`	`61`	`udatpg_close(pGenerator);`
`@@ -67,7 +64,6 @@ struct UDateTimePatternGeneratorCloser`
`67`	`64`
`68`	`65`	`struct UDateFormatCloser`
`69`	`66`	`{`
`70`		`- public:`
`71`	`67`	`void operator()(UDateFormat* pDateFormat) const`
`72`	`68`	`{`
`73`	`69`	`udat_close(pDateFormat);`