Skip to content

Mark all single argument constructors as explicit #35

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
divyekapoor wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Mark all single argument constructors as explicit #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
16cbca2
Add a test rule to the Makefile.
divyekapoor May 10, 2017
abcf1ba
Mark single argument constructors as explicit.
divyekapoor May 10, 2017
1f619b5
Fix bad tab in Makefile.
divyekapoor May 10, 2017
16a4013
Use the EXECUTABLE variable in the Makefile.
divyekapoor May 10, 2017
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
8 changes: 6 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,18 @@ OBJECTS=$(SOURCES:src/%.cpp=obj/%.o)
EXECUTABLE=JSONDemo

all: $(SOURCES) $(EXECUTABLE)
$(EXECUTABLE): $(OBJECTS)

$(EXECUTABLE): $(OBJECTS)
$(CC) $(LFLAGS) $(OBJECTS) -o $@

obj/%.o: src/%.cpp $(HEADERS)
@test -d $(@D) || mkdir -p $(@D)
$(CC) $(CFLAGS) $(@:obj/%.o=src/%.cpp) -o $@

test: $(EXECUTABLE)
./$(EXECUTABLE) -t

clean:
rm -f $(OBJECTS) $(EXECUTABLE)

.PHONY: clean test
14 changes: 7 additions & 7 deletions src/JSONValue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ class JSONValue

public:
JSONValue(/*NULL*/);
JSONValue(const wchar_t *m_char_value);
JSONValue(const std::wstring &m_string_value);
JSONValue(bool m_bool_value);
JSONValue(double m_number_value);
JSONValue(int m_integer_value);
JSONValue(const JSONArray &m_array_value);
JSONValue(const JSONObject &m_object_value);
explicit JSONValue(const wchar_t *m_char_value);
explicit JSONValue(const std::wstring &m_string_value);
explicit JSONValue(bool m_bool_value);
explicit JSONValue(double m_number_value);
explicit JSONValue(int m_integer_value);
explicit JSONValue(const JSONArray &m_array_value);
explicit JSONValue(const JSONObject &m_object_value);
JSONValue(const JSONValue &m_source);
~JSONValue();

Expand Down