move ip_address into rsutils::type namespace

dmipx · Jul 7, 2024 · 87f20ab · 87f20ab
1 parent 03a8fc6
commit 87f20ab
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/third-party/realdds/include/realdds/dds-option.h b/third-party/realdds/include/realdds/dds-option.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include <rsutils/json.h>
-#include <rsutils/string/ip-address.h>
+#include <rsutils/type/ip-address.h>
 
 #include <string>
 #include <vector>
@@ -194,7 +194,7 @@ class dds_ip_option : public dds_string_option
     using super = dds_string_option;
 
 public:
-    using ip_address = rsutils::string::ip_address;
+    using ip_address = rsutils::type::ip_address;
 
     char const * value_type() const override { return "ip-address"; }
 

diff --git a/third-party/realdds/src/dds-option.cpp b/third-party/realdds/src/dds-option.cpp
@@ -585,7 +585,7 @@ json dds_enum_option::to_json() const
 }
 
 
-/*static*/ rsutils::string::ip_address dds_ip_option::check_ip( json const & value )
+/*static*/ dds_ip_option::ip_address dds_ip_option::check_ip( json const & value )
 {
     ip_address ip( value.string_ref() );
     if( ip.is_valid() )

diff --git a/...utils/include/rsutils/string/ip-address.h → ...rsutils/include/rsutils/type/ip-address.h b/...utils/include/rsutils/string/ip-address.h → ...rsutils/include/rsutils/type/ip-address.h
@@ -10,7 +10,7 @@
 
 
 namespace rsutils {
-namespace string {
+namespace type {
 
 
 // An IP address, version 4.
@@ -73,5 +73,5 @@ void from_json( rsutils::json const &, ip_address & );
 // See https://github.com/nlohmann/json#arbitrary-types-conversions
 
 
-}  // namespace string
+}  // namespace type
 }  // namespace rsutils
diff --git a/third-party/rsutils/src/ip-address.cpp b/third-party/rsutils/src/ip-address.cpp
@@ -1,15 +1,15 @@
 // License: Apache 2.0. See LICENSE file in root directory.
 // Copyright(c) 2024 Intel Corporation. All Rights Reserved.
 
-#include <rsutils/string/ip-address.h>
+#include <rsutils/type/ip-address.h>
 #include <rsutils/string/from.h>
 
 #include <rsutils/json.h>
 using rsutils::json;
 
 
 namespace rsutils {
-namespace string {
+namespace type {
 
 
 static bool parse_ip_part( char const *& pch, uint8_t & out_byte ) noexcept
@@ -97,5 +97,5 @@ void from_json( json const & j, ip_address & ip )
 }
 
 
-}  // namespace string
+}  // namespace type
 }  // namespace rsutils