Changeset 79824 in vbox for trunk/src/VBox

Timestamp:

Jul 16, 2019 8:30:59 PM (5 years ago)

Author:

vboxsync

Message:

Dhcpd: Build fix for newer compilers. bugref:9288

Location:

trunk/src/VBox/NetworkServices/Dhcpd

Files:

• Config.cpp (modified) (6 diffs)
• Config.h (modified) (6 diffs)

trunk/src/VBox/NetworkServices/Dhcpd/Config.cpp

@@ -1264 +1264 @@
 
 bool GroupConditionMAC::match(const ClientId &a_ridClient, const OptVendorClassId &a_ridVendorClass,
-                              const OptUserClassId &a_ridUserClass) const
+                              const OptUserClassId &a_ridUserClass) const RT_NOEXCEPT
 {
     RT_NOREF(a_ridVendorClass, a_ridUserClass);
@@ -1272 +1272 @@
 
 bool GroupConditionMACWildcard::match(const ClientId &a_ridClient, const OptVendorClassId &a_ridVendorClass,
-                                      const OptUserClassId &a_ridUserClass) const
+                                      const OptUserClassId &a_ridUserClass) const RT_NOEXCEPT
 {
     RT_NOREF(a_ridVendorClass, a_ridUserClass);
@@ -1282 +1282 @@
 
 bool GroupConditionVendorClassID::match(const ClientId &a_ridClient, const OptVendorClassId &a_ridVendorClass,
-                                        const OptUserClassId &a_ridUserClass) const
+                                        const OptUserClassId &a_ridUserClass) const RT_NOEXCEPT
 {
     RT_NOREF(a_ridClient, a_ridUserClass);
@@ -1290 +1290 @@
 
 bool GroupConditionVendorClassIDWildcard::match(const ClientId &a_ridClient, const OptVendorClassId &a_ridVendorClass,
-                                                const OptUserClassId &a_ridUserClass) const
+                                                const OptUserClassId &a_ridUserClass) const RT_NOEXCEPT
 {
     RT_NOREF(a_ridClient, a_ridUserClass);
@@ -1298 +1298 @@
 
 bool GroupConditionUserClassID::match(const ClientId &a_ridClient, const OptVendorClassId &a_ridVendorClass,
-                                      const OptUserClassId &a_ridUserClass) const
+                                      const OptUserClassId &a_ridUserClass) const RT_NOEXCEPT
 {
     RT_NOREF(a_ridClient, a_ridVendorClass);
@@ -1306 +1306 @@
 
 bool GroupConditionUserClassIDWildcard::match(const ClientId &a_ridClient, const OptVendorClassId &a_ridVendorClass,
-                                              const OptUserClassId &a_ridUserClass) const
+                                              const OptUserClassId &a_ridUserClass) const RT_NOEXCEPT
 {
     RT_NOREF(a_ridClient, a_ridVendorClass);

trunk/src/VBox/NetworkServices/Dhcpd/Config.h

@@ -144 +144 @@
     int  initCondition(const char *a_pszValue, bool a_fInclusive) RT_OVERRIDE;
     bool match(const ClientId &a_ridClient, const OptVendorClassId &a_ridVendorClass,
-               const OptUserClassId &a_ridUserClass) const RT_OVERRIDE;
+               const OptUserClassId &a_ridUserClass) const RT_NOEXCEPT RT_OVERRIDE;
 };
 
@@ -152 +152 @@
 public:
     bool match(const ClientId &a_ridClient, const OptVendorClassId &a_ridVendorClass,
-               const OptUserClassId &a_ridUserClass) const RT_OVERRIDE;
+               const OptUserClassId &a_ridUserClass) const RT_NOEXCEPT RT_OVERRIDE;
 };
 
@@ -160 +160 @@
 public:
     bool match(const ClientId &a_ridClient, const OptVendorClassId &a_ridVendorClass,
-               const OptUserClassId &a_ridUserClass) const RT_OVERRIDE;
+               const OptUserClassId &a_ridUserClass) const RT_NOEXCEPT RT_OVERRIDE;
 };
 
@@ -168 +168 @@
 public:
     bool match(const ClientId &a_ridClient, const OptVendorClassId &a_ridVendorClass,
-               const OptUserClassId &a_ridUserClass) const RT_OVERRIDE;
+               const OptUserClassId &a_ridUserClass) const RT_NOEXCEPT RT_OVERRIDE;
 };
 
@@ -176 +176 @@
 public:
     bool match(const ClientId &a_ridClient, const OptVendorClassId &a_ridVendorClass,
-               const OptUserClassId &a_ridUserClass) const RT_OVERRIDE;
+               const OptUserClassId &a_ridUserClass) const RT_NOEXCEPT RT_OVERRIDE;
 };
 
@@ -184 +184 @@
 public:
     bool match(const ClientId &a_ridClient, const OptVendorClassId &a_ridVendorClass,
-               const OptUserClassId &a_ridUserClass) const RT_OVERRIDE;
+               const OptUserClassId &a_ridUserClass) const RT_NOEXCEPT RT_OVERRIDE;
 };