Imported Upstream version 1.58.0upstream/1.58.0

Change-Id: If0072143aa26874812e0db6872e1efb10a3e5e94
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

6 files changed, 46 insertions, 29 deletions

diff --git a/boost/units/systems/information/bit.hpp b/boost/units/systems/information/bit.hpp
index 5d97118034..bd8f34bb8a 100644
--- a/boost/units/systems/information/bit.hpp
+++ b/boost/units/systems/information/bit.hpp
@@ -7,8 +7,8 @@
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_UNITS_INFORMATION_BIT_HPP
-#define BOOST_UNITS_INFORMATION_BIT_HPP
+#ifndef BOOST_UNITS_SYSTEMS_INFORMATION_BIT_HPP_INCLUDED
+#define BOOST_UNITS_SYSTEMS_INFORMATION_BIT_HPP_INCLUDED
 
 #include <boost/units/systems/information/byte.hpp>
 #include <boost/units/base_units/information/bit.hpp>
@@ -20,11 +20,14 @@ namespace information {
 namespace hu {
 namespace bit {
 typedef unit<information_dimension, make_system<bit_base_unit>::type> info;
-}}
+} // namespace bit
+} // namespace hu
 
 BOOST_UNITS_STATIC_CONSTANT(bit, hu::bit::info);
 BOOST_UNITS_STATIC_CONSTANT(bits, hu::bit::info);
 
-}}}
+} // namespace information
+} // namespace units
+} // namespace boost
 
-#endif
+#endif // BOOST_UNITS_SYSTEMS_INFORMATION_BIT_HPP_INCLUDED
diff --git a/boost/units/systems/information/byte.hpp b/boost/units/systems/information/byte.hpp
index ac80c41093..8ea743cd9d 100644
--- a/boost/units/systems/information/byte.hpp
+++ b/boost/units/systems/information/byte.hpp
@@ -7,8 +7,8 @@
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_UNITS_INFORMATION_BYTE_HPP
-#define BOOST_UNITS_INFORMATION_BYTE_HPP
+#ifndef BOOST_UNITS_SYSTEMS_INFORMATION_BYTE_HPP_INCLUDED
+#define BOOST_UNITS_SYSTEMS_INFORMATION_BYTE_HPP_INCLUDED
 
 #include <boost/units/make_system.hpp>
 #include <boost/units/unit.hpp>
@@ -27,7 +27,8 @@ typedef unit<dimensionless_type, system> dimensionless;
 namespace hu {
 namespace byte {
 typedef unit<information_dimension, system> info;
-}}
+} // namespace bit
+} // namespace hu
 
 BOOST_UNITS_STATIC_CONSTANT(byte, hu::byte::info);
 BOOST_UNITS_STATIC_CONSTANT(bytes, hu::byte::info);
@@ -37,6 +38,8 @@ BOOST_UNITS_STATIC_CONSTANT(bytes, hu::byte::info);
 // must be explicitly referred to
 typedef hu::byte::info info;
 
-}}}
+} // namespace information
+} // namespace units
+} // namespace boost
 
-#endif
+#endif // BOOST_UNITS_SYSTEMS_INFORMATION_BYTE_HPP_INCLUDED
diff --git a/boost/units/systems/information/hartley.hpp b/boost/units/systems/information/hartley.hpp
index 5701614511..d0b25b7bce 100644
--- a/boost/units/systems/information/hartley.hpp
+++ b/boost/units/systems/information/hartley.hpp
@@ -7,8 +7,8 @@
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_UNITS_INFORMATION_HARTLEY_HPP
-#define BOOST_UNITS_INFORMATION_HARTLEY_HPP
+#ifndef BOOST_UNITS_SYSTEMS_INFORMATION_HARTLEY_HPP_INCLUDED
+#define BOOST_UNITS_SYSTEMS_INFORMATION_HARTLEY_HPP_INCLUDED
 
 #include <boost/units/systems/information/byte.hpp>
 #include <boost/units/base_units/information/hartley.hpp>
@@ -20,11 +20,14 @@ namespace information {
 namespace hu {
 namespace hartley {
 typedef unit<information_dimension, make_system<hartley_base_unit>::type> info;
-}}
+} // namespace bit
+} // namespace hu
 
 BOOST_UNITS_STATIC_CONSTANT(hartley, hu::hartley::info);
 BOOST_UNITS_STATIC_CONSTANT(hartleys, hu::hartley::info);
 
