Move SimpleIni.h to fdbclient

fdbclient/CMakeLists.txt

@@ -47,6 +47,7 @@ set(FDBCLIENT_SRCS
   ConfigKnobs.h
   ConfigTransactionInterface.cpp
   ConfigTransactionInterface.h
+  ConvertUTF.h
   CoordinationInterface.h
   DatabaseBackupAgent.actor.cpp
   DatabaseConfiguration.cpp
@@ -120,6 +121,7 @@ set(FDBCLIENT_SRCS
   ServerKnobs.cpp
   ServerKnobs.h
   SimpleConfigTransaction.h
+  SimpleIni.h
   SnapshotCache.h
   SpecialKeySpace.actor.cpp
   SpecialKeySpace.actor.h

fdbclient/SimpleIni.h

@@ -2541,7 +2541,7 @@ public:
 #define SI_NoCase SI_GenericNoCase
 
 #include <wchar.h>
-#include "ConvertUTF.h"
+#include "fdbclient/ConvertUTF.h"
 
 /**
  * Converts UTF-8 to a wchar_t (or equivalent) using the Unicode reference

fdbmonitor/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(FDBMONITOR_SRCS ConvertUTF.h SimpleIni.h fdbmonitor.cpp)
+set(FDBMONITOR_SRCS fdbmonitor.cpp)
 
 add_executable(fdbmonitor ${FDBMONITOR_SRCS})
 strip_debug_symbols(fdbmonitor)

fdbmonitor/fdbmonitor.cpp

@@ -76,8 +76,8 @@
 #include <grp.h>
 
 #include "flow/SimpleOpt.h"
-#include "SimpleIni.h"
 
+#include "fdbclient/SimpleIni.h"
 #include "fdbclient/versions.h"
 
 #ifdef __linux__

fdbserver/SimulatedCluster.actor.cpp

@@ -34,7 +34,7 @@
 #include "fdbclient/ClusterInterface.h"
 #include "fdbserver/Knobs.h"
 #include "fdbserver/CoordinationInterface.h"
-#include "fdbmonitor/SimpleIni.h"
+#include "fdbclient/SimpleIni.h"
 #include "fdbrpc/AsyncFileNonDurable.actor.h"
 #include "fdbclient/ManagementAPI.actor.h"
 #include "fdbclient/NativeAPI.actor.h"

fdbserver/fdbserver.actor.cpp

@@ -43,7 +43,7 @@
 #include "fdbclient/versions.h"
 #include "fdbclient/BuildFlags.h"
 #include "fdbclient/WellKnownEndpoints.h"
-#include "fdbmonitor/SimpleIni.h"
+#include "fdbclient/SimpleIni.h"
 #include "fdbrpc/AsyncFileCached.actor.h"
 #include "fdbrpc/Net2FileSystem.h"
 #include "fdbrpc/PerfMetric.h"

fdbserver/workloads/SaveAndKill.actor.cpp

@@ -24,7 +24,7 @@
 #include "fdbrpc/simulator.h"
 
 #undef state
-#include "fdbmonitor/SimpleIni.h"
+#include "fdbclient/SimpleIni.h"
 #define state
 #undef max
 #undef min

fdbserver/workloads/SnapTest.actor.cpp

@@ -4,7 +4,7 @@
 #include "fdbclient/ReadYourWrites.h"
 #include "fdbclient/SystemData.h"
 #include "fdbrpc/ContinuousSample.h"
-#include "fdbmonitor/SimpleIni.h"
+#include "fdbclient/SimpleIni.h"
 #include "fdbserver/Status.h"
 #include "fdbserver/TesterInterface.actor.h"
 #include "fdbserver/WorkerInterface.actor.h"