Add back Config::NewFromFile with one argument to maintain the ABI co…

…mpatibility. It was changed in v1.1.8.
BYVoid · Aug 3, 2024 · 556ed22 · 556ed22
1 parent 0caa2ae
commit 556ed22
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/src/Config.cpp b/src/Config.cpp
@@ -222,6 +222,10 @@ Config::Config() : internal(new ConfigInternal()) {}
 
 Config::~Config() { delete reinterpret_cast<ConfigInternal*>(internal); }
 
+ConverterPtr Config::NewFromFile(const std::string& fileName) {
+  return NewFromFile(fileName, std::vector<std::string>{}, nullptr);
+}
+
 ConverterPtr Config::NewFromFile(const std::string& fileName,
                                  const std::vector<std::string>& paths,
                                  const char* argv0) {

diff --git a/src/Config.hpp b/src/Config.hpp
@@ -37,9 +37,11 @@ class OPENCC_EXPORT Config {
   ConverterPtr NewFromString(const std::string& json,
                              const std::vector<std::string>& paths);
 
+  ConverterPtr NewFromFile(const std::string& fileName);
+
   ConverterPtr NewFromFile(const std::string& fileName,
-                           const std::vector<std::string>& paths = {},
-                           const char* argv0 = nullptr);
+                           const std::vector<std::string>& paths,
+                           const char* argv0);
 
 private:
   void* internal;

diff --git a/src/SimpleConverter.cpp b/src/SimpleConverter.cpp
@@ -55,7 +55,7 @@ struct InternalData {
         paths_with_runfiles.push_back(
             bazel_runfiles->Rlocation("_main/data/dictionary"));
         return new InternalData(
-            config.NewFromFile(configFileName, paths_with_runfiles));
+            config.NewFromFile(configFileName, paths_with_runfiles, argv0));
       }
 #endif
       return new InternalData(config.NewFromFile(configFileName, paths, argv0));

diff --git a/src/tools/CommandLine.cpp b/src/tools/CommandLine.cpp
@@ -197,7 +197,7 @@ int main(int argc, const char* argv[]) {
       outputFileName = Optional<std::string>(outputArg.getValue());
       noFlush = true;
     }
-    converter = config.NewFromFile(configFileName, pathArg.getValue());
+    converter = config.NewFromFile(configFileName, pathArg.getValue(), argv[0]);
     bool lineByLine = inputFileName.IsNull();
     if (lineByLine) {
       ConvertLineByLine();