fix double backslash

rte-france · Sep 23, 2024 · 350ecdf · 350ecdf
1 parent b558e44
commit 350ecdf
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 41 deletions.
diff --git a/.github/workflows/centos.yml b/.github/workflows/centos.yml
@@ -54,7 +54,7 @@ jobs:
         shell: bash
         run: |
           OR_REPO="https://github.com/google/or-tools.git"
-          OR_REF="9.11"
+          OR_REF="v9.11"
           echo "OR_REPO=$OR_REPO" >> $GITHUB_ENV
           echo "OR_REF=$OR_REF" >> $GITHUB_ENV
 

diff --git a/.github/workflows/oracle.yml b/.github/workflows/oracle.yml
@@ -117,7 +117,7 @@ jobs:
         shell: bash
         run: |
           OR_REPO="https://github.com/google/or-tools.git"
-          OR_REF="9.11"
+          OR_REF="v9.11"
           echo "OR_REPO=$OR_REPO" >> $GITHUB_ENV
           echo "OR_REF=$OR_REF" >> $GITHUB_ENV
 

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -69,7 +69,7 @@ jobs:
         shell: bash
         run: |
           OR_REPO="https://github.com/google/or-tools.git"
-          OR_REF="9.11"
+          OR_REF="v9.11"
           echo "OR_REPO=$OR_REPO" >> $GITHUB_ENV
           echo "OR_REF=$OR_REF" >> $GITHUB_ENV
 

diff --git a/.github/workflows/windows-cpp.yml b/.github/workflows/windows-cpp.yml
@@ -41,7 +41,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: google/or-tools
-          ref: "9.11"
+          ref: "v9.11"
 
       - name: Checkout this repository
         uses: actions/checkout@v4

diff --git a/.github/workflows/windows-python.yml b/.github/workflows/windows-python.yml
@@ -43,7 +43,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: google/or-tools
-          ref: "9.11"
+          ref: "v9.11"
 
       - name: Checkout this repository
         uses: actions/checkout@v4

diff --git a/patch.py b/patch.py
@@ -213,10 +213,7 @@
 
 replacements.append(Replacement(
     Path.cwd()/'ortools'/'linear_solver'/'xpress_interface.cc',
-    '''  }
-}
-
-const char* stringToCharPtr(std::string& var) { return var.c_str(); }
+    '''const char* stringToCharPtr(std::string& var) { return var.c_str(); }
 
 // Save the existing locale, use the "C" locale to ensure that
 // string -> double conversion is done ignoring the locale.
@@ -227,44 +224,45 @@
     CHECK_EQ(std::string(newLocale), "C");
   }
   ~ScopedLocale() { std::setlocale(LC_NUMERIC, oldLocale); }
+''',
+    '''bool stringToCharPtr(const std::string& var, const char** out) {
+  *out = var.c_str();
+  return true;
+}
+'''
+))
 
- private:
+replacements.append(Replacement(
+    Path.cwd()/'ortools'/'linear_solver'/'xpress_interface.cc',
+    ''' private:
   const char* oldLocale;
 };
 
-#define setParamIfPossible_MACRO(target_map, setter, converter)          \
-  {                                                                      \
-    auto matchingParamIter = (target_map).find(paramAndValuePair.first); \
-    if (matchingParamIter != (target_map).end()) {                       \
-      const auto convertedValue = converter(paramAndValuePair.second);   \
-      VLOG(1) << "Setting parameter " << paramAndValuePair.first         \
-              << " to value " << convertedValue << std::endl;            \
-      setter(mLp, matchingParamIter->second, convertedValue);            \
-      continue;                                                          \
-    }                                                                    \
+#define setParamIfPossible_MACRO(target_map, setter, converter)          \\
+  {                                                                      \\
+    auto matchingParamIter = (target_map).find(paramAndValuePair.first); \\
+    if (matchingParamIter != (target_map).end()) {                       \\
+      const auto convertedValue = converter(paramAndValuePair.second);   \\
+      VLOG(1) << "Setting parameter " << paramAndValuePair.first         \\
+              << " to value " << convertedValue << std::endl;            \\
+      setter(mLp, matchingParamIter->second, convertedValue);            \\
+      continue;                                                          \\
+    }                                                                    \\
   }
 ''',
-    '''  }
-}
-
-bool stringToCharPtr(const std::string& var, const char** out) {
-  *out = var.c_str();
-  return true;
-}
-
-#define setParamIfPossible_MACRO(target_map, setter, converter, type)    \
-  {                                                                      \
-    auto matchingParamIter = (target_map).find(paramAndValuePair.first); \
-    if (matchingParamIter != (target_map).end()) {                       \
-      type convertedValue;                                               \
-      bool ret = converter(paramAndValuePair.second, &convertedValue);   \
-      if (ret) {                                                         \
-        VLOG(1) << "Setting parameter " << paramAndValuePair.first       \
-                << " to value " << convertedValue << std::endl;          \
-      }                                                                  \
-      setter(mLp, matchingParamIter->second, convertedValue);            \
-      continue;                                                          \
-    }                                                                    \
+    '''#define setParamIfPossible_MACRO(target_map, setter, converter, type)    \\
+  {                                                                      \\
+    auto matchingParamIter = (target_map).find(paramAndValuePair.first); \\
+    if (matchingParamIter != (target_map).end()) {                       \\
+      type convertedValue;                                               \\
+      bool ret = converter(paramAndValuePair.second, &convertedValue);   \\
+      if (ret) {                                                         \\
+        VLOG(1) << "Setting parameter " << paramAndValuePair.first       \\
+                << " to value " << convertedValue << std::endl;          \\
+      }                                                                  \\
+      setter(mLp, matchingParamIter->second, convertedValue);            \\
+      continue;                                                          \\
+    }                                                                    \\
   }
 '''
 ))