From 1536b2113cbe2411f55296a3c12c9f17abab7c96 Mon Sep 17 00:00:00 2001 From: BLTA Date: Mon, 2 Dec 2024 08:19:00 -0800 Subject: [PATCH] Fixed build issues --- include/faker-cxx/movie.h | 12 ++++++------ src/modules/movie.cpp | 21 ++++++++++++--------- src/modules/movie_data.h | 24 +++++++++++++----------- 3 files changed, 31 insertions(+), 26 deletions(-) diff --git a/include/faker-cxx/movie.h b/include/faker-cxx/movie.h index d4db0e4c..a0c69d2e 100644 --- a/include/faker-cxx/movie.h +++ b/include/faker-cxx/movie.h @@ -1,15 +1,15 @@ #pragma once #include -#include "faker-cxx/types/locale.h" #include "faker-cxx/export.h" +#include "faker-cxx/types/locale.h" namespace faker::movie { /** * @brief Returns a random movie genre - * + * * @brief Returns a random movie genre. * * @returns Movie genre. @@ -22,7 +22,7 @@ FAKER_CXX_EXPORT std::string_view genre(Locale locale = Locale::en_US); /** * @param locale The locale. Defaults to `Locale::en_US`. - * + * * @brief Returns a random movie title. * * @returns Movie title. @@ -47,7 +47,7 @@ FAKER_CXX_EXPORT std::string_view tvShow(Locale locale = Locale::en_US); /** * @param locale The locale. Defaults to `Locale::en_US`. - * + * * @brief Returns a random movie director name. * * @returns Movie director name. @@ -60,7 +60,7 @@ FAKER_CXX_EXPORT std::string_view director(Locale locale = Locale::en_US); /** * @param locale The locale. Defaults to `Locale::en_US`. - * + * * @brief Returns a random actor name. * * @returns Actor name. @@ -73,7 +73,7 @@ FAKER_CXX_EXPORT std::string_view actor(Locale locale = Locale::en_US); /** * @param locale The locale. Defaults to `Locale::en_US`. - * + * * @brief Returns a random actress name. * * @returns Actress name. diff --git a/src/modules/movie.cpp b/src/modules/movie.cpp index e2d70068..09a4b906 100644 --- a/src/modules/movie.cpp +++ b/src/modules/movie.cpp @@ -1,21 +1,24 @@ #include "faker-cxx/movie.h" + #include + #include "faker-cxx/helper.h" #include "movie_data.h" namespace faker::movie { - namespace +namespace +{ +const struct MovieDefinition& getMovie(Locale locale) +{ + switch (locale) { - const struct MovieDefinition& getMovie(Locale locale) - { - switch (locale) - { - default: - return enUSmoviesDefinitions; - } - } + default: + return enUSmoviesDefinitions; } +} +} + std::string_view genre(Locale locale) { const auto& movie = getMovie(locale); diff --git a/src/modules/movie_data.h b/src/modules/movie_data.h index 3f69f6c5..9cd7d033 100644 --- a/src/modules/movie_data.h +++ b/src/modules/movie_data.h @@ -1,24 +1,25 @@ #pragma once #include -#include #include +#include + #include "faker-cxx/movie.h" namespace faker::movie { - struct MovieDefinition - { - std::span actors; - std::span actresses; - std::span directors; - std::span genres; - std::span movies; - std::span tvShows; - }; +struct MovieDefinition +{ + std::span actors; + std::span actresses; + std::span directors; + std::span genres; + std::span movies; + std::span tvShows; +}; - // "en-us" +// "en-us" const auto enUSactors = std::to_array({ "Aamir Khan", "Abbott and Costello", @@ -1314,5 +1315,6 @@ const MovieDefinition enUSmoviesDefinitions = { .directors = enUSdirectors, .genres = enUSmovieGenres, .movies = enUSmovies, + .tvShows = enUStvShows, }; } \ No newline at end of file