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

Jump to bottom

Master #188

Closed
wants to merge 4 commits into from
Closed

Master #188

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
e0f76e1
modified dependencies/libcsptr
Nov 16, 2016
ff1d365
Merge remote-tracking branch 'oo/master'
Feb 17, 2017
2d8564e
CMakeLists:git->https
Feb 17, 2017
c02ded1
logging.h:+ static for c++ logging streams
Feb 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Expand Up @@ -37,7 +37,7 @@ find_package(Nanomsg)
find_package(BoxFort)

cr_add_subproject (csptr
GIT "git://github.com/Snaipe/libcsptr#0d52904"
GIT "https://github.com/Snaipe/libcsptr#0d52904"
PATH dependencies/libcsptr
OPTS
-DLIBCSPTR_TESTS=OFF
Expand All @@ -47,7 +47,7 @@ cr_add_subproject (csptr
)

cr_add_subproject (dyncall_s
GIT "git://github.com/Snaipe/dyncall#51e79a8"
GIT "https://github.com/Snaipe/dyncall#51e79a8"
PATH dependencies/dyncall
OPTS
-DLANG_CXX=${LANG_CXX}
Expand All @@ -57,7 +57,7 @@ cr_add_subproject (dyncall_s
)

cr_add_subproject (nanomsg
GIT "git://github.com/nanomsg/nanomsg.git#7e12a20"
GIT "https://github.com/nanomsg/nanomsg.git#7e12a20"
PATH dependencies/nanomsg
OPTS
-DNN_TESTS=OFF
Expand All @@ -70,7 +70,7 @@ cr_add_subproject (nanomsg
)

cr_add_subproject (boxfort PATH dependencies/boxfort
GIT "git://github.com/diacritic/BoxFort.git#7ed0cf2"
GIT "https://github.com/diacritic/BoxFort.git#7ed0cf2"
PATH dependencies/boxfort
OPTS
-DBXF_TESTS=OFF
Expand Down
6 changes: 3 additions & 3 deletions include/criterion/logging.h
View file
Open in desktop
Expand Up @@ -155,9 +155,9 @@ namespace criterion
streambuf buf;
};

stream info { CR_LOG_INFO };
stream warn { CR_LOG_WARNING };
stream error { CR_LOG_ERROR };
static stream info { CR_LOG_INFO };
static stream warn { CR_LOG_WARNING };
static stream error { CR_LOG_ERROR };
} }
#endif

Expand Down