Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Change TESTING macro to DAECPP_TESTING to avoid potential clash #56

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

Change TESTING macro to DAECPP_TESTING to avoid potential clash #56

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
91b5794
Change TESTING macro to DAECPP_TESTING to avoid potential clash
ikorotkin Feb 16, 2025
f29b076
Fix comments, update version constants
ikorotkin Feb 24, 2025
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 @@ -44,7 +44,7 @@ include_directories(${PROJECT_SOURCE_DIR}/googletest/googletest/include)

target_link_libraries(${PROJECT_TEST} gtest_main gtest)

target_compile_definitions(${PROJECT_TEST} PRIVATE "TESTING")
target_compile_definitions(${PROJECT_TEST} PRIVATE "DAECPP_TESTING")

include(GoogleTest)
gtest_discover_tests(${PROJECT_TEST})
Expand Down
6 changes: 3 additions & 3 deletions dae-cpp/assert-custom.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ namespace daecpp_namespace_name
* Example:
* WARNING("v = " << v);
*/
#ifdef TESTING
#ifdef DAECPP_TESTING
#define WARNING(msg)
#else
#define WARNING(msg) \
Expand All @@ -54,7 +54,7 @@ namespace daecpp_namespace_name
* Example:
* NOTE("v = " << v);
*/
#ifdef TESTING
#ifdef DAECPP_TESTING
#define NOTE(msg)
#else
#define NOTE(msg) \
Expand All @@ -69,7 +69,7 @@ namespace daecpp_namespace_name
* Example:
* NOTE(verbosity > 1, "v = " << v);
*/
#ifdef TESTING
#ifdef DAECPP_TESTING
#define PRINT(condition, msg)
#else
#define PRINT(condition, msg) \
Expand Down
4 changes: 2 additions & 2 deletions dae-cpp/typedefs.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ enum status
};
} // namespace exit_code

// Unsigned integer type
// Integer type
#ifdef DAECPP_LONG
typedef std::int64_t int_type;
#else
Expand All @@ -77,7 +77,7 @@ typedef autodiff::real1st state_value;
namespace core
{

// Unsigned integer vector
// Integer vector
typedef std::vector<int_type> ivec;

// Floating point (double or single precision) vector
Expand Down
6 changes: 3 additions & 3 deletions dae-cpp/version.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ namespace daecpp_namespace_name
{

// dae-cpp library major version
static constexpr uint16_t version_major{DAECPP_VERSION_MAJOR};
inline constexpr uint16_t version_major{DAECPP_VERSION_MAJOR};

// dae-cpp library minor version
static constexpr uint16_t version_minor{DAECPP_VERSION_MINOR};
inline constexpr uint16_t version_minor{DAECPP_VERSION_MINOR};

// dae-cpp library patch version
static constexpr uint16_t version_patch{DAECPP_VERSION_PATCH};
inline constexpr uint16_t version_patch{DAECPP_VERSION_PATCH};

} // namespace daecpp_namespace_name

Expand Down