Add and use StringToIntOrDefault #590
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
LGTM |
|
I'll skip enabling strict for now I think. |
| @@ -133,15 +133,12 @@ bool FtdiDmxPlugin::SetDefaultPreferences() { | |||
|
|
|||
|
|
|||
| /** | |||
| * Return the frequency as specified in the config file. | |||
| * @brief Return the frequency as specified in the config file or the default if | |||
| * invalid | |||
| */ | |||
| int unsigned FtdiDmxPlugin::GetFrequency() { | |||
There was a problem hiding this comment.
Does this still need to be a separate method now?
There was a problem hiding this comment.
Done. Should even provide a minor optimisation.
| @@ -21,8 +21,8 @@ common_protocol_libolaproto_la_CXXFLAGS = $(COMMON_CXXFLAGS_ONLY_WARNINGS) | |||
|
|
|||
| common_libolacommon_la_LIBADD += common/protocol/libolaproto.la | |||
|
|
|||
| common/protocol/Ola.pb.cc common/protocol/Ola.pb.h: common/protocol/Ola.proto | |||
| common/protocol/Ola.pb.cc common/protocol/Ola.pb.h: common/protocol/Makefile.mk common/protocol/Ola.proto | |||
There was a problem hiding this comment.
I seem to remember removing this because it was causing a lot of things to get rebuilt on each pass through autoconf. That doesn't make sense though as the Makefile.mk should be static.
Can you just confirm?
There was a problem hiding this comment.
I started investigating this because include/ola/plugin_id.h kept getting rebuilt while tweaking the doxygen files stuff.
I can confirm it only gets rebuilt if the files listed are touched and not if Makefile is.
|
LGTM |
peternewman
added a commit
that referenced
this pull request
Jan 4, 2015
Add and use StringToIntOrDefault
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.