Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add inline to objects in dotenv.h to prevent multiple definition erro… #16

Merged
merged 2 commits into from
Jul 30, 2020
Merged

Add inline to objects in dotenv.h to prevent multiple definition erro… #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0363ffe
Add inline to objects in dotenv.h to prevent multiple definition erro…
Jul 27, 2020
3efa9ea
Change CMAKE_CXX_STANDARD property from 11 to 17 to allow the use of …
Jul 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
cmake_minimum_required(VERSION 3.10)
project(cpp-dotenv VERSION 0.2.0)

set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

#----------------------- LIBRARY CONFIGURATION -------------------------
Expand Down
16 changes: 8 additions & 8 deletions dotenv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,15 +444,15 @@ namespace dotenv
};


const container parser::SP
inline const container parser::SP
{
container::CHAR_MODE::INCLUDE,
SP_C,
TB_C
};


const container parser::UNQUOTED_KEY_CHAR
inline const container parser::UNQUOTED_KEY_CHAR
{
container::CHAR_MODE::EXCLUDE,
CS_C,
Expand All @@ -466,7 +466,7 @@ namespace dotenv
};


const container parser::UNQUOTED_VALUE_CHAR
inline const container parser::UNQUOTED_VALUE_CHAR
{
container::CHAR_MODE::EXCLUDE,
CS_C,
Expand All @@ -479,14 +479,14 @@ namespace dotenv
};


const container parser::UNQUOTED_COMMENT_CHAR
inline const container parser::UNQUOTED_COMMENT_CHAR
{
container::CHAR_MODE::EXCLUDE,
NL_C,
CR_C
};

const std::vector<std::pair<char, char>> parser::ESCAPED_EQUIVALENCES
inline const std::vector<std::pair<char, char>> parser::ESCAPED_EQUIVALENCES
{
{ '?' , '?' },
{ '\'', '\'' },
Expand Down Expand Up @@ -570,9 +570,9 @@ namespace dotenv
};


const std::string dotenv::env_filename = ".env";
dotenv dotenv::_instance;
inline const std::string dotenv::env_filename = ".env";
inline dotenv dotenv::_instance;


dotenv& env = dotenv::instance().load_dotenv();
inline dotenv& env = dotenv::instance().load_dotenv();
}