Fix header dependencies in cpp14_supported lib (#4380)

b/377295011
youtube · Nov 6, 2024 · 5b6beb1 · 5b6beb1
1 parent f285308
commit 5b6beb1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/starboard/nplb/compiler_compliance/cpp14_constexpr.cc b/starboard/nplb/compiler_compliance/cpp14_constexpr.cc
@@ -12,8 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "starboard/configuration.h"
-#include "starboard/types.h"
+#include <stddef.h>
 
 namespace starboard {
 namespace nplb {
@@ -30,8 +29,8 @@ constexpr size_t CompileTimeStringLength(const char* str) {
   return length + 1;
 }
 
-SB_COMPILE_ASSERT(CompileTimeStringLength(kPangram) == sizeof(kPangram),
-                  CompileTimeStringLength_does_not_return_correct_length);
+static_assert(CompileTimeStringLength(kPangram) == sizeof(kPangram),
+              "CompileTimeStringLength does not return correct length");
 }  // namespace
 }  // namespace nplb
 }  // namespace starboard
diff --git a/starboard/nplb/compiler_compliance/cpp14_initialization.cc b/starboard/nplb/compiler_compliance/cpp14_initialization.cc
@@ -13,8 +13,6 @@
 // limitations under the License.
 
 #include <vector>
-#include "starboard/configuration.h"
-#include "starboard/types.h"
 
 namespace starboard {
 namespace nplb {