Convert C-style casts to C++-style

diff --git a/source/file.h b/source/file.h
index df5105daaade7f83a1496f80bb8476cbd75eb40a..4e86e29642c47dd35b52b0978b6b7be7b38d05f8 100644 (file)
--- a/source/file.h
+++ b/source/file.h
@@ -55,13 +55,13 @@ protected:
 };
 
 inline File::CreateMode operator|(File::CreateMode m, File::CreateMode n)
 };
 
 inline File::CreateMode operator|(File::CreateMode m, File::CreateMode n)

-{ return File::CreateMode((int)m|(int)n); }
+{ return File::CreateMode(static_cast<int>(m)|static_cast<int>(n)); }

 
 inline File::CreateMode operator&(File::CreateMode m, File::CreateMode n)
 
 inline File::CreateMode operator&(File::CreateMode m, File::CreateMode n)

-{ return File::CreateMode((int)m&(int)n); }
+{ return File::CreateMode(static_cast<int>(m)&static_cast<int>(n)); }

 
 inline File::CreateMode operator~(File::CreateMode m)
 
 inline File::CreateMode operator~(File::CreateMode m)

-{ return File::CreateMode(~(int)m); }
+{ return File::CreateMode(~static_cast<int>(m)); }

 
 typedef Filtered<File, Buffered> BufferedFile;
 
 
 typedef Filtered<File, Buffered> BufferedFile;
 

diff --git a/source/mode.h b/source/mode.h
index 1d944b11b3326bd64bf0e3ad3aeebd0d99d2492a..c58ecb0bd55894474b5b828859a7ea9939d5bef0 100644 (file)
--- a/source/mode.h
+++ b/source/mode.h
@@ -21,13 +21,13 @@ enum Mode
 };
 
 inline Mode operator|(Mode m, Mode n)
 };
 
 inline Mode operator|(Mode m, Mode n)

-{ return Mode((int)m|(int)n); }
+{ return Mode(static_cast<int>(m)|static_cast<int>(n)); }

 
 inline Mode operator&(Mode m, Mode n)
 
 inline Mode operator&(Mode m, Mode n)

-{ return Mode((int)m&(int)n); }
+{ return Mode(static_cast<int>(m)&static_cast<int>(n)); }

 
 inline Mode operator~(Mode m)
 
 inline Mode operator~(Mode m)

-{ return Mode(~(int)m); }
+{ return Mode(~static_cast<int>(m)); }

 
 } // namespace IO
 } // namespace Msp
 
 } // namespace IO
 } // namespace Msp

diff --git a/source/poll.h b/source/poll.h
index 6ac6149b155b1634b9835a87233342e51fdd25b1..3bc14701d487ffccad35e4d8740996642595346b 100644 (file)
--- a/source/poll.h
+++ b/source/poll.h
@@ -31,13 +31,13 @@ enum PollEvent
 };
 
 inline PollEvent operator|(PollEvent e, PollEvent f)
 };
 
 inline PollEvent operator|(PollEvent e, PollEvent f)

-{ return PollEvent((int)e|(int)f); }
+{ return PollEvent(static_cast<int>(e)|static_cast<int>(f)); }

 
 inline PollEvent operator&(PollEvent e, PollEvent f)
 
 inline PollEvent operator&(PollEvent e, PollEvent f)

-{ return PollEvent((int)e&(int)f); }
+{ return PollEvent(static_cast<int>(e)&static_cast<int>(f)); }

 
 inline PollEvent operator~(PollEvent e)
 
 inline PollEvent operator~(PollEvent e)

-{ return PollEvent(~(int)e); }
+{ return PollEvent(~static_cast<int>(e)); }

 
 class Poller
 {
 
 class Poller
 {