fixed rebase issue with core::Array

Hrick87 · Feb 26, 2024 · 5aada82 · 5aada82
1 parent 92ac7a4
commit 5aada82
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 11 deletions.
diff --git a/src/internal_modules/roc_sndio/ibackend.h b/src/internal_modules/roc_sndio/ibackend.h
@@ -40,7 +40,7 @@ class IBackend {
                                  const char* path,
                                  const Config& config,
                                  core::IArena& arena) = 0;
-
+    //! Returns name of backend.
     virtual const char* name() const = 0;
 };
 

diff --git a/src/internal_modules/roc_sndio/target_sndfile/roc_sndio/sndfile_backend.h b/src/internal_modules/roc_sndio/target_sndfile/roc_sndio/sndfile_backend.h
@@ -36,7 +36,7 @@ class SndfileBackend : public IBackend, core::NonCopyable<> {
                                  const char* path,
                                  const Config& config,
                                  core::IArena& arena);
-
+    //! Returns name of backend.
     virtual const char* name() const;
 };
 

diff --git a/src/internal_modules/roc_sndio/target_sndfile/roc_sndio/sndfile_extension_table.h b/src/internal_modules/roc_sndio/target_sndfile/roc_sndio/sndfile_extension_table.h
@@ -11,11 +11,8 @@
 
 #ifndef ROC_SNDIO_SNDFILE_EXTENSION_TABLE_H_
 #define ROC_SNDIO_SNDFILE_EXTENSION_TABLE_H_
-
-#pragma once
-
-#ifndef ROC_SNDIO_SNDFILE_FILEMAP_H_
-#define ROC_SNDIO_SNDFILE_FILEMAP_H_
+#ifndef ROC_SNDIO_SNDFILE_EXTENSION_TABLE_H_
+#define ROC_SNDIO_SNDFILE_EXTENSION_TABLE_H_
 
 #include "sndfile.h"
 
@@ -33,5 +30,6 @@ static FileMap file_type_map[5] = { { SF_FORMAT_MAT4, "mat4", NULL },
                                     { SF_FORMAT_WAV, "wav", "wav" },
                                     { SF_FORMAT_NIST, "nist", NULL },
                                     { SF_FORMAT_WAVEX, "wavex", NULL } };
+#endif // ROC_SNDIO_SNDFILE_FILEMAP_H_
 
 #endif // ROC_SNDIO_SNDFILE_EXTENSION_TABLE_H_
diff --git a/src/internal_modules/roc_sndio/target_sox/roc_sndio/sox_backend.h b/src/internal_modules/roc_sndio/target_sox/roc_sndio/sox_backend.h
@@ -42,7 +42,7 @@ class SoxBackend : public IBackend, core::NonCopyable<> {
                                  const char* path,
                                  const Config& config,
                                  core::IArena& arena);
-
+    //! Returns name of backend.
     virtual const char* name() const;
 
 private:

diff --git a/src/internal_modules/roc_sndio/wav_backend.h b/src/internal_modules/roc_sndio/wav_backend.h
@@ -35,6 +35,7 @@ class WavBackend : public IBackend, core::NonCopyable<> {
                                  const Config& config,
                                  core::IArena& arena);
 
+    //! Returns name of backend.
     virtual const char* name() const;
 };
 

diff --git a/src/tests/roc_sndio/test_backend_sink.cpp b/src/tests/roc_sndio/test_backend_sink.cpp
@@ -45,7 +45,7 @@ TEST_GROUP(backend_sink) {
 
     bool supports_wav(IBackend & backend) {
         bool supports = false;
-        core::Array<DriverInfo, MaxDrivers> driver_list;
+        core::Array<DriverInfo, MaxDrivers> driver_list(arena);
         backend.discover_drivers(driver_list);
         for (size_t n = 0; n < driver_list.size(); n++) {
             if (strcmp(driver_list[n].name, "wav") == 0) {

diff --git a/src/tests/roc_sndio/test_backend_source.cpp b/src/tests/roc_sndio/test_backend_source.cpp
@@ -53,7 +53,7 @@ core::BufferFactory<audio::sample_t> buffer_factory(arena, MaxBufSize);
 
 bool supports_wav(IBackend& backend) {
     bool supports = false;
-    core::Array<DriverInfo, MaxDrivers> driver_list;
+    core::Array<DriverInfo, MaxDrivers> driver_list(arena);
     backend.discover_drivers(driver_list);
     for (size_t n = 0; n < driver_list.size(); n++) {
         if (strcmp(driver_list[n].name, "wav") == 0) {

diff --git a/src/tests/roc_sndio/test_pump.cpp b/src/tests/roc_sndio/test_pump.cpp
@@ -49,7 +49,7 @@ core::BufferFactory<audio::sample_t> buffer_factory(arena, BufSize);
 
 bool supports_wav(IBackend& backend) {
     bool supports = false;
-    core::Array<DriverInfo, MaxDrivers> driver_list;
+    core::Array<DriverInfo, MaxDrivers> driver_list(arena);
     backend.discover_drivers(driver_list);
     for (size_t n = 0; n < driver_list.size(); n++) {
         if (strcmp(driver_list[n].name, "wav") == 0) {