Skip to content

fix multiple definitions if linking multiple object files #1

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

Open
sstiller wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix multiple definitions if linking multiple object files #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions src/cpptempl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
namespace cpptempl {


void SplitString(const std::string& str,
inline void SplitString(const std::string& str,
const char* delim,
std::vector<std::string>* result) {
char *cstr, *p;
Expand Down Expand Up @@ -358,7 +358,7 @@ class auto_data {
// parse_val
//////////////////////////////////////////////////////////////////////////
// will call auto_data copy constructor
auto_data parse_val(std::string key, const auto_data& data) {
inline auto_data parse_val(std::string key, const auto_data& data) {
// quoted string
if (key[0] == '\"') {
size_t index = key.substr(1).find_last_of("\"");
Expand Down Expand Up @@ -579,7 +579,7 @@ class TokenEnd : public Token {
// tokenize
// parses a template into tokens (text, for, if, variable)
//////////////////////////////////////////////////////////////////////////
token_vector tokenize(std::string text) {
inline token_vector tokenize(std::string text) {
token_vector tokens;
while (!text.empty()) {
size_t pos = text.find("{");
Expand Down Expand Up @@ -640,7 +640,7 @@ token_vector tokenize(std::string text) {
// parse_tree
// recursively parses list of tokens into a tree
//////////////////////////////////////////////////////////////////////////
void parse_tree(token_vector* tokens,
inline void parse_tree(token_vector* tokens,
token_vector* tree,
TokenType until = TOKEN_TYPE_NONE) {
while (!tokens->empty()) {
Expand All @@ -662,7 +662,7 @@ void parse_tree(token_vector* tokens,
}


std::string parse(std::string templ_text, const auto_data& data) {
inline std::string parse(std::string templ_text, const auto_data& data) {
token_vector tokens;
tokens = tokenize(templ_text);
token_vector tree;
Expand Down