Skip to content

Commit 1efca04

Browse files
committed
Fix/Remove stale comments to RapidJSON which has been replaced
1 parent 936d718 commit 1efca04

7 files changed

Lines changed: 6 additions & 8 deletions

File tree

.github/workflows/Draft-Release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ jobs:
383383
cuda: ${{ env.CUDA }}
384384
run: .github/scripts/install_cuda_el8.sh
385385

386-
# Downgrade CMake for DeVIL and rapidjson. See https://github.com/FLAMEGPU/FLAMEGPU2/issues/1276
386+
# Downgrade CMake for DeVIL. See https://github.com/FLAMEGPU/FLAMEGPU2/issues/1276
387387
- name: Install CMake < 4.0, overwriting the pipx installed version from manylinux
388388
run: |
389389
pipx install --global --force 'cmake<4.0'

.github/workflows/Manylinux_2_28.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
cuda: ${{ env.CUDA }}
104104
run: .github/scripts/install_cuda_el8.sh
105105

106-
# Downgrade CMake for DeVIL and rapidjson. See https://github.com/FLAMEGPU/FLAMEGPU2/issues/1276
106+
# Downgrade CMake for DeVIL. See https://github.com/FLAMEGPU/FLAMEGPU2/issues/1276
107107
- name: Install CMake < 4.0, overwriting the pipx installed version from manylinux
108108
run: |
109109
pipx install --global --force 'cmake<4.0'

cmake/common.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ if(DEFINED CMAKE_CUDA_ARCHITECTURES AND NOT flamegpu_printed_cmake_cuda_architec
2727
endif()
2828

2929
# Ensure that other dependencies are downloaded and available.
30-
# As flamegpu is a static library, linking only only occurs at consumption not generation, so dependent targets must also know of PRIVATE shared library dependencies such as tinyxml2 and rapidjson, as well any intentionally public dependencies (for include dirs)
30+
# As flamegpu is a static library, linking only only occurs at consumption not generation, so dependent targets must also know of PRIVATE shared library dependencies such as tinyxml2, as well any intentionally public dependencies (for include dirs)
3131
include(${CMAKE_CURRENT_LIST_DIR}/dependencies/CCCL.cmake)
3232
include(${CMAKE_CURRENT_LIST_DIR}/dependencies/Jitify.cmake)
3333
include(${CMAKE_CURRENT_LIST_DIR}/dependencies/Tinyxml2.cmake)

include/flamegpu/io/JSONGraphReader.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class JSONGraphReader {
2222
* @param stream CUDA stream (required by directed_graph for synchronising device buffers)
2323
*
2424
* @throws exception::InvalidFilePath If the file cannot be opened for reading
25-
* @throws exception::RapidJSONError If JSON fails for any reason (e.g. structure does not match expectations)
25+
* @throws exception::JSONError If JSON fails for any reason (e.g. structure does not match expectations)
2626
*/
2727
static void loadAdjacencyLike(const std::string &filepath, const std::shared_ptr<detail::CUDAEnvironmentDirectedGraphBuffers> &directed_graph, cudaStream_t stream);
2828
};

include/flamegpu/io/JSONGraphWriter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class JSONGraphWriter {
2323
* @param pretty_print Whether JSON should be human readable (vs minified)
2424
*
2525
* @throws exception::InvalidFilePath If the file cannot be opened for writing
26-
* @throws exception::RapidJSONError If conversion to JSON fails for any reason
26+
* @throws exception::JSONError If conversion to JSON fails for any reason
2727
*/
2828
static void saveAdjacencyLike(const std::string &filepath, const std::shared_ptr<const detail::CUDAEnvironmentDirectedGraphBuffers> &directed_graph, cudaStream_t stream, bool pretty_print = true);
2929
};

include/flamegpu/io/XMLLogger.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,6 @@ class XMLLogger : public Logger{
110110
* @param element The element to set the value of
111111
* @param value The Any to be written
112112
* @param elements The number of individual elements stored in the Any (1 if not an array)
113-
* @tparam T Instance of rapidjson::Writer or subclass (e.g. rapidjson::PrettyWriter)
114-
* @note Templated as can't forward declare rapidjson::Writer<rapidjson::StringBuffer>
115113
*/
116114
void writeAny(tinyxml2::XMLElement *element, const detail::Any &value, unsigned int elements = 1) const;
117115

include/flamegpu/runtime/environment/HostEnvironmentDirectedGraph.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class HostEnvironmentDirectedGraph {
5353
*
5454
* @throws exception::InvalidFilePath If the file cannot be opened for writing
5555
* @throws exception::UnsupportedFileType If the specified file type does not correspond to a known format
56-
* @throws exception::RapidJSONError If conversion to JSON fails for any reason
56+
* @throws exception::JSONError If conversion to JSON fails for any reason
5757
*
5858
* @see importGraph()
5959
*/

0 commit comments

Comments
 (0)