Browse Source

Merge branch 'develop'

develop
Eyck Jentzsch 2 weeks ago
parent
commit
0a53c0af03
2 changed files with 5 additions and 5 deletions
  1. 3
    3
      cmake/FindClangFormat.cmake
  2. 2
    2
      incl/scc/sc_owning_signal.h

+ 3
- 3
cmake/FindClangFormat.cmake View File

@@ -13,10 +13,10 @@ if(CLANG_FORMAT_ROOT_DIR)
PATHS
"${CLANG_FORMAT_ROOT_DIR}"
NO_DEFAULT_PATH)
else()
find_program(CLANG_FORMAT_BIN NAMES ${CLANG_FORMAT_BIN_NAME})
endif()

find_program(CLANG_FORMAT_BIN NAMES ${CLANG_FORMAT_BIN_NAME})

include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(
ClangFormat
@@ -26,7 +26,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(
mark_as_advanced(
CLANG_FORMAT_BIN)

if(CLANG_FORMAT_FOUND)
if(ClangFormat_FOUND)
# A CMake script to find all source files and setup clang-format targets for them
include(clang-format)
else()

+ 2
- 2
incl/scc/sc_owning_signal.h View File

@@ -33,10 +33,10 @@ public: // constructors and destructor:
: sc_core::sc_signal<T*, POL>(sc_core::sc_gen_unique_name("signal")) {}

explicit sc_owning_signal(const char* name_)
: sc_core::sc_signal<T*, POL>(name_) {}
: sc_core::sc_signal<T*, POL>(name_, nullptr) {}

sc_owning_signal(const char* name_, T* initial_value_)
: sc_core::sc_signal<T*, POL>(name_) {}
: sc_core::sc_signal<T*, POL>(name_, initial_value_) {}

virtual ~sc_owning_signal() {}


Loading…
Cancel
Save