-}}}
+} // namespace information
+} // namespace units
+} // namespace boost
 
-#endif
+#endif // BOOST_UNITS_SYSTEMS_INFORMATION_HARTLEY_HPP_INCLUDED
diff --git a/boost/units/systems/information/nat.hpp b/boost/units/systems/information/nat.hpp
index f4430d8ce4..eb24178940 100644
--- a/boost/units/systems/information/nat.hpp
+++ b/boost/units/systems/information/nat.hpp
@@ -7,8 +7,8 @@
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_UNITS_INFORMATION_NAT_HPP
-#define BOOST_UNITS_INFORMATION_NAT_HPP
+#ifndef BOOST_UNITS_SYSTEMS_INFORMATION_NAT_HPP_INCLUDED
+#define BOOST_UNITS_SYSTEMS_INFORMATION_NAT_HPP_INCLUDED
 
 #include <boost/units/systems/information/byte.hpp>
 #include <boost/units/base_units/information/nat.hpp>
@@ -20,11 +20,14 @@ namespace information {
 namespace hu {
 namespace nat {
 typedef unit<information_dimension, make_system<nat_base_unit>::type> info;
-}}
+} // namespace bit
+} // namespace hu
 
 BOOST_UNITS_STATIC_CONSTANT(nat, hu::nat::info);
 BOOST_UNITS_STATIC_CONSTANT(nats, hu::nat::info);
 
-}}}
+} // namespace information
+} // namespace units
+} // namespace boost
 
-#endif
+#endif // BOOST_UNITS_SYSTEMS_INFORMATION_NAT_HPP_INCLUDED
diff --git a/boost/units/systems/information/prefixes.hpp b/boost/units/systems/information/prefixes.hpp
index 52b13618bf..1c092f9ae4 100644
--- a/boost/units/systems/information/prefixes.hpp
+++ b/boost/units/systems/information/prefixes.hpp
@@ -7,8 +7,8 @@
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_UNITS_INFORMATION_PREFIXES_HPP
-#define BOOST_UNITS_INFORMATION_PREFIXES_HPP
+#ifndef BOOST_UNITS_SYSTEMS_INFORMATION_PREFIXES_HPP_INCLUDED
+#define BOOST_UNITS_SYSTEMS_INFORMATION_PREFIXES_HPP_INCLUDED
 
 #include <boost/units/make_scaled_unit.hpp>
 #include <boost/units/static_rational.hpp>
@@ -36,8 +36,10 @@ BOOST_UNITS_INFOSYS_PREFIX(60, exbi);
 BOOST_UNITS_INFOSYS_PREFIX(70, zebi);
 BOOST_UNITS_INFOSYS_PREFIX(80, yobi);
 
-}}}
+} // namespace information
+} // namespace units
+} // namespace boost
 
 #undef BOOST_UNITS_INFOSYS_PREFIX
 
-#endif
+#endif // BOOST_UNITS_SYSTEMS_INFORMATION_PREFIXES_HPP_INCLUDED
diff --git a/boost/units/systems/information/shannon.hpp b/boost/units/systems/information/shannon.hpp
index a2488fbaf3..e3069c953a 100644
--- a/boost/units/systems/information/shannon.hpp
+++ b/boost/units/systems/information/shannon.hpp
@@ -7,8 +7,8 @@
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_UNITS_INFORMATION_SHANNON_HPP
-#define BOOST_UNITS_INFORMATION_SHANNON_HPP
+#ifndef BOOST_UNITS_SYSTEMS_INFORMATION_SHANNON_HPP_INCLUDED
+#define BOOST_UNITS_SYSTEMS_INFORMATION_SHANNON_HPP_INCLUDED
 
 #include <boost/units/systems/information/byte.hpp>
 #include <boost/units/base_units/information/shannon.hpp>
@@ -20,11 +20,14 @@ namespace information {
 namespace hu {
 namespace shannon {
 typedef unit<information_dimension, make_system<shannon_base_unit>::type> info;
-}}
+} // namespace bit
+} // namespace hu
 
 BOOST_UNITS_STATIC_CONSTANT(shannon, hu::shannon::info);
 BOOST_UNITS_STATIC_CONSTANT(shannons, hu::shannon::info);
 
-}}}
+} // namespace information
+} // namespace units
+} // namespace boost
 
-#endif
+#endif // BOOST_UNITS_SYSTEMS_INFORMATION_SHANNON_HPP_INCLUDED