diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml new file mode 100644 index 00000000..2b0ebc30 --- /dev/null +++ b/.github/workflows/cmake-multi-platform.yml @@ -0,0 +1,126 @@ +# run CMake build on Windows and Linux +name: CMake Build Multi-Platform + +on: + push: + branches: [ "development", "main" ] + pull_request: + branches: [ "development" ] + workflow_dispatch: + +permissions: + contents: write + +env: + VCPKG_ROOT: ${{ github.workspace }}/vcpkg + VCPKG_BINARY_SOURCES: 'clear;x-gha,readwrite' + # support for GH dependency graph vcpkg integration + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + VCPKG_FEATURE_FLAGS: dependencygraph + +jobs: + build: + runs-on: ${{ matrix.os }} + + strategy: + # Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable. + fail-fast: false + + matrix: + include: + # Windows x64 Release + - os: windows-2022 + preset: x64-release + # Linux x64 Release + - os: ubuntu-22.04 + preset: linux-release + # MacOS x64 Release + - os: macos-12 + preset: macos-release + # Linux mingw x64 Release + # - os: ubuntu-22.04 + # preset: linux-mingw-w64-release + # # Linux Python Release + # - os: ubuntu-22.04 + # preset: python-linux-release + + steps: + + - uses: actions/checkout@v3 + + # + # os != windows-2022 (i.e. Linux, MacOS) + # + - name: Install vcpkg + run: | + git clone --depth 1 https://github.com/Microsoft/vcpkg.git ${{env.VCPKG_ROOT}} + "${{env.VCPKG_ROOT}}/bootstrap-vcpkg.sh" + # (Windows comes w/ vcpkg installed as part of VS) + if: matrix.os != 'windows-2022' + + - name: Install Ninja + uses: seanmiddleditch/gha-setup-ninja@master + if: matrix.os != 'windows-2022' + + # Export vcpkg Cache Variables + - name : Export vcpkg Cache Variables + uses: actions/github-script@v6 + with: + script: | + core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); + core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || ''); + + # # + # # preset == linux-mingw-w64-release + # # + # - name: Install mingw-w64 + # run: | + # sudo apt-get update + # sudo apt-get install -y --no-install-recommends mingw-w64 + # if: matrix.preset == 'linux-mingw-w64-release' + + # + # os == windows-2022 + # + - name: Setup VC Tools + uses: ilammy/msvc-dev-cmd@v1 + if: matrix.os == 'windows-2022' + + - name: Patch vcpkg + run: scripts/patch-vcpkg-install.ps1 + if: matrix.os == 'windows-2022' + + # # + # # preset == python-x64-release + # # + # - name: Generate SWIG Bindings + # run: | + # sudo apt-get update + # sudo apt-get install -y --no-install-recommends swig + # chmod +x ./scripts/generate-python-module.sh + # ./scripts/generate-python-module.sh + # if: matrix.preset == 'python-linux-release' + + - name: Manual vcpkg Install (Non-Windows) + run: "\"${{env.VCPKG_ROOT}}/vcpkg\" install" + if: matrix.preset != 'linux-mingw-w64-release' && matrix.os != 'windows-2022' + + - name: Manual vcpkg Install (Windows) + run: "& \"${{env.VCPKG_ROOT}}/vcpkg\" install --triplet x64-windows" + if: matrix.os == 'windows-2022' + + # - name: Manual vcpkg Install (mingw-w64) + # run: "\"${{env.VCPKG_ROOT}}/vcpkg\" install --triplet x64-mingw-static" + # if: matrix.preset == 'linux-mingw-w64-release' + + # + # All platforms + # + - name: CMake Configure + run: cmake --preset ${{matrix.preset}} + + - name: CMake Build + run: cmake --build --preset ${{matrix.preset}} + + - name: CMake Test + run: ctest --preset ${{matrix.preset}} -V diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 718b4bb9..17375e7e 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -17,6 +17,10 @@ on: pull_request: # The branches below must be a subset of the branches above branches: [ "development" ] + +env: + VCPKG_ROOT: ${{ github.workspace }}/vcpkg + VCPKG_BINARY_SOURCES: 'clear;x-gha,readwrite' jobs: analyze: @@ -31,10 +35,8 @@ jobs: strategy: fail-fast: false matrix: - language: [ 'cpp', 'python' ] + language: [ 'cpp' ] # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift' ] - # Use only 'java' to analyze code written in Java, Kotlin or both - # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support steps: @@ -53,21 +55,30 @@ jobs: # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs # queries: security-extended,security-and-quality + - name: Install vcpkg + run: | + git clone --depth 1 https://github.com/Microsoft/vcpkg.git ${{env.VCPKG_ROOT}} + "${{env.VCPKG_ROOT}}/bootstrap-vcpkg.sh" + + - name: Install Ninja + uses: seanmiddleditch/gha-setup-ninja@master + + # Export vcpkg Cache Variables + - name : Export vcpkg Cache Variables + uses: actions/github-script@v6 + with: + script: | + core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); + core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || ''); + + - name: Manual vcpkg Install (Non-Windows) + run: "\"${{env.VCPKG_ROOT}}/vcpkg\" install" + + - name: CMake Configure + run: cmake --preset linux-release - # Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v2 - - # ℹ️ Command-line programs to run using the OS shell. - # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun - - # If the Autobuild fails above, remove it and uncomment the following three lines. - # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. - - # - run: | - # echo "Run, Build Application using script" - # ./location_of_script_within_repo/buildscript.sh + - name: CMake Build + run: cmake --build --preset linux-release - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml new file mode 100644 index 00000000..fbf7e227 --- /dev/null +++ b/.github/workflows/msvc.yml @@ -0,0 +1,87 @@ +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. +# +# Find more information at: +# https://github.com/microsoft/msvc-code-analysis-action + +name: Microsoft C++ Code Analysis + +on: + push: + branches: [ "development", "main", "release" ] + pull_request: + branches: [ "development" ] + schedule: + - cron: '23 4 * * 6' + +env: + # Path to the CMake build directory. + build: '${{ github.workspace }}/build' + VCPKG_BINARY_SOURCES: 'clear;x-gha,readwrite' + +permissions: + contents: read + +jobs: + analyze: + permissions: + contents: read # for actions/checkout to fetch code + security-events: write # for github/codeql-action/upload-sarif to upload SARIF results + actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status + name: Analyze + runs-on: windows-2022 + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + # Export vcpkg Cache Variables + - name : Export vcpkg Cache Variables + uses: actions/github-script@v6 + with: + script: | + core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); + core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || ''); + + - name: Setup VC Tools + uses: ilammy/msvc-dev-cmd@v1 + + - name: Patch vcpkg + run: scripts/patch-vcpkg-install.ps1 + + - name: Manual vcpkg Install (Windows) + run: "& \"${{env.VCPKG_ROOT}}/vcpkg\" install --triplet x64-windows" + + - name: CMake Configure + run: cmake --preset x64-release -B ${{ env.build }} + + # - name: Configure CMake + # run: cmake -B ${{ env.build }} + + # Build is not required unless generated source files are used + # - name: Build CMake + # run: cmake --build ${{ env.build }} + + - name: Initialize MSVC Code Analysis + uses: microsoft/msvc-code-analysis-action@04825f6d9e00f87422d6bf04e1a38b1f3ed60d99 + # Provide a unique ID to access the sarif output path + id: run-analysis + with: + cmakeBuildDirectory: ${{ env.build }} + # Ruleset file that will determine what checks will be run + ruleset: NativeRecommendedRules.ruleset + + # Upload SARIF file to GitHub Code Scanning Alerts + - name: Upload SARIF to GitHub + uses: github/codeql-action/upload-sarif@v2 + with: + sarif_file: ${{ steps.run-analysis.outputs.sarif }} + + # Upload SARIF file as an Artifact to download and view + - name: Upload SARIF as an Artifact + uses: actions/upload-artifact@v3 + with: + name: sarif-file + path: ${{ steps.run-analysis.outputs.sarif }} diff --git a/.gitignore b/.gitignore index 8ebecdfc..f5ad6658 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,5 @@ build/ /OdbDesignServer/designs/ /cmake-build-debug-visual-studio /.idea/workspace.xml -/.vs - Copy +ssl/ +Testing/Temporary/ diff --git a/BUILD.md b/BUILD.md deleted file mode 100644 index e69de29b..00000000 diff --git a/CMakeLists.txt b/CMakeLists.txt index bd2b8e61..7bc95b3b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ set(CMAKE_CXX_STANDARD ${MY_CXX_STANDARD}) set(CMAKE_CXX_STANDARD_REQUIRED True) # required for SWIG python wrapper -set(CMAKE_POSITION_INDEPENDENT_CODE ON) +#set(CMAKE_POSITION_INDEPENDENT_CODE ON) # GoogleTest support include(FetchContent) @@ -66,13 +66,3 @@ add_subdirectory("OdbDesignLib") add_subdirectory("OdbDesignServer") add_subdirectory("Utils") add_subdirectory("OdbDesignTests") - -# link to OdbDesign library in both executable targets (linking inside the targets now) -#target_link_libraries(OdbDesignApp PUBLIC OdbDesign) -#target_link_libraries(OdbDesignServer PUBLIC OdbDesign) -#target_link_libraries(OdbDesignTests PUBLIC OdbDesign) - -# link to Utils lib in all targets (linking inside OdbDesignLib target only now) -#target_link_libraries(OdbDesignApp PUBLIC Utils) -#target_link_libraries(OdbDesignServer PUBLIC Utils) -#target_link_libraries(OdbDesign PUBLIC Utils) diff --git a/CMakePresets.json b/CMakePresets.json index 792f56d1..c651ef7a 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -12,8 +12,8 @@ "binaryDir": "${sourceDir}/out/build/${presetName}", "installDir": "${sourceDir}/out/install/${presetName}", "cacheVariables": { - "CMAKE_C_COMPILER": "cl.exe", - "CMAKE_CXX_COMPILER": "cl.exe", + "CMAKE_C_COMPILER": "cl", + "CMAKE_CXX_COMPILER": "cl", "CMAKE_TOOLCHAIN_FILE": { "value": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake", "type": "FILEPATH" @@ -82,17 +82,18 @@ } }, { - "name": "linux-debug", - "displayName": "Linux Debug", + "name": "linux-base", + "hidden": true, "generator": "Ninja", "binaryDir": "${sourceDir}/out/build/${presetName}", "installDir": "${sourceDir}/out/install/${presetName}", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", + "cacheVariables": { "CMAKE_TOOLCHAIN_FILE": { - "value": "$env{HOME}/src/github/microsoft/vcpkg/scripts/buildsystems/vcpkg.cmake", + "value": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake", "type": "FILEPATH" - } + }, + "CMAKE_C_COMPILER": "cc", + "CMAKE_CXX_COMPILER": "c++" }, "condition": { "type": "equals", @@ -105,29 +106,21 @@ } } }, + { + "name": "linux-debug", + "displayName": "Linux Debug", + "inherits": "linux-base", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug" + } + }, { "name": "linux-release", "displayName": "Linux Release", - "generator": "Ninja", - "binaryDir": "${sourceDir}/out/build/${presetName}", - "installDir": "${sourceDir}/out/install/${presetName}", + "inherits": "linux-base", "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "CMAKE_TOOLCHAIN_FILE": { - "value": "$env{HOME}/src/github/microsoft/vcpkg/scripts/buildsystems/vcpkg.cmake", - "type": "FILEPATH" - } - }, - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Linux" - }, - "vendor": { - "microsoft.com/VisualStudioRemoteSettings/CMake/1.0": { - "sourceDir": "$env{HOME}/.vs/$ms{projectDirName}" - } - } + "CMAKE_BUILD_TYPE": "Release" + } }, { "name": "python-linux-release", @@ -147,51 +140,42 @@ }, { "name": "linux-mingw-w64-debug", - "displayName": "Linux MinGW-w64 Debug", - "generator": "Ninja", - "binaryDir": "${sourceDir}/out/build/${presetName}", - "installDir": "${sourceDir}/out/install/${presetName}", + "displayName": "Linux MinGW-w64 Debug", + "inherits": "linux-debug", "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", "CMAKE_C_COMPILER": "x86_64-w64-mingw32-gcc", "CMAKE_CXX_COMPILER": "x86_64-w64-mingw32-g++", - "CMAKE_CXX_FLAGS": "-static-libgcc -static-libstdc++", - "CMAKE_TOOLCHAIN_FILE": { - "value": "$env{HOME}/src/github/microsoft/vcpkg/scripts/buildsystems/vcpkg.cmake", - "type": "FILEPATH" - } - }, - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Linux" - }, - "vendor": { - "microsoft.com/VisualStudioRemoteSettings/CMake/1.0": { - "sourceDir": "$env{HOME}/.vs/$ms{projectDirName}" - } - } + "CMAKE_CXX_FLAGS": "-static-libgcc -static-libstdc++" + } }, { "name": "linux-mingw-w64-release", "displayName": "Linux MinGW-w64 Release", + "inherits": "linux-release", + "cacheVariables": { + "CMAKE_C_COMPILER": "x86_64-w64-mingw32-gcc", + "CMAKE_CXX_COMPILER": "x86_64-w64-mingw32-g++", + "CMAKE_CXX_FLAGS": "-static-libgcc -static-libstdc++" + } + }, + { + "name": "macos-base", + "hidden": true, "generator": "Ninja", "binaryDir": "${sourceDir}/out/build/${presetName}", "installDir": "${sourceDir}/out/install/${presetName}", "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "CMAKE_C_COMPILER": "x86_64-w64-mingw32-gcc", - "CMAKE_CXX_COMPILER": "x86_64-w64-mingw32-g++", - "CMAKE_CXX_FLAGS": "-static-libgcc -static-libstdc++", "CMAKE_TOOLCHAIN_FILE": { - "value": "$env{HOME}/src/github/microsoft/vcpkg/scripts/buildsystems/vcpkg.cmake", + "value": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake", "type": "FILEPATH" - } + }, + "CMAKE_C_COMPILER": "cc", + "CMAKE_CXX_COMPILER": "c++" }, "condition": { "type": "equals", "lhs": "${hostSystemName}", - "rhs": "Linux" + "rhs": "Darwin" }, "vendor": { "microsoft.com/VisualStudioRemoteSettings/CMake/1.0": { @@ -202,22 +186,18 @@ { "name": "macos-debug", "displayName": "macOS Debug", - "generator": "Ninja", - "binaryDir": "${sourceDir}/out/build/${presetName}", - "installDir": "${sourceDir}/out/install/${presetName}", + "inherits": "macos-base", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug" - }, - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Darwin" - }, - "vendor": { - "microsoft.com/VisualStudioRemoteSettings/CMake/1.0": { - "sourceDir": "$env{HOME}/.vs/$ms{projectDirName}" - } - } + } + }, + { + "name": "macos-release", + "displayName": "macOS Release", + "inherits": "macos-base", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Release" + } } ], "buildPresets": [ @@ -228,8 +208,7 @@ "type": "equals", "lhs": "${hostSystemName}", "rhs": "Windows" - }, - "cleanFirst": false + } }, { "name": "x64-debug", @@ -274,8 +253,7 @@ "type": "equals", "lhs": "${hostSystemName}", "rhs": "Linux" - }, - "cleanFirst": false + } }, { "name": "linux-debug", @@ -308,8 +286,7 @@ "type": "equals", "lhs": "${hostSystemName}", "rhs": "Linux" - }, - "cleanFirst": false + } }, { "name": "linux-mingw-w64-debug", @@ -322,24 +299,149 @@ "displayName": "Linux MinGW-w64 Release", "configurePreset": "linux-mingw-w64-release", "inherits": "linux-mingw-w64-base" + }, + { + "name": "macos-base", + "hidden": true, + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Darwin" + } + }, + { + "name": "macos-debug", + "displayName": "MacOS Debug", + "configurePreset": "macos-debug", + "inherits": "macos-base" + }, + { + "name": "macos-release", + "displayName": "MacOS Release", + "configurePreset": "macos-release", + "inherits": "macos-base" } ], "testPresets": [ { - "name": "x64-Debug", + "name": "windows-base", + "hidden": true, + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + } + }, + { + "name": "x64-debug", + "displayName": "Test x64-Debug", + "inherits": "windows-base", "configurePreset": "x64-debug" }, { - "name": "x64-Release", + "name": "x64-release", + "displayName": "Test x64-Release", + "inherits": "windows-base", "configurePreset": "x64-release" }, { - "name": "x86-Debug", + "name": "x86-debug", + "displayName": "Test x86-Debug", + "inherits": "windows-base", "configurePreset": "x86-debug" }, { - "name": "x86-Release", + "name": "x86-release", + "displayName": "Test x86-Release", + "inherits": "windows-base", "configurePreset": "x86-release" + }, + { + "name": "python-x64-debug", + "displayName": "Test Python x64 Debug", + "inherits": "windows-base", + "configurePreset": "python-x64-debug" + }, + { + "name": "python-x64-release", + "displayName": "Test Python x64 Release", + "inherits": "windows-base", + "configurePreset": "python-x64-release" + }, + { + "name": "linux-base", + "hidden": true, + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Linux" + } + }, + { + "name": "linux-debug", + "displayName": "Test Linux Debug", + "configurePreset": "linux-debug", + "inherits": "linux-base" + }, + { + "name": "linux-release", + "displayName": "Test Linux Release", + "configurePreset": "linux-release", + "inherits": "linux-base" + }, + { + "name": "python-linux-debug", + "displayName": "Test Python Linux Debug", + "configurePreset": "python-linux-debug", + "inherits": "linux-base" + }, + { + "name": "python-linux-release", + "displayName": "Test Python Linux Release", + "configurePreset": "python-linux-release", + "inherits": "linux-base" + }, + { + "name": "linux-mingw-w64-base", + "hidden": true, + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Linux" + } + }, + { + "name": "linux-mingw-w64-debug", + "displayName": "Test Linux MinGW-w64 Debug", + "configurePreset": "linux-mingw-w64-debug", + "inherits": "linux-mingw-w64-base" + }, + { + "name": "linux-mingw-w64-release", + "displayName": "Test Linux MinGW-w64 Release", + "configurePreset": "linux-mingw-w64-release", + "inherits": "linux-mingw-w64-base" + }, + { + "name": "macos-base", + "hidden": true, + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Darwin" + } + }, + { + "name": "macos-debug", + "displayName": "Test MacOS Debug", + "configurePreset": "macos-debug", + "inherits": "macos-base" + }, + { + "name": "macos-release", + "displayName": "Test MacOS Release", + "configurePreset": "macos-release", + "inherits": "macos-base" } ] } diff --git a/Dockerfile_OdbDesignServer b/Dockerfile_OdbDesignServer index 21844d49..f881cf13 100644 --- a/Dockerfile_OdbDesignServer +++ b/Dockerfile_OdbDesignServer @@ -19,27 +19,29 @@ RUN apt-get update && \ tar \ pkg-config \ && \ - rm -rf /var/lib/apt/lists/* + rm -rf /var/lib/apt/lists/* + +ENV VCPKG_ROOT=/root/src/github/microsoft/vcpkg # install vcpkg WORKDIR /root/src/github/microsoft -RUN git clone --depth 1 https://github.com/Microsoft/vcpkg.git -WORKDIR /root/src/github/microsoft/vcpkg +RUN git clone https://github.com/Microsoft/vcpkg.git ${VCPKG_ROOT} +WORKDIR ${VCPKG_ROOT} RUN ./bootstrap-vcpkg.sh # pre-install vcpgk packages BEFORE cmake configure RUN mkdir -p /src/OdbDesign WORKDIR /src/OdbDesign COPY ./vcpkg.json . -RUN /root/src/github/microsoft/vcpkg/vcpkg install +RUN ${VCPKG_ROOT}/vcpkg install # copy source COPY . . # configure & build using presets # linux-release -RUN cmake --preset linux-release -G Ninja -RUN cmake --build --preset linux-release --target OdbDesignServer +RUN cmake --preset linux-release +RUN cmake --build --preset linux-release # # linux-debug # RUN cmake --preset linux-debug # RUN cmake --build --preset linux-debug @@ -51,13 +53,14 @@ RUN mkdir --parents /OdbDesign/bin WORKDIR /OdbDesign/bin # copy binaries -COPY --from=build /src/OdbDesign/out/build/linux-release/OdbDesignLib/libOdbDesign.so . -COPY --from=build /src/OdbDesign/out/build/linux-release/Utils/libUtils.so . +COPY --from=build /src/OdbDesign/out/build/linux-release/OdbDesignLib/*.so . +COPY --from=build /src/OdbDesign/out/build/linux-release/Utils/*.so . COPY --from=build /src/OdbDesign/out/build/linux-release/OdbDesignServer/OdbDesignServer . +COPY --from=build /src/OdbDesign/out/build/linux-release/OdbDesignServer/*.so . COPY --from=build /src/OdbDesign/out/build/linux-release/*.so . # copy designs and templates directories -COPY --from=build /src/OdbDesign/OdbDesignServer/designs ./designs -COPY --from=build /src/OdbDesign/OdbDesignServer/templates ./templates +#COPY --from=build /src/OdbDesign/OdbDesignServer/designs ./designs +#COPY --from=build /src/OdbDesign/OdbDesignServer/templates ./templates # run ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/OdbDesign/bin diff --git a/OdbDesignLib/BoardSide.h b/OdbDesignLib/BoardSide.h deleted file mode 100644 index 27b8e2c4..00000000 --- a/OdbDesignLib/BoardSide.h +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once - -namespace Odb::Lib -{ - enum class BoardSide - { - Top, - Bottom - }; -} \ No newline at end of file diff --git a/OdbDesignLib/CMakeLists.txt b/OdbDesignLib/CMakeLists.txt index fa44dc0b..6f54de9b 100644 --- a/OdbDesignLib/CMakeLists.txt +++ b/OdbDesignLib/CMakeLists.txt @@ -1,7 +1,7 @@ # CMakeList.txt : CMake project for OdbDesignLib # -add_library(OdbDesign SHARED "odbdesign_export.h" "ComponentLayerDirectory.cpp" "ComponentLayerDirectory.h" "EdaDataFile.cpp" "EdaDataFile.h" "LayerDirectory.cpp" "LayerDirectory.h" "NetlistFile.cpp" "NetlistFile.h" "FileArchive.cpp" "FileArchive.h" "StepDirectory.cpp" "StepDirectory.h" "Net.h" "Net.cpp" "Component.h" "Component.cpp" "Pin.h" "Pin.cpp" "PinConnection.h" "PinConnection.cpp" "Package.h" "Package.cpp" "Part.h" "Part.cpp" "Via.h" "Via.cpp" "Design.h" "Design.cpp" "BoardSide.h" "OdbDesign.h" "DesignCache.h" "DesignCache.cpp" "win.h" "proto/edadatafile.pb.h" "proto/edadatafile.pb.cc" "IProtoBuffable.h" "crow_win.h" "OdbFile.h" "OdbFile.cpp" "OdbFileRecord.h" "OdbFileRecord.cpp" "IOdbApp.h" "IOdbApp.cpp" "OdbAppBase.h" "OdbAppBase.cpp" "RouteController.h" "RouteController.cpp" "IOdbServerApp.h" "OdbServerAppBase.h" "OdbServerAppBase.cpp" "IOdbServerApp.cpp" +add_library(OdbDesign SHARED "odbdesign_export.h" "ComponentLayerDirectory.cpp" "ComponentLayerDirectory.h" "EdaDataFile.cpp" "EdaDataFile.h" "LayerDirectory.cpp" "LayerDirectory.h" "NetlistFile.cpp" "NetlistFile.h" "FileArchive.cpp" "FileArchive.h" "StepDirectory.cpp" "StepDirectory.h" "Net.h" "Net.cpp" "Component.h" "Component.cpp" "Pin.h" "Pin.cpp" "PinConnection.h" "PinConnection.cpp" "Package.h" "Package.cpp" "Part.h" "Part.cpp" "Via.h" "Via.cpp" "Design.h" "Design.cpp" "OdbDesign.h" "DesignCache.h" "DesignCache.cpp" "win.h" "proto/edadatafile.pb.h" "proto/edadatafile.pb.cc" "IProtoBuffable.h" "crow_win.h" "OdbFile.h" "OdbFile.cpp" "OdbFileRecord.h" "OdbFileRecord.cpp" "IOdbApp.h" "IOdbApp.cpp" "OdbAppBase.h" "OdbAppBase.cpp" "RouteController.h" "RouteController.cpp" "IOdbServerApp.h" "OdbServerAppBase.h" "OdbServerAppBase.cpp" "IOdbServerApp.cpp" MatrixFile.cpp MatrixFile.h MiscInfoFile.cpp @@ -10,20 +10,21 @@ add_library(OdbDesign SHARED "odbdesign_export.h" "ComponentLayerDirectory.cpp" AttrListFile.cpp AttrListFile.h SysAttrFile.cpp - SysAttrFile.h "RgbColor.h" "RgbColor.cpp") + SysAttrFile.h "RgbColor.h" "RgbColor.cpp" "StandardFontsFile.h" "StandardFontsFile.cpp" "enums.h" "OdbDesignArgs.h" "OdbDesignArgs.cpp") -target_compile_options(OdbDesign PRIVATE - $<$,$,$>: - -Wall> - $<$: - /wd4250>) +# disable warning C4250: inheritance by dominance +target_compile_options(OdbDesign PUBLIC +# $<$,$,$>: +# > + $<$: + /wd4250>) -# required for SWIG -set_property(TARGET OdbDesign PROPERTY POSITION_INDEPENDENT_CODE ON) +## required for SWIG +#set_property(TARGET OdbDesign PROPERTY POSITION_INDEPENDENT_CODE ON) target_link_libraries(OdbDesign PUBLIC Utils) - # state that anybody linking to us needs to include the current source dir, while we don't. target_include_directories(OdbDesign INTERFACE @@ -33,7 +34,12 @@ target_include_directories(OdbDesign # link to zlib (required for Crow HTTP compression) find_package(ZLIB REQUIRED) target_link_libraries(OdbDesign PRIVATE ZLIB::ZLIB) -add_compile_definitions(CROW_ENABLE_COMPRESSION) + +find_package(OpenSSL REQUIRED) +target_link_libraries(OdbDesign PUBLIC OpenSSL::SSL OpenSSL::Crypto) + +target_compile_definitions(OdbDesign PUBLIC CROW_ENABLE_COMPRESSION) +target_compile_definitions(OdbDesign PUBLIC CROW_ENABLE_SSL) # Link to Protobuf find_package(Protobuf CONFIG REQUIRED) @@ -74,6 +80,6 @@ if (PYTHON_MODULE_BUILD) # include and link to Python3 find_package(Python3 COMPONENTS Development REQUIRED) - target_include_directories(OdbDesign PRIVATE ${Python3_INCLUDE_DIRS}) - target_link_libraries(OdbDesign ${Python3_LIBRARIES}) + #target_include_directories(OdbDesign PRIVATE ${Python3_INCLUDE_DIRS}) + target_link_libraries(OdbDesign PRIVATE Python3::Python) endif() \ No newline at end of file diff --git a/OdbDesignLib/Component.h b/OdbDesignLib/Component.h index efa79c60..571f070b 100644 --- a/OdbDesignLib/Component.h +++ b/OdbDesignLib/Component.h @@ -7,7 +7,7 @@ #include #include "Pin.h" #include "Package.h" -#include "BoardSide.h" +#include "enums.h" namespace Odb::Lib::ProductModel diff --git a/OdbDesignLib/ComponentLayerDirectory.h b/OdbDesignLib/ComponentLayerDirectory.h index 782ae1b2..4010ec18 100644 --- a/OdbDesignLib/ComponentLayerDirectory.h +++ b/OdbDesignLib/ComponentLayerDirectory.h @@ -3,7 +3,7 @@ #include "LayerDirectory.h" #include #include -#include "BoardSide.h" +#include "enums.h" namespace Odb::Lib::FileModel::Design diff --git a/OdbDesignLib/EdaDataFile.cpp b/OdbDesignLib/EdaDataFile.cpp index 3581eec1..d8a2bef6 100644 --- a/OdbDesignLib/EdaDataFile.cpp +++ b/OdbDesignLib/EdaDataFile.cpp @@ -3,7 +3,7 @@ #include #include #include "str_trim.h" -#include "BoardSide.h" +#include "enums.h" #include "proto/edadatafile.pb.h" #include @@ -38,20 +38,20 @@ namespace Odb::Lib::FileModel::Design m_featureIdRecords.clear(); } - std::unique_ptr EdaDataFile::NetRecord::SubnetRecord::to_protobuf() const + std::unique_ptr EdaDataFile::NetRecord::SubnetRecord::to_protobuf() const { - std::unique_ptr pSubnetRecordMessage(new odbdesign::proto::EdaDataFile::NetRecord::SubnetRecord); - pSubnetRecordMessage->set_type((odbdesign::proto::EdaDataFile::NetRecord::SubnetRecord::Type) type); + std::unique_ptr pSubnetRecordMessage(new Odb::Lib::Protobuf::EdaDataFile::NetRecord::SubnetRecord); + pSubnetRecordMessage->set_type((Odb::Lib::Protobuf::EdaDataFile::NetRecord::SubnetRecord::Type) type); if (type == Type::Toeprint) { pSubnetRecordMessage->set_componentnumber(componentNumber); pSubnetRecordMessage->set_toeprintnumber(toeprintNumber); - pSubnetRecordMessage->set_side((odbdesign::proto::EdaDataFile_BoardSide)side); + pSubnetRecordMessage->set_side((Odb::Lib::Protobuf::EdaDataFile_BoardSide)side); } else if (type == Type::Plane) { - pSubnetRecordMessage->set_filltype((odbdesign::proto::EdaDataFile::NetRecord::SubnetRecord::FillType)fillType); - pSubnetRecordMessage->set_cutouttype((odbdesign::proto::EdaDataFile::NetRecord::SubnetRecord::CutoutType) cutoutType); + pSubnetRecordMessage->set_filltype((Odb::Lib::Protobuf::EdaDataFile::NetRecord::SubnetRecord::FillType)fillType); + pSubnetRecordMessage->set_cutouttype((Odb::Lib::Protobuf::EdaDataFile::NetRecord::SubnetRecord::CutoutType) cutoutType); pSubnetRecordMessage->set_fillsize(fillSize); } @@ -63,7 +63,7 @@ namespace Odb::Lib::FileModel::Design return pSubnetRecordMessage; } - void EdaDataFile::NetRecord::SubnetRecord::from_protobuf(const odbdesign::proto::EdaDataFile::NetRecord::SubnetRecord& message) + void EdaDataFile::NetRecord::SubnetRecord::from_protobuf(const Odb::Lib::Protobuf::EdaDataFile::NetRecord::SubnetRecord& message) { } @@ -73,9 +73,9 @@ namespace Odb::Lib::FileModel::Design m_propertyRecords.clear(); } - std::unique_ptr EdaDataFile::NetRecord::to_protobuf() const + std::unique_ptr EdaDataFile::NetRecord::to_protobuf() const { - std::unique_ptr pNetRecordMessage(new odbdesign::proto::EdaDataFile::NetRecord); + std::unique_ptr pNetRecordMessage(new Odb::Lib::Protobuf::EdaDataFile::NetRecord); pNetRecordMessage->set_name(name); pNetRecordMessage->set_attributesidstring(attributesIdString); pNetRecordMessage->set_index(index); @@ -94,22 +94,22 @@ namespace Odb::Lib::FileModel::Design return pNetRecordMessage; } - void EdaDataFile::NetRecord::from_protobuf(const odbdesign::proto::EdaDataFile::NetRecord& message) + void EdaDataFile::NetRecord::from_protobuf(const Odb::Lib::Protobuf::EdaDataFile::NetRecord& message) { } - std::unique_ptr + std::unique_ptr EdaDataFile::NetRecord::SubnetRecord::FeatureIdRecord::to_protobuf() const { - std::unique_ptr pFeatureIdRecordMessage(new odbdesign::proto::EdaDataFile::NetRecord::SubnetRecord::FeatureIdRecord); - pFeatureIdRecordMessage->set_type((odbdesign::proto::EdaDataFile::NetRecord::SubnetRecord::FeatureIdRecord::Type) type); + std::unique_ptr pFeatureIdRecordMessage(new Odb::Lib::Protobuf::EdaDataFile::NetRecord::SubnetRecord::FeatureIdRecord); + pFeatureIdRecordMessage->set_type((Odb::Lib::Protobuf::EdaDataFile::NetRecord::SubnetRecord::FeatureIdRecord::Type) type); pFeatureIdRecordMessage->set_layernumber(layerNumber); pFeatureIdRecordMessage->set_featurenumber(featureNumber); return pFeatureIdRecordMessage; } - void EdaDataFile::NetRecord::SubnetRecord::FeatureIdRecord::from_protobuf(const odbdesign::proto::EdaDataFile::NetRecord::SubnetRecord::FeatureIdRecord& message) + void EdaDataFile::NetRecord::SubnetRecord::FeatureIdRecord::from_protobuf(const Odb::Lib::Protobuf::EdaDataFile::NetRecord::SubnetRecord::FeatureIdRecord& message) { } @@ -149,9 +149,9 @@ namespace Odb::Lib::FileModel::Design return m_packageRecordsByName; } - std::unique_ptr EdaDataFile::to_protobuf() const + std::unique_ptr EdaDataFile::to_protobuf() const { - std::unique_ptr pEdaDataFileMessage(new odbdesign::proto::EdaDataFile); + std::unique_ptr pEdaDataFileMessage(new Odb::Lib::Protobuf::EdaDataFile); pEdaDataFileMessage->set_path(m_path.string()); pEdaDataFileMessage->set_units(m_units); pEdaDataFileMessage->set_source(m_source); @@ -188,7 +188,7 @@ namespace Odb::Lib::FileModel::Design return pEdaDataFileMessage; } - void EdaDataFile::from_protobuf(const odbdesign::proto::EdaDataFile& message) + void EdaDataFile::from_protobuf(const Odb::Lib::Protobuf::EdaDataFile& message) { } @@ -728,10 +728,10 @@ namespace Odb::Lib::FileModel::Design } // Inherited via IProtoBuffable - std::unique_ptr + std::unique_ptr EdaDataFile::PropertyRecord::to_protobuf() const { - std::unique_ptr pPropertyRecordMessage(new odbdesign::proto::EdaDataFile::PropertyRecord); + std::unique_ptr pPropertyRecordMessage(new Odb::Lib::Protobuf::EdaDataFile::PropertyRecord); pPropertyRecordMessage->set_name(name); pPropertyRecordMessage->set_value(value); for (const auto& f : floatValues) @@ -741,15 +741,15 @@ namespace Odb::Lib::FileModel::Design return pPropertyRecordMessage; } - void EdaDataFile::PropertyRecord::from_protobuf(const odbdesign::proto::EdaDataFile::PropertyRecord& message) + void EdaDataFile::PropertyRecord::from_protobuf(const Odb::Lib::Protobuf::EdaDataFile::PropertyRecord& message) { - }; + } // Inherited via IProtoBuffable - std::unique_ptr + std::unique_ptr EdaDataFile::PackageRecord::to_protobuf() const { - std::unique_ptr pPackageRecordMessage(new odbdesign::proto::EdaDataFile::PackageRecord); + std::unique_ptr pPackageRecordMessage(new Odb::Lib::Protobuf::EdaDataFile::PackageRecord); pPackageRecordMessage->set_name(name); pPackageRecordMessage->set_pitch(pitch); pPackageRecordMessage->set_xmin(xMin); @@ -774,28 +774,28 @@ namespace Odb::Lib::FileModel::Design return pPackageRecordMessage; } - void EdaDataFile::PackageRecord::from_protobuf(const odbdesign::proto::EdaDataFile::PackageRecord& message) + void EdaDataFile::PackageRecord::from_protobuf(const Odb::Lib::Protobuf::EdaDataFile::PackageRecord& message) { - }; + } // Inherited via IProtoBuffable - std::unique_ptr + std::unique_ptr EdaDataFile::PackageRecord::PinRecord::to_protobuf() const { - std::unique_ptr pPinRecordMessage(new odbdesign::proto::EdaDataFile::PackageRecord::PinRecord); + std::unique_ptr pPinRecordMessage(new Odb::Lib::Protobuf::EdaDataFile::PackageRecord::PinRecord); pPinRecordMessage->set_name(name); - pPinRecordMessage->set_type((odbdesign::proto::EdaDataFile::PackageRecord::PinRecord::Type)type); + pPinRecordMessage->set_type((Odb::Lib::Protobuf::EdaDataFile::PackageRecord::PinRecord::Type)type); pPinRecordMessage->set_xcenter(xCenter); pPinRecordMessage->set_ycenter(yCenter); pPinRecordMessage->set_finishedholesize(finishedHoleSize); - pPinRecordMessage->set_electricaltype((odbdesign::proto::EdaDataFile::PackageRecord::PinRecord::ElectricalType)electricalType); - pPinRecordMessage->set_mounttype((odbdesign::proto::EdaDataFile::PackageRecord::PinRecord::MountType)mountType); + pPinRecordMessage->set_electricaltype((Odb::Lib::Protobuf::EdaDataFile::PackageRecord::PinRecord::ElectricalType)electricalType); + pPinRecordMessage->set_mounttype((Odb::Lib::Protobuf::EdaDataFile::PackageRecord::PinRecord::MountType)mountType); pPinRecordMessage->set_id(id); pPinRecordMessage->set_index(index); return pPinRecordMessage; } - void EdaDataFile::PackageRecord::PinRecord::from_protobuf(const odbdesign::proto::EdaDataFile::PackageRecord::PinRecord& message) + void EdaDataFile::PackageRecord::PinRecord::from_protobuf(const Odb::Lib::Protobuf::EdaDataFile::PackageRecord::PinRecord& message) { - }; + } } \ No newline at end of file diff --git a/OdbDesignLib/EdaDataFile.h b/OdbDesignLib/EdaDataFile.h index b461c696..1b7c30b2 100644 --- a/OdbDesignLib/EdaDataFile.h +++ b/OdbDesignLib/EdaDataFile.h @@ -5,7 +5,7 @@ #include #include #include "odbdesign_export.h" -#include "BoardSide.h" +#include "enums.h" #include "proto/edadatafile.pb.h" #include #include "IProtoBuffable.h" @@ -13,7 +13,7 @@ namespace Odb::Lib::FileModel::Design { - class ODBDESIGN_EXPORT EdaDataFile : public IProtoBuffable + class ODBDESIGN_EXPORT EdaDataFile : public IProtoBuffable { public: EdaDataFile(); @@ -25,7 +25,7 @@ namespace Odb::Lib::FileModel::Design bool Parse(std::filesystem::path path); - struct ODBDESIGN_EXPORT PropertyRecord : public IProtoBuffable + struct ODBDESIGN_EXPORT PropertyRecord : public IProtoBuffable { // data members std::string name; @@ -40,13 +40,13 @@ namespace Odb::Lib::FileModel::Design typedef std::vector> Vector; // Inherited via IProtoBuffable - std::unique_ptr to_protobuf() const override; - void from_protobuf(const odbdesign::proto::EdaDataFile::PropertyRecord& message) override; + std::unique_ptr to_protobuf() const override; + void from_protobuf(const Odb::Lib::Protobuf::EdaDataFile::PropertyRecord& message) override; }; - struct ODBDESIGN_EXPORT NetRecord : public IProtoBuffable + struct ODBDESIGN_EXPORT NetRecord : public IProtoBuffable { - struct ODBDESIGN_EXPORT SubnetRecord : public IProtoBuffable + struct ODBDESIGN_EXPORT SubnetRecord : public IProtoBuffable { // common subnet enums enum class Type @@ -72,7 +72,7 @@ namespace Odb::Lib::FileModel::Design Exact }; - struct ODBDESIGN_EXPORT FeatureIdRecord : public IProtoBuffable + struct ODBDESIGN_EXPORT FeatureIdRecord : public IProtoBuffable { enum class Type { @@ -88,8 +88,8 @@ namespace Odb::Lib::FileModel::Design unsigned int featureNumber; // Inherited via IProtoBuffable - std::unique_ptr to_protobuf() const override; - void from_protobuf(const odbdesign::proto::EdaDataFile::NetRecord::SubnetRecord::FeatureIdRecord& message) override; + std::unique_ptr to_protobuf() const override; + void from_protobuf(const Odb::Lib::Protobuf::EdaDataFile::NetRecord::SubnetRecord::FeatureIdRecord& message) override; }; typedef std::vector> Vector; @@ -117,8 +117,8 @@ namespace Odb::Lib::FileModel::Design inline static const std::string RECORD_TYPE_PLANE_TOKEN = "PLN"; // Inherited via IProtoBuffable - std::unique_ptr to_protobuf() const override; - void from_protobuf(const odbdesign::proto::EdaDataFile::NetRecord::SubnetRecord& message) override; + std::unique_ptr to_protobuf() const override; + void from_protobuf(const Odb::Lib::Protobuf::EdaDataFile::NetRecord::SubnetRecord& message) override; }; // SubnetRecord @@ -136,14 +136,14 @@ namespace Odb::Lib::FileModel::Design PropertyRecord::Vector m_propertyRecords; // Inherited via IProtoBuffable - std::unique_ptr to_protobuf() const override; - void from_protobuf(const odbdesign::proto::EdaDataFile::NetRecord& message) override; + std::unique_ptr to_protobuf() const override; + void from_protobuf(const Odb::Lib::Protobuf::EdaDataFile::NetRecord& message) override; }; // NetRecord - struct ODBDESIGN_EXPORT PackageRecord : public IProtoBuffable + struct ODBDESIGN_EXPORT PackageRecord : public IProtoBuffable { - struct ODBDESIGN_EXPORT PinRecord : public IProtoBuffable + struct ODBDESIGN_EXPORT PinRecord : public IProtoBuffable { enum class Type { @@ -185,8 +185,8 @@ namespace Odb::Lib::FileModel::Design unsigned int index; // Inherited via IProtoBuffable - std::unique_ptr to_protobuf() const override; - void from_protobuf(const odbdesign::proto::EdaDataFile::PackageRecord::PinRecord& message) override; + std::unique_ptr to_protobuf() const override; + void from_protobuf(const Odb::Lib::Protobuf::EdaDataFile::PackageRecord::PinRecord& message) override; }; // PinRecord @@ -205,8 +205,8 @@ namespace Odb::Lib::FileModel::Design PropertyRecord::Vector m_propertyRecords; // Inherited via IProtoBuffable - std::unique_ptr to_protobuf() const override; - void from_protobuf(const odbdesign::proto::EdaDataFile::PackageRecord& message) override; + std::unique_ptr to_protobuf() const override; + void from_protobuf(const Odb::Lib::Protobuf::EdaDataFile::PackageRecord& message) override; }; // PackageRecord @@ -220,8 +220,8 @@ namespace Odb::Lib::FileModel::Design const PackageRecord::StringMap& GetPackageRecordsByName() const; // Inherited via IProtoBuffable - std::unique_ptr to_protobuf() const override; - void from_protobuf(const odbdesign::proto::EdaDataFile& message) override; + std::unique_ptr to_protobuf() const override; + void from_protobuf(const Odb::Lib::Protobuf::EdaDataFile& message) override; private: std::filesystem::path m_path; diff --git a/OdbDesignLib/FileArchive.cpp b/OdbDesignLib/FileArchive.cpp index eda6fee3..659d8366 100644 --- a/OdbDesignLib/FileArchive.cpp +++ b/OdbDesignLib/FileArchive.cpp @@ -1,4 +1,5 @@ #include "FileArchive.h" +#include "FileArchive.h" #include #include "ArchiveExtractor.h" #include "MiscInfoFile.h" @@ -63,11 +64,11 @@ namespace Odb::Lib::FileModel::Design } catch (std::filesystem::filesystem_error& fe) { - Logger::instance()->exception(fe); + logexception(fe); } catch (std::exception& e) { - Logger::instance()->exception(e); + logexception(e); } return false; @@ -119,6 +120,7 @@ namespace Odb::Lib::FileModel::Design if (! ParseMiscInfoFile(path)) return false; if (! ParseMatrixFile(path)) return false; + if (! ParseStandardFontsFile(path)) return false; return true; } @@ -143,7 +145,17 @@ namespace Odb::Lib::FileModel::Design if (!m_matrixFile.Parse(matrixDir)) return false; return true; - } + } + bool FileArchive::ParseStandardFontsFile(const std::filesystem::path& path) + { + auto fontsDir = path / "fonts"; + if (!std::filesystem::exists(fontsDir)) return false; + if (!std::filesystem::is_directory(fontsDir)) return false; + + if (!m_standardFontsFile.Parse(fontsDir)) return false; + + return true; + } const MiscInfoFile &FileArchive::GetMiscInfoFile() const { diff --git a/OdbDesignLib/FileArchive.h b/OdbDesignLib/FileArchive.h index 7b91b765..f8ad9f92 100644 --- a/OdbDesignLib/FileArchive.h +++ b/OdbDesignLib/FileArchive.h @@ -8,6 +8,7 @@ #include #include "MiscInfoFile.h" #include "MatrixFile.h" +#include "StandardFontsFile.h" namespace Odb::Lib::FileModel::Design @@ -24,6 +25,7 @@ namespace Odb::Lib::FileModel::Design const StepDirectory::StringMap& GetStepsByName() const; const MiscInfoFile& GetMiscInfoFile() const; const MatrixFile& GetMatrixFile() const; + const StandardFontsFile& GetStandardFontsFile() const; // TODO: fix these to use pointer return types //const EdaDataFile& GetStepEdaDataFile(std::string stepName) const; @@ -41,10 +43,12 @@ namespace Odb::Lib::FileModel::Design StepDirectory::StringMap m_stepsByName; MiscInfoFile m_miscInfoFile; MatrixFile m_matrixFile; + StandardFontsFile m_standardFontsFile; bool ParseDesignDirectory(const std::filesystem::path& path); bool ParseMiscInfoFile(const std::filesystem::path& path); bool ParseMatrixFile(const std::filesystem::path& path); + bool ParseStandardFontsFile(const std::filesystem::path& path); static bool ExtractDesignArchive(const std::filesystem::path& path, std::filesystem::path& extractedPath); diff --git a/OdbDesignLib/IOdbApp.h b/OdbDesignLib/IOdbApp.h index 8f1372d4..e3941fa5 100644 --- a/OdbDesignLib/IOdbApp.h +++ b/OdbDesignLib/IOdbApp.h @@ -1,12 +1,10 @@ #pragma once -#include "CommandLineArgs.h" +#include "OdbDesignArgs.h" #include "DesignCache.h" #include "ExitCode.h" #include "odbdesign_export.h" -using namespace Utils; - namespace Odb::Lib { class ODBDESIGN_EXPORT IOdbApp @@ -14,10 +12,10 @@ namespace Odb::Lib public: virtual ~IOdbApp() {} - virtual const CommandLineArgs& arguments() const = 0; + virtual const OdbDesignArgs& args() const = 0; virtual DesignCache& design_cache() = 0; - virtual ExitCode Run() = 0; + virtual Utils::ExitCode Run() = 0; protected: // abstract class/interface diff --git a/OdbDesignLib/IProtoBuffable.h b/OdbDesignLib/IProtoBuffable.h index afdd4c6f..2b5de625 100644 --- a/OdbDesignLib/IProtoBuffable.h +++ b/OdbDesignLib/IProtoBuffable.h @@ -6,9 +6,6 @@ #include "IJsonable.h" #include "odbdesign_export.h" -using namespace google::protobuf; -using namespace google::protobuf::util; - namespace Odb::Lib { @@ -29,7 +26,7 @@ namespace Odb::Lib {} // TMessage MUST derive from Message (must use this until template type contraints support is added) - static_assert(std::is_base_of::value, "template parameter type TPbMessage must derive from Protobuf Message class"); + static_assert(std::is_base_of::value, "template parameter type TPbMessage must derive from Protobuf Message class"); }; @@ -37,10 +34,10 @@ namespace Odb::Lib std::string IProtoBuffable::to_json() const { // use default options - JsonOptions jsonOptions; + google::protobuf::util::JsonOptions jsonOptions; std::string json; - auto status = MessageToJsonString(*to_protobuf(), &json, jsonOptions); + auto status = google::protobuf::util::MessageToJsonString(*to_protobuf(), &json, jsonOptions); if (!status.ok()) json.clear(); return json; } @@ -48,12 +45,12 @@ namespace Odb::Lib template inline void IProtoBuffable::from_json(const std::string& json) { - StringPiece sp_json(json); + google::protobuf::StringPiece sp_json(json); // use default options - JsonOptions jsonOptions; + google::protobuf::util::JsonOptions jsonOptions; auto pMessage = std::unique_ptr(); - auto status = JsonStringToMessage(sp_json, pMessage.get()); + auto status = google::protobuf::util::JsonStringToMessage(sp_json, pMessage.get()); if (!status.ok()) return; from_protobuf(*pMessage); } diff --git a/OdbDesignLib/MatrixFile.cpp b/OdbDesignLib/MatrixFile.cpp index d765d57a..e3ec500e 100644 --- a/OdbDesignLib/MatrixFile.cpp +++ b/OdbDesignLib/MatrixFile.cpp @@ -244,11 +244,11 @@ namespace Odb::Lib::FileModel::Design { if (value == "POSITIVE") { - pCurrentLayerRecord->polarity = LayerRecord::Polarity::Positive; + pCurrentLayerRecord->polarity = Polarity::Positive; } else if (value == "NEGATIVE") { - pCurrentLayerRecord->polarity = LayerRecord::Polarity::Negative; + pCurrentLayerRecord->polarity = Polarity::Negative; } else { diff --git a/OdbDesignLib/MatrixFile.h b/OdbDesignLib/MatrixFile.h index 97d8c932..188037f5 100644 --- a/OdbDesignLib/MatrixFile.h +++ b/OdbDesignLib/MatrixFile.h @@ -9,6 +9,7 @@ #include #include #include "RgbColor.h" +#include "enums.h" namespace Odb::Lib::FileModel::Design @@ -53,13 +54,7 @@ namespace Odb::Lib::FileModel::Design { Board, Misc - }; - - enum class Polarity - { - Positive, - Negative - }; + }; enum class DielectricType { diff --git a/OdbDesignLib/MiscInfoFile.cpp b/OdbDesignLib/MiscInfoFile.cpp index 168f402c..8e4d6df6 100644 --- a/OdbDesignLib/MiscInfoFile.cpp +++ b/OdbDesignLib/MiscInfoFile.cpp @@ -11,6 +11,8 @@ #include "timestamp.h" #include "Logger.h" +using namespace std::chrono; + namespace Odb::Lib::FileModel::Design { bool MiscInfoFile::Parse(std::filesystem::path path) diff --git a/OdbDesignLib/MiscInfoFile.h b/OdbDesignLib/MiscInfoFile.h index 10440ec0..cdd46a70 100644 --- a/OdbDesignLib/MiscInfoFile.h +++ b/OdbDesignLib/MiscInfoFile.h @@ -5,10 +5,7 @@ #include "OdbFile.h" #include -#ifndef ODBDESIGN_MISCINFOFILE_H -#define ODBDESIGN_MISCINFOFILE_H - -using namespace std::chrono; +#pragma once namespace Odb::Lib::FileModel::Design { @@ -17,15 +14,15 @@ namespace Odb::Lib::FileModel::Design { public: MiscInfoFile() = default; - ~MiscInfoFile() override = default; + ~MiscInfoFile() = default; std::string GetProductModelName() const; std::string GetJobName() const; std::string GetOdbVersionMajor() const; std::string GetOdbVersionMinor() const; - std::string GetOdbSource() const; - system_clock::time_point GetCreationDate() const; - system_clock::time_point GetSaveDate() const; + std::string GetOdbSource() const; + std::chrono::system_clock::time_point GetCreationDate() const; + std::chrono::system_clock::time_point GetSaveDate() const; std::string GetSaveApp() const; std::string GetSaveUser() const; std::string GetUnits() const; @@ -39,16 +36,12 @@ namespace Odb::Lib::FileModel::Design std::string m_odbVersionMajor; std::string m_odbVersionMinor; std::string m_odbSource; - system_clock::time_point m_creationDateDate; // "20161024.101454" - system_clock::time_point m_saveDate; // "20170810.132829" + std::chrono::system_clock::time_point m_creationDateDate; // "20161024.101454" + std::chrono::system_clock::time_point m_saveDate; // "20170810.132829" std::string m_saveApp; std::string m_saveUser; std::string m_units; unsigned int m_maxUniqueId; }; - } - - -#endif //ODBDESIGN_MISCINFOFILE_H diff --git a/OdbDesignLib/OdbAppBase.cpp b/OdbDesignLib/OdbAppBase.cpp index 58e3b103..2f3bd86e 100644 --- a/OdbDesignLib/OdbAppBase.cpp +++ b/OdbDesignLib/OdbAppBase.cpp @@ -18,7 +18,7 @@ namespace Odb::Lib google::protobuf::ShutdownProtobufLibrary(); } - const CommandLineArgs& OdbAppBase::arguments() const + const OdbDesignArgs& OdbAppBase::args() const { return m_commandLineArgs; } diff --git a/OdbDesignLib/OdbAppBase.h b/OdbDesignLib/OdbAppBase.h index b6dd1d70..e6fab74e 100644 --- a/OdbDesignLib/OdbAppBase.h +++ b/OdbDesignLib/OdbAppBase.h @@ -2,12 +2,9 @@ #include "IOdbServerApp.h" #include "DesignCache.h" -#include "Logger.h" -#include "CommandLineArgs.h" +#include "OdbDesignArgs.h" #include "odbdesign_export.h" -using namespace Utils; - namespace Odb::Lib { class ODBDESIGN_EXPORT OdbAppBase : public virtual IOdbApp @@ -16,16 +13,14 @@ namespace Odb::Lib OdbAppBase(int argc, char* argv[]); virtual ~OdbAppBase(); - static Logger m_logger; - - const CommandLineArgs& arguments() const override; + const OdbDesignArgs& args() const override; DesignCache& design_cache() override; virtual Utils::ExitCode Run() override; protected: DesignCache m_designCache; - CommandLineArgs m_commandLineArgs; + const OdbDesignArgs m_commandLineArgs; }; } diff --git a/OdbDesignLib/OdbDesignArgs.cpp b/OdbDesignLib/OdbDesignArgs.cpp new file mode 100644 index 00000000..954b77f2 --- /dev/null +++ b/OdbDesignLib/OdbDesignArgs.cpp @@ -0,0 +1,29 @@ +#include "OdbDesignArgs.h" + +namespace Odb::Lib +{ + OdbDesignArgs::OdbDesignArgs(int argc, char* argv[]) + : CommandLineArgs(argc, argv) + { + } + + int OdbDesignArgs::port() const + { + return boolArg("port"); + } + + bool OdbDesignArgs::useHttps() const + { + return boolArg("use-https"); + } + + std::string OdbDesignArgs::designsDir() const + { + return stringArg("designs-dir"); + } + + std::string OdbDesignArgs::templatesDir() const + { + return stringArg("templates-dir"); + } +} diff --git a/OdbDesignLib/OdbDesignArgs.h b/OdbDesignLib/OdbDesignArgs.h new file mode 100644 index 00000000..4a20dba1 --- /dev/null +++ b/OdbDesignLib/OdbDesignArgs.h @@ -0,0 +1,23 @@ +#pragma once + +#include "CommandLineArgs.h" +#include "odbdesign_export.h" + +namespace Odb::Lib +{ + class ODBDESIGN_EXPORT OdbDesignArgs : public Utils::CommandLineArgs + { + public: + OdbDesignArgs(int argc, char* argv[]); + + int port() const; + bool useHttps() const; + std::string designsDir() const; + std::string templatesDir() const; + + // port + // use HTTPS + // designs dir + // templates dir + }; +} diff --git a/OdbDesignLib/OdbDesignLib.i b/OdbDesignLib/OdbDesignLib.i index a0a4bb89..7c1c0550 100644 --- a/OdbDesignLib/OdbDesignLib.i +++ b/OdbDesignLib/OdbDesignLib.i @@ -4,7 +4,12 @@ %header %{ #include "Component.h" #include "Design.h" +#include "IProtoBuffable.h" #include "EdaDataFile.h" +#include "OdbFile.h" +#include "MiscInfoFile.h" +#include "MatrixFile.h" +#include "StandardFontsFile.h" #include "enums.h" #include "FileArchive.h" #include "LayerDirectory.h" @@ -16,8 +21,9 @@ #include "Pin.h" #include "PinConnection.h" #include "StepDirectory.h" -#include "string_trim.h" +#include "str_trim.h" #include "Via.h" +//#include "edadatafile.pb.h" /* some objects' namespaces aren't included correctly */ using PinConnection = Odb::Lib::ProductModel::PinConnection; @@ -28,6 +34,9 @@ using Component = Odb::Lib::ProductModel::Component; using namespace Odb::Lib; //using BoardSide = Odb::Lib::BoardSide; using StepDirectory = Odb::Lib::FileModel::Design::StepDirectory; +using MatrixFile = Odb::Lib::FileModel::Design::MatrixFile; +using StandardFontsFile = Odb::Lib::FileModel::Design::StandardFontsFile; + %} // support for STL types @@ -38,14 +47,19 @@ using StepDirectory = Odb::Lib::FileModel::Design::StepDirectory; // to handle declspec(dllexport) on Windows %include -%include "export.h" +%include "odbdesign_export.h" +%include "../Utils/utils_export.h" // code definitions +//%include "proto/edadatafile.pb.h" +%include "IProtoBuffable.h" %include "Net.h" %include "Component.h" %include "Design.h" %include "EdaDataFile.h" -%include "BoardSide.h" +%include "OdbFile.h" +%include "MiscInfoFile.h" +%include "enums.h" %include "FileArchive.h" %include "LayerDirectory.h" %include "ComponentLayerDirectory.h" @@ -56,5 +70,9 @@ using StepDirectory = Odb::Lib::FileModel::Design::StepDirectory; %include "Pin.h" %include "PinConnection.h" %include "StepDirectory.h" -%include "str_trim.h" +%include "../Utils/str_trim.h" %include "Via.h" +%include "StandardFontsFile.h" +%include "MatrixFile.h" + +//%template(EdaDataFileIProtoBuffable) Odb::Lib::IProtoBuffable; diff --git a/OdbDesignLib/OdbServerAppBase.cpp b/OdbDesignLib/OdbServerAppBase.cpp index 00d4a9a1..ca671d2a 100644 --- a/OdbDesignLib/OdbServerAppBase.cpp +++ b/OdbDesignLib/OdbServerAppBase.cpp @@ -1,5 +1,6 @@ #include "OdbServerAppBase.h" +using namespace Utils; namespace Odb::Lib { @@ -24,6 +25,9 @@ namespace Odb::Lib // enable HTTP compression m_crowApp.use_compression(crow::compression::algorithm::GZIP); + // enable SSL/HTTPS + m_crowApp.ssl_file("ssl/localhost.crt", "ssl/localhost.key"); + // let subclasses add controller types add_controllers(); diff --git a/OdbDesignLib/OdbServerAppBase.h b/OdbDesignLib/OdbServerAppBase.h index a0a9974c..2e5bdeaf 100644 --- a/OdbDesignLib/OdbServerAppBase.h +++ b/OdbDesignLib/OdbServerAppBase.h @@ -16,7 +16,7 @@ namespace Odb::Lib crow::SimpleApp& crow_app() override; - ExitCode Run() override; + Utils::ExitCode Run() override; protected: crow::SimpleApp m_crowApp; diff --git a/OdbDesignLib/RgbColor.cpp b/OdbDesignLib/RgbColor.cpp index 41eed34f..d87f9c97 100644 --- a/OdbDesignLib/RgbColor.cpp +++ b/OdbDesignLib/RgbColor.cpp @@ -3,10 +3,10 @@ namespace Odb::Lib::FileModel::Design { RgbColor::RgbColor() - : noPreference(false) - , red(0) + : red(0) , green(0) , blue(0) + , noPreference(false) { } diff --git a/OdbDesignLib/StandardFontsFile.cpp b/OdbDesignLib/StandardFontsFile.cpp new file mode 100644 index 00000000..cd80270e --- /dev/null +++ b/OdbDesignLib/StandardFontsFile.cpp @@ -0,0 +1,154 @@ +#include "StandardFontsFile.h" + +#include "Logger.h" +#include +#include "str_trim.h" +#include "Constants.h" + +namespace Odb::Lib::FileModel::Design +{ + bool StandardFontsFile::Parse(std::filesystem::path path) + { + //Utils::Logger::instance()->operator<<("Parsing standard fonts file"); + + if (!OdbFile::Parse(path)) return false; + + auto fontsStandardFile = path / "standard"; + if (!std::filesystem::exists(fontsStandardFile)) return false; + + std::ifstream standardFile; + standardFile.open(fontsStandardFile, std::ios::in); + if (!standardFile.is_open()) return false; + + std::shared_ptr pCurrentCharacterBlock; + std::shared_ptr pCurrentLineRecord; + bool beginTokenFound = false; + + std::string line; + while (std::getline(standardFile, line)) + { + // trim whitespace from beginning and end of line + Utils::str_trim(line); + if (!line.empty()) + { + std::stringstream lineStream(line); + if (line.find(Constants::COMMENT_TOKEN) == 0) + { + // comment line + } + else if (line.find("XSIZE") == 0) + { + std::string token; + if (!(lineStream >> token)) return false; + if (token != "XSIZE") return false; + + if (!(lineStream >> token)) return false; + m_xSize = std::stof(token); + } + else if (line.find("YSIZE") == 0) + { + std::string token; + if (!(lineStream >> token)) return false; + if (token != "YSIZE") return false; + + if (!(lineStream >> token)) return false; + m_ySize = std::stof(token); + } + else if (line.find("OFFSET") == 0) + { + std::string token; + if (!(lineStream >> token)) return false; + if (token != "OFFSET") return false; + + if (!(lineStream >> token)) return false; + m_offset = std::stof(token); + } + else if (line.find(CharacterBlock::BEGIN_TOKEN) == 0) + { + pCurrentCharacterBlock = std::make_shared(); + beginTokenFound = true; + + std::string token; + if (!(lineStream >> token)) return false; + if (token != CharacterBlock::BEGIN_TOKEN) return false; + + if (!(lineStream >> token)) return false; + Utils::str_trim(token); + if (token.length() != 1) return false; + pCurrentCharacterBlock->character = token[0]; + } + else if (line.find(CharacterBlock::END_TOKEN) == 0) + { + if (pCurrentCharacterBlock != nullptr && beginTokenFound) + { + m_characterBlocks.push_back(pCurrentCharacterBlock); + beginTokenFound = false; + pCurrentCharacterBlock.reset(); + } + else + { + return false; + } + } + else if (line.find(CharacterBlock::LineRecord::LINE_RECORD_TOKEN) == 0) + { + std::string token; + if (!(lineStream >> token)) return false; + if (token != CharacterBlock::LineRecord::LINE_RECORD_TOKEN) return false; + + if (pCurrentCharacterBlock == nullptr || !beginTokenFound) return false; + + auto pLineRecord = std::make_shared(); + + if (!(lineStream >> token)) return false; + pLineRecord->xStart = std::stof(token); + + if (!(lineStream >> token)) return false; + pLineRecord->yStart = std::stof(token); + + if (!(lineStream >> token)) return false; + pLineRecord->xEnd = std::stof(token); + + if (!(lineStream >> token)) return false; + pLineRecord->yEnd = std::stof(token); + + // polarity + if (!(lineStream >> token)) return false; + Utils::str_trim(token); + if (token.length() != 1) return false; + + switch (token[0]) + { + case 'P': pLineRecord->polarity = Polarity::Positive; break; + case 'N': pLineRecord->polarity = Polarity::Negative; break; + default: return false; + } + + // shape + if (!(lineStream >> token)) return false; + Utils::str_trim(token); + if (token.length() != 1) return false; + + switch (token[0]) + { + case 'R': pLineRecord->shape = LineShape::Round; break; + case 'S': pLineRecord->shape = LineShape::Square; break; + default: return false; + } + + // width + if (!(lineStream >> token)) return false; + pLineRecord->width = std::stof(token); + + pCurrentCharacterBlock->m_lineRecords.push_back(pLineRecord); + } + else + { + return false; + } + } + } + + return true; + } +} \ No newline at end of file diff --git a/OdbDesignLib/StandardFontsFile.h b/OdbDesignLib/StandardFontsFile.h new file mode 100644 index 00000000..9e86d0d0 --- /dev/null +++ b/OdbDesignLib/StandardFontsFile.h @@ -0,0 +1,53 @@ +#pragma once + +#include "OdbFile.h" +#include "odbdesign_export.h" +#include "enums.h" +#include + +namespace Odb::Lib::FileModel::Design +{ + class StandardFontsFile : public OdbFile + { + public: + StandardFontsFile() = default; + ~StandardFontsFile() = default; + + bool Parse(std::filesystem::path path) override; + + struct CharacterBlock + { + struct LineRecord + { + float xStart; + float yStart; + float xEnd; + float yEnd; + Polarity polarity; + LineShape shape; + float width; + + typedef std::vector> Vector; + + inline static constexpr const char* LINE_RECORD_TOKEN = "LINE"; + }; + + inline static constexpr const char* BEGIN_TOKEN = "CHAR"; + inline static constexpr const char* END_TOKEN = "ECHAR"; + + char character; + LineRecord::Vector m_lineRecords; + + typedef std::vector> Vector; + + }; + + private: + float m_xSize; + float m_ySize; + float m_offset; + + CharacterBlock::Vector m_characterBlocks; + + }; +} diff --git a/OdbDesignLib/enums.h b/OdbDesignLib/enums.h new file mode 100644 index 00000000..0f09453b --- /dev/null +++ b/OdbDesignLib/enums.h @@ -0,0 +1,22 @@ +#pragma once + +namespace Odb::Lib +{ + enum class BoardSide + { + Top, + Bottom + }; + + enum class LineShape + { + Square, + Round + }; + + enum class Polarity + { + Positive, + Negative + }; +} diff --git a/OdbDesignLib/proto/edadatafile.pb.cc b/OdbDesignLib/proto/edadatafile.pb.cc index 6b9f0362..1c61134f 100644 --- a/OdbDesignLib/proto/edadatafile.pb.cc +++ b/OdbDesignLib/proto/edadatafile.pb.cc @@ -20,8 +20,9 @@ PROTOBUF_PRAGMA_INIT_SEG namespace _pb = ::PROTOBUF_NAMESPACE_ID; namespace _pbi = _pb::internal; -namespace odbdesign { -namespace proto { +namespace Odb { +namespace Lib { +namespace Protobuf { PROTOBUF_CONSTEXPR EdaDataFile_PropertyRecord::EdaDataFile_PropertyRecord( ::_pbi::ConstantInitialized): _impl_{ /*decltype(_impl_._has_bits_)*/{} @@ -194,51 +195,52 @@ struct EdaDataFileDefaultTypeInternal { }; }; PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 EdaDataFileDefaultTypeInternal _EdaDataFile_default_instance_; -} // namespace proto -} // namespace odbdesign +} // namespace Protobuf +} // namespace Lib +} // namespace Odb static ::_pb::Metadata file_level_metadata_edadatafile_2eproto[10]; static const ::_pb::EnumDescriptor* file_level_enum_descriptors_edadatafile_2eproto[8]; static constexpr ::_pb::ServiceDescriptor const** file_level_service_descriptors_edadatafile_2eproto = nullptr; const uint32_t TableStruct_edadatafile_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PropertyRecord, _impl_._has_bits_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PropertyRecord, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord, _impl_._has_bits_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PropertyRecord, _impl_.name_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PropertyRecord, _impl_.value_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PropertyRecord, _impl_.floatvalues_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord, _impl_.name_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord, _impl_.value_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord, _impl_.floatvalues_), 0, 1, ~0u, - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord, _impl_._has_bits_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord, _impl_._has_bits_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord, _impl_.type_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord, _impl_.layernumber_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord, _impl_.featurenumber_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord, _impl_.type_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord, _impl_.layernumber_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord, _impl_.featurenumber_), 0, 1, 2, - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord, _impl_._has_bits_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord, _impl_._has_bits_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord, _impl_.type_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord, _impl_.featureidrecords_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord, _impl_.filltype_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord, _impl_.cutouttype_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord, _impl_.fillsize_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord, _impl_.side_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord, _impl_.componentnumber_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord, _impl_.toeprintnumber_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord, _impl_.type_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord, _impl_.featureidrecords_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord, _impl_.filltype_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord, _impl_.cutouttype_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord, _impl_.fillsize_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord, _impl_.side_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord, _impl_.componentnumber_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord, _impl_.toeprintnumber_), 0, ~0u, 1, @@ -247,47 +249,47 @@ const uint32_t TableStruct_edadatafile_2eproto::offsets[] PROTOBUF_SECTION_VARIA 4, 5, 6, - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_NetRecord, _impl_._has_bits_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_NetRecord, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_NetRecord, _impl_._has_bits_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_NetRecord, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_NetRecord, _impl_.name_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_NetRecord, _impl_.attributesidstring_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_NetRecord, _impl_.index_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_NetRecord, _impl_.subnetrecords_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_NetRecord, _impl_.propertyrecords_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_NetRecord, _impl_.name_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_NetRecord, _impl_.attributesidstring_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_NetRecord, _impl_.index_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_NetRecord, _impl_.subnetrecords_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_NetRecord, _impl_.propertyrecords_), 0, 1, 2, ~0u, ~0u, - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse, _has_bits_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse, _has_bits_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse, key_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse, value_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse, key_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse, value_), 0, 1, - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord, _impl_._has_bits_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord, _impl_._has_bits_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord, _impl_.name_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord, _impl_.type_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord, _impl_.xcenter_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord, _impl_.ycenter_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord, _impl_.finishedholesize_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord, _impl_.electricaltype_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord, _impl_.mounttype_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord, _impl_.id_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord, _impl_.index_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord, _impl_.name_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord, _impl_.type_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord, _impl_.xcenter_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord, _impl_.ycenter_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord, _impl_.finishedholesize_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord, _impl_.electricaltype_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord, _impl_.mounttype_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord, _impl_.id_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord, _impl_.index_), 0, 1, 2, @@ -297,22 +299,22 @@ const uint32_t TableStruct_edadatafile_2eproto::offsets[] PROTOBUF_SECTION_VARIA 6, 7, 8, - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PackageRecord, _impl_._has_bits_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PackageRecord, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord, _impl_._has_bits_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PackageRecord, _impl_.name_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PackageRecord, _impl_.pitch_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PackageRecord, _impl_.xmin_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PackageRecord, _impl_.ymin_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PackageRecord, _impl_.xmax_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PackageRecord, _impl_.ymax_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PackageRecord, _impl_.attributesidstring_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PackageRecord, _impl_.pinrecords_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PackageRecord, _impl_.pinrecordsbyname_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PackageRecord, _impl_.propertyrecords_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord, _impl_.name_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord, _impl_.pitch_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord, _impl_.xmin_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord, _impl_.ymin_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord, _impl_.xmax_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord, _impl_.ymax_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord, _impl_.attributesidstring_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord, _impl_.pinrecords_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord, _impl_.pinrecordsbyname_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord, _impl_.propertyrecords_), 0, 2, 3, @@ -323,42 +325,42 @@ const uint32_t TableStruct_edadatafile_2eproto::offsets[] PROTOBUF_SECTION_VARIA ~0u, ~0u, ~0u, - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_NetRecordsByNameEntry_DoNotUse, _has_bits_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_NetRecordsByNameEntry_DoNotUse, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_NetRecordsByNameEntry_DoNotUse, _has_bits_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_NetRecordsByNameEntry_DoNotUse, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_NetRecordsByNameEntry_DoNotUse, key_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_NetRecordsByNameEntry_DoNotUse, value_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_NetRecordsByNameEntry_DoNotUse, key_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_NetRecordsByNameEntry_DoNotUse, value_), 0, 1, - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PackageRecordsByNameEntry_DoNotUse, _has_bits_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PackageRecordsByNameEntry_DoNotUse, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PackageRecordsByNameEntry_DoNotUse, _has_bits_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PackageRecordsByNameEntry_DoNotUse, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PackageRecordsByNameEntry_DoNotUse, key_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile_PackageRecordsByNameEntry_DoNotUse, value_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PackageRecordsByNameEntry_DoNotUse, key_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile_PackageRecordsByNameEntry_DoNotUse, value_), 0, 1, - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile, _impl_._has_bits_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile, _impl_._has_bits_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile, _impl_.path_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile, _impl_.units_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile, _impl_.source_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile, _impl_.layernames_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile, _impl_.attributenames_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile, _impl_.attributetextvalues_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile, _impl_.netrecords_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile, _impl_.netrecordsbyname_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile, _impl_.packagerecords_), - PROTOBUF_FIELD_OFFSET(::odbdesign::proto::EdaDataFile, _impl_.packagerecordsbyname_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile, _impl_.path_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile, _impl_.units_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile, _impl_.source_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile, _impl_.layernames_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile, _impl_.attributenames_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile, _impl_.attributetextvalues_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile, _impl_.netrecords_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile, _impl_.netrecordsbyname_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile, _impl_.packagerecords_), + PROTOBUF_FIELD_OFFSET(::Odb::Lib::Protobuf::EdaDataFile, _impl_.packagerecordsbyname_), 0, 1, 2, @@ -371,124 +373,125 @@ const uint32_t TableStruct_edadatafile_2eproto::offsets[] PROTOBUF_SECTION_VARIA ~0u, }; static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { - { 0, 9, -1, sizeof(::odbdesign::proto::EdaDataFile_PropertyRecord)}, - { 12, 21, -1, sizeof(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord)}, - { 24, 38, -1, sizeof(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord)}, - { 46, 57, -1, sizeof(::odbdesign::proto::EdaDataFile_NetRecord)}, - { 62, 70, -1, sizeof(::odbdesign::proto::EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse)}, - { 72, 87, -1, sizeof(::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord)}, - { 96, 112, -1, sizeof(::odbdesign::proto::EdaDataFile_PackageRecord)}, - { 122, 130, -1, sizeof(::odbdesign::proto::EdaDataFile_NetRecordsByNameEntry_DoNotUse)}, - { 132, 140, -1, sizeof(::odbdesign::proto::EdaDataFile_PackageRecordsByNameEntry_DoNotUse)}, - { 142, 158, -1, sizeof(::odbdesign::proto::EdaDataFile)}, + { 0, 9, -1, sizeof(::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord)}, + { 12, 21, -1, sizeof(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord)}, + { 24, 38, -1, sizeof(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord)}, + { 46, 57, -1, sizeof(::Odb::Lib::Protobuf::EdaDataFile_NetRecord)}, + { 62, 70, -1, sizeof(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse)}, + { 72, 87, -1, sizeof(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord)}, + { 96, 112, -1, sizeof(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord)}, + { 122, 130, -1, sizeof(::Odb::Lib::Protobuf::EdaDataFile_NetRecordsByNameEntry_DoNotUse)}, + { 132, 140, -1, sizeof(::Odb::Lib::Protobuf::EdaDataFile_PackageRecordsByNameEntry_DoNotUse)}, + { 142, 158, -1, sizeof(::Odb::Lib::Protobuf::EdaDataFile)}, }; static const ::_pb::Message* const file_default_instances[] = { - &::odbdesign::proto::_EdaDataFile_PropertyRecord_default_instance_._instance, - &::odbdesign::proto::_EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord_default_instance_._instance, - &::odbdesign::proto::_EdaDataFile_NetRecord_SubnetRecord_default_instance_._instance, - &::odbdesign::proto::_EdaDataFile_NetRecord_default_instance_._instance, - &::odbdesign::proto::_EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse_default_instance_._instance, - &::odbdesign::proto::_EdaDataFile_PackageRecord_PinRecord_default_instance_._instance, - &::odbdesign::proto::_EdaDataFile_PackageRecord_default_instance_._instance, - &::odbdesign::proto::_EdaDataFile_NetRecordsByNameEntry_DoNotUse_default_instance_._instance, - &::odbdesign::proto::_EdaDataFile_PackageRecordsByNameEntry_DoNotUse_default_instance_._instance, - &::odbdesign::proto::_EdaDataFile_default_instance_._instance, + &::Odb::Lib::Protobuf::_EdaDataFile_PropertyRecord_default_instance_._instance, + &::Odb::Lib::Protobuf::_EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord_default_instance_._instance, + &::Odb::Lib::Protobuf::_EdaDataFile_NetRecord_SubnetRecord_default_instance_._instance, + &::Odb::Lib::Protobuf::_EdaDataFile_NetRecord_default_instance_._instance, + &::Odb::Lib::Protobuf::_EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse_default_instance_._instance, + &::Odb::Lib::Protobuf::_EdaDataFile_PackageRecord_PinRecord_default_instance_._instance, + &::Odb::Lib::Protobuf::_EdaDataFile_PackageRecord_default_instance_._instance, + &::Odb::Lib::Protobuf::_EdaDataFile_NetRecordsByNameEntry_DoNotUse_default_instance_._instance, + &::Odb::Lib::Protobuf::_EdaDataFile_PackageRecordsByNameEntry_DoNotUse_default_instance_._instance, + &::Odb::Lib::Protobuf::_EdaDataFile_default_instance_._instance, }; const char descriptor_table_protodef_edadatafile_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = - "\n\021edadatafile.proto\022\017odbdesign.proto\"\221\033\n" - "\013EdaDataFile\022\021\n\004path\030\001 \001(\tH\000\210\001\001\022\022\n\005units" - "\030\002 \001(\tH\001\210\001\001\022\023\n\006source\030\003 \001(\tH\002\210\001\001\022\022\n\nlaye" - "rNames\030\004 \003(\t\022\026\n\016attributeNames\030\005 \003(\t\022\033\n\023" - "attributeTextValues\030\006 \003(\t\022:\n\nnetRecords\030" - "\007 \003(\0132&.odbdesign.proto.EdaDataFile.NetR" - "ecord\022L\n\020netRecordsByName\030\010 \003(\01322.odbdes" - "ign.proto.EdaDataFile.NetRecordsByNameEn" - "try\022B\n\016packageRecords\030\t \003(\0132*.odbdesign." - "proto.EdaDataFile.PackageRecord\022T\n\024packa" - "geRecordsByName\030\n \003(\01326.odbdesign.proto." - "EdaDataFile.PackageRecordsByNameEntry\032_\n" - "\016PropertyRecord\022\021\n\004name\030\001 \001(\tH\000\210\001\001\022\022\n\005va" - "lue\030\002 \001(\tH\001\210\001\001\022\023\n\013floatValues\030\003 \003(\002B\007\n\005_" - "nameB\010\n\006_value\032\201\n\n\tNetRecord\022\021\n\004name\030\001 \001" - "(\tH\000\210\001\001\022\037\n\022attributesIdString\030\002 \001(\tH\001\210\001\001" - "\022\022\n\005index\030\003 \001(\rH\002\210\001\001\022J\n\rsubnetRecords\030\004 " - "\003(\01323.odbdesign.proto.EdaDataFile.NetRec" - "ord.SubnetRecord\022D\n\017propertyRecords\030\005 \003(" - "\0132+.odbdesign.proto.EdaDataFile.Property" - "Record\032\357\007\n\014SubnetRecord\022K\n\004type\030\001 \001(\01628." - "odbdesign.proto.EdaDataFile.NetRecord.Su" - "bnetRecord.TypeH\000\210\001\001\022]\n\020featureIdRecords" - "\030\002 \003(\0132C.odbdesign.proto.EdaDataFile.Net" - "Record.SubnetRecord.FeatureIdRecord\022S\n\010f" - "illType\030\003 \001(\0162<.odbdesign.proto.EdaDataF" - "ile.NetRecord.SubnetRecord.FillTypeH\001\210\001\001" - "\022W\n\ncutoutType\030\004 \001(\0162>.odbdesign.proto.E" - "daDataFile.NetRecord.SubnetRecord.Cutout" - "TypeH\002\210\001\001\022\025\n\010fillSize\030\005 \001(\002H\003\210\001\001\0229\n\004side" - "\030\006 \001(\0162&.odbdesign.proto.EdaDataFile.Boa" - "rdSideH\004\210\001\001\022\034\n\017componentNumber\030\007 \001(\rH\005\210\001" - "\001\022\033\n\016toeprintNumber\030\010 \001(\rH\006\210\001\001\032\373\001\n\017Featu" - "reIdRecord\022[\n\004type\030\001 \001(\0162H.odbdesign.pro" - "to.EdaDataFile.NetRecord.SubnetRecord.Fe" - "atureIdRecord.TypeH\000\210\001\001\022\030\n\013layerNumber\030\002" - " \001(\rH\001\210\001\001\022\032\n\rfeatureNumber\030\003 \001(\rH\002\210\001\001\"*\n" - "\004Type\022\n\n\006COPPER\020\000\022\014\n\010LAMINATE\020\001\022\010\n\004HOLE\020" - "\002B\007\n\005_typeB\016\n\014_layerNumberB\020\n\016_featureNu" - "mber\"3\n\004Type\022\007\n\003VIA\020\000\022\t\n\005TRACE\020\001\022\t\n\005PLAN" - "E\020\002\022\014\n\010TOEPRINT\020\003\"\"\n\010FillType\022\t\n\005SOLID\020\000" - "\022\013\n\007OUTLINE\020\001\"\?\n\nCutoutType\022\n\n\006CIRCLE\020\000\022" - "\r\n\tRECTANGLE\020\001\022\013\n\007OCTAGON\020\002\022\t\n\005EXACT\020\003B\007" - "\n\005_typeB\013\n\t_fillTypeB\r\n\013_cutoutTypeB\013\n\t_" - "fillSizeB\007\n\005_sideB\022\n\020_componentNumberB\021\n" - "\017_toeprintNumberB\007\n\005_nameB\025\n\023_attributes" - "IdStringB\010\n\006_index\032\351\n\n\rPackageRecord\022\021\n\004" - "name\030\001 \001(\tH\000\210\001\001\022\022\n\005pitch\030\002 \001(\002H\001\210\001\001\022\021\n\004x" - "Min\030\003 \001(\002H\002\210\001\001\022\021\n\004yMin\030\004 \001(\002H\003\210\001\001\022\021\n\004xMa" - "x\030\005 \001(\002H\004\210\001\001\022\021\n\004yMax\030\006 \001(\002H\005\210\001\001\022\037\n\022attri" - "butesIdString\030\007 \001(\tH\006\210\001\001\022H\n\npinRecords\030\010" - " \003(\01324.odbdesign.proto.EdaDataFile.Packa" - "geRecord.PinRecord\022Z\n\020pinRecordsByName\030\t" - " \003(\0132@.odbdesign.proto.EdaDataFile.Packa" - "geRecord.PinRecordsByNameEntry\022D\n\017proper" - "tyRecords\030\n \003(\0132+.odbdesign.proto.EdaDat" - "aFile.PropertyRecord\032m\n\025PinRecordsByName" - "Entry\022\013\n\003key\030\001 \001(\t\022C\n\005value\030\002 \001(\01324.odbd" - "esign.proto.EdaDataFile.PackageRecord.Pi" - "nRecord:\0028\001\032\232\006\n\tPinRecord\022\021\n\004name\030\001 \001(\tH" - "\000\210\001\001\022L\n\004type\030\002 \001(\01629.odbdesign.proto.Eda" - "DataFile.PackageRecord.PinRecord.TypeH\001\210" - "\001\001\022\024\n\007xCenter\030\003 \001(\002H\002\210\001\001\022\024\n\007yCenter\030\004 \001(" - "\002H\003\210\001\001\022\035\n\020finishedHoleSize\030\005 \001(\002H\004\210\001\001\022`\n" - "\016electricalType\030\006 \001(\0162C.odbdesign.proto." - "EdaDataFile.PackageRecord.PinRecord.Elec" - "tricalTypeH\005\210\001\001\022V\n\tmountType\030\007 \001(\0162>.odb" - "design.proto.EdaDataFile.PackageRecord.P" - "inRecord.MountTypeH\006\210\001\001\022\017\n\002id\030\010 \001(\rH\007\210\001\001" - "\022\022\n\005index\030\t \001(\rH\010\210\001\001\"0\n\004Type\022\020\n\014THROUGH_" - "HOLE\020\000\022\t\n\005BLIND\020\001\022\013\n\007SURFACE\020\002\"C\n\016Electr" - "icalType\022\016\n\nELECTRICAL\020\000\022\022\n\016NON_ELECTRIC" - "AL\020\001\022\r\n\tUNDEFINED\020\002\"\231\001\n\tMountType\022\007\n\003SMT" - "\020\000\022\027\n\023RECOMMENDED_SMT_PAD\020\001\022\023\n\017MT_THROUG" - "H_HOLE\020\002\022\034\n\030RECOMMENDED_THROUGH_HOLE\020\003\022\014" - "\n\010PRESSFIT\020\004\022\r\n\tNON_BOARD\020\005\022\010\n\004HOLE\020\006\022\020\n" - "\014MT_UNDEFINED\020\007B\007\n\005_nameB\007\n\005_typeB\n\n\010_xC" - "enterB\n\n\010_yCenterB\023\n\021_finishedHoleSizeB\021" - "\n\017_electricalTypeB\014\n\n_mountTypeB\005\n\003_idB\010" - "\n\006_indexB\007\n\005_nameB\010\n\006_pitchB\007\n\005_xMinB\007\n\005" - "_yMinB\007\n\005_xMaxB\007\n\005_yMaxB\025\n\023_attributesId" - "String\032_\n\025NetRecordsByNameEntry\022\013\n\003key\030\001" - " \001(\t\0225\n\005value\030\002 \001(\0132&.odbdesign.proto.Ed" - "aDataFile.NetRecord:\0028\001\032g\n\031PackageRecord" - "sByNameEntry\022\013\n\003key\030\001 \001(\t\0229\n\005value\030\002 \001(\013" - "2*.odbdesign.proto.EdaDataFile.PackageRe" - "cord:\0028\001\" \n\tBoardSide\022\007\n\003TOP\020\000\022\n\n\006BOTTOM" - "\020\001B\007\n\005_pathB\010\n\006_unitsB\t\n\007_sourceb\006proto3" + "\n\021edadatafile.proto\022\020Odb.Lib.Protobuf\"\246\033" + "\n\013EdaDataFile\022\021\n\004path\030\001 \001(\tH\000\210\001\001\022\022\n\005unit" + "s\030\002 \001(\tH\001\210\001\001\022\023\n\006source\030\003 \001(\tH\002\210\001\001\022\022\n\nlay" + "erNames\030\004 \003(\t\022\026\n\016attributeNames\030\005 \003(\t\022\033\n" + "\023attributeTextValues\030\006 \003(\t\022;\n\nnetRecords" + "\030\007 \003(\0132\'.Odb.Lib.Protobuf.EdaDataFile.Ne" + "tRecord\022M\n\020netRecordsByName\030\010 \003(\01323.Odb." + "Lib.Protobuf.EdaDataFile.NetRecordsByNam" + "eEntry\022C\n\016packageRecords\030\t \003(\0132+.Odb.Lib" + ".Protobuf.EdaDataFile.PackageRecord\022U\n\024p" + "ackageRecordsByName\030\n \003(\01327.Odb.Lib.Prot" + "obuf.EdaDataFile.PackageRecordsByNameEnt" + "ry\032_\n\016PropertyRecord\022\021\n\004name\030\001 \001(\tH\000\210\001\001\022" + "\022\n\005value\030\002 \001(\tH\001\210\001\001\022\023\n\013floatValues\030\003 \003(\002" + "B\007\n\005_nameB\010\n\006_value\032\211\n\n\tNetRecord\022\021\n\004nam" + "e\030\001 \001(\tH\000\210\001\001\022\037\n\022attributesIdString\030\002 \001(\t" + "H\001\210\001\001\022\022\n\005index\030\003 \001(\rH\002\210\001\001\022K\n\rsubnetRecor" + "ds\030\004 \003(\01324.Odb.Lib.Protobuf.EdaDataFile." + "NetRecord.SubnetRecord\022E\n\017propertyRecord" + "s\030\005 \003(\0132,.Odb.Lib.Protobuf.EdaDataFile.P" + "ropertyRecord\032\365\007\n\014SubnetRecord\022L\n\004type\030\001" + " \001(\01629.Odb.Lib.Protobuf.EdaDataFile.NetR" + "ecord.SubnetRecord.TypeH\000\210\001\001\022^\n\020featureI" + "dRecords\030\002 \003(\0132D.Odb.Lib.Protobuf.EdaDat" + "aFile.NetRecord.SubnetRecord.FeatureIdRe" + "cord\022T\n\010fillType\030\003 \001(\0162=.Odb.Lib.Protobu" + "f.EdaDataFile.NetRecord.SubnetRecord.Fil" + "lTypeH\001\210\001\001\022X\n\ncutoutType\030\004 \001(\0162\?.Odb.Lib" + ".Protobuf.EdaDataFile.NetRecord.SubnetRe" + "cord.CutoutTypeH\002\210\001\001\022\025\n\010fillSize\030\005 \001(\002H\003" + "\210\001\001\022:\n\004side\030\006 \001(\0162\'.Odb.Lib.Protobuf.Eda" + "DataFile.BoardSideH\004\210\001\001\022\034\n\017componentNumb" + "er\030\007 \001(\rH\005\210\001\001\022\033\n\016toeprintNumber\030\010 \001(\rH\006\210" + "\001\001\032\374\001\n\017FeatureIdRecord\022\\\n\004type\030\001 \001(\0162I.O" + "db.Lib.Protobuf.EdaDataFile.NetRecord.Su" + "bnetRecord.FeatureIdRecord.TypeH\000\210\001\001\022\030\n\013" + "layerNumber\030\002 \001(\rH\001\210\001\001\022\032\n\rfeatureNumber\030" + "\003 \001(\rH\002\210\001\001\"*\n\004Type\022\n\n\006COPPER\020\000\022\014\n\010LAMINA" + "TE\020\001\022\010\n\004HOLE\020\002B\007\n\005_typeB\016\n\014_layerNumberB" + "\020\n\016_featureNumber\"3\n\004Type\022\007\n\003VIA\020\000\022\t\n\005TR" + "ACE\020\001\022\t\n\005PLANE\020\002\022\014\n\010TOEPRINT\020\003\"\"\n\010FillTy" + "pe\022\t\n\005SOLID\020\000\022\013\n\007OUTLINE\020\001\"\?\n\nCutoutType" + "\022\n\n\006CIRCLE\020\000\022\r\n\tRECTANGLE\020\001\022\013\n\007OCTAGON\020\002" + "\022\t\n\005EXACT\020\003B\007\n\005_typeB\013\n\t_fillTypeB\r\n\013_cu" + "toutTypeB\013\n\t_fillSizeB\007\n\005_sideB\022\n\020_compo" + "nentNumberB\021\n\017_toeprintNumberB\007\n\005_nameB\025" + "\n\023_attributesIdStringB\010\n\006_index\032\360\n\n\rPack" + "ageRecord\022\021\n\004name\030\001 \001(\tH\000\210\001\001\022\022\n\005pitch\030\002 " + "\001(\002H\001\210\001\001\022\021\n\004xMin\030\003 \001(\002H\002\210\001\001\022\021\n\004yMin\030\004 \001(" + "\002H\003\210\001\001\022\021\n\004xMax\030\005 \001(\002H\004\210\001\001\022\021\n\004yMax\030\006 \001(\002H" + "\005\210\001\001\022\037\n\022attributesIdString\030\007 \001(\tH\006\210\001\001\022I\n" + "\npinRecords\030\010 \003(\01325.Odb.Lib.Protobuf.Eda" + "DataFile.PackageRecord.PinRecord\022[\n\020pinR" + "ecordsByName\030\t \003(\0132A.Odb.Lib.Protobuf.Ed" + "aDataFile.PackageRecord.PinRecordsByName" + "Entry\022E\n\017propertyRecords\030\n \003(\0132,.Odb.Lib" + ".Protobuf.EdaDataFile.PropertyRecord\032n\n\025" + "PinRecordsByNameEntry\022\013\n\003key\030\001 \001(\t\022D\n\005va" + "lue\030\002 \001(\01325.Odb.Lib.Protobuf.EdaDataFile" + ".PackageRecord.PinRecord:\0028\001\032\235\006\n\tPinReco" + "rd\022\021\n\004name\030\001 \001(\tH\000\210\001\001\022M\n\004type\030\002 \001(\0162:.Od" + "b.Lib.Protobuf.EdaDataFile.PackageRecord" + ".PinRecord.TypeH\001\210\001\001\022\024\n\007xCenter\030\003 \001(\002H\002\210" + "\001\001\022\024\n\007yCenter\030\004 \001(\002H\003\210\001\001\022\035\n\020finishedHole" + "Size\030\005 \001(\002H\004\210\001\001\022a\n\016electricalType\030\006 \001(\0162" + "D.Odb.Lib.Protobuf.EdaDataFile.PackageRe" + "cord.PinRecord.ElectricalTypeH\005\210\001\001\022W\n\tmo" + "untType\030\007 \001(\0162\?.Odb.Lib.Protobuf.EdaData" + "File.PackageRecord.PinRecord.MountTypeH\006" + "\210\001\001\022\017\n\002id\030\010 \001(\rH\007\210\001\001\022\022\n\005index\030\t \001(\rH\010\210\001\001" + "\"0\n\004Type\022\020\n\014THROUGH_HOLE\020\000\022\t\n\005BLIND\020\001\022\013\n" + "\007SURFACE\020\002\"C\n\016ElectricalType\022\016\n\nELECTRIC" + "AL\020\000\022\022\n\016NON_ELECTRICAL\020\001\022\r\n\tUNDEFINED\020\002\"" + "\231\001\n\tMountType\022\007\n\003SMT\020\000\022\027\n\023RECOMMENDED_SM" + "T_PAD\020\001\022\023\n\017MT_THROUGH_HOLE\020\002\022\034\n\030RECOMMEN" + "DED_THROUGH_HOLE\020\003\022\014\n\010PRESSFIT\020\004\022\r\n\tNON_" + "BOARD\020\005\022\010\n\004HOLE\020\006\022\020\n\014MT_UNDEFINED\020\007B\007\n\005_" + "nameB\007\n\005_typeB\n\n\010_xCenterB\n\n\010_yCenterB\023\n" + "\021_finishedHoleSizeB\021\n\017_electricalTypeB\014\n" + "\n_mountTypeB\005\n\003_idB\010\n\006_indexB\007\n\005_nameB\010\n" + "\006_pitchB\007\n\005_xMinB\007\n\005_yMinB\007\n\005_xMaxB\007\n\005_y" + "MaxB\025\n\023_attributesIdString\032`\n\025NetRecords" + "ByNameEntry\022\013\n\003key\030\001 \001(\t\0226\n\005value\030\002 \001(\0132" + "\'.Odb.Lib.Protobuf.EdaDataFile.NetRecord" + ":\0028\001\032h\n\031PackageRecordsByNameEntry\022\013\n\003key" + "\030\001 \001(\t\022:\n\005value\030\002 \001(\0132+.Odb.Lib.Protobuf" + ".EdaDataFile.PackageRecord:\0028\001\" \n\tBoardS" + "ide\022\007\n\003TOP\020\000\022\n\n\006BOTTOM\020\001B\007\n\005_pathB\010\n\006_un" + "itsB\t\n\007_sourceb\006proto3" ; static ::_pbi::once_flag descriptor_table_edadatafile_2eproto_once; const ::_pbi::DescriptorTable descriptor_table_edadatafile_2eproto = { - false, false, 3520, descriptor_table_protodef_edadatafile_2eproto, + false, false, 3542, descriptor_table_protodef_edadatafile_2eproto, "edadatafile.proto", &descriptor_table_edadatafile_2eproto_once, nullptr, 0, 10, schemas, file_default_instances, TableStruct_edadatafile_2eproto::offsets, @@ -501,8 +504,9 @@ PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_edadataf // Force running AddDescriptors() at dynamic initialization time. PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_edadatafile_2eproto(&descriptor_table_edadatafile_2eproto); -namespace odbdesign { -namespace proto { +namespace Odb { +namespace Lib { +namespace Protobuf { const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord_Type_descriptor() { ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&descriptor_table_edadatafile_2eproto); return file_level_enum_descriptors_edadatafile_2eproto[0]; @@ -715,7 +719,7 @@ EdaDataFile_PropertyRecord::EdaDataFile_PropertyRecord(::PROTOBUF_NAMESPACE_ID:: bool is_message_owned) : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { SharedCtor(arena, is_message_owned); - // @@protoc_insertion_point(arena_constructor:odbdesign.proto.EdaDataFile.PropertyRecord) + // @@protoc_insertion_point(arena_constructor:Odb.Lib.Protobuf.EdaDataFile.PropertyRecord) } EdaDataFile_PropertyRecord::EdaDataFile_PropertyRecord(const EdaDataFile_PropertyRecord& from) : ::PROTOBUF_NAMESPACE_ID::Message() { @@ -744,7 +748,7 @@ EdaDataFile_PropertyRecord::EdaDataFile_PropertyRecord(const EdaDataFile_Propert _this->_impl_.value_.Set(from._internal_value(), _this->GetArenaForAllocation()); } - // @@protoc_insertion_point(copy_constructor:odbdesign.proto.EdaDataFile.PropertyRecord) + // @@protoc_insertion_point(copy_constructor:Odb.Lib.Protobuf.EdaDataFile.PropertyRecord) } inline void EdaDataFile_PropertyRecord::SharedCtor( @@ -769,7 +773,7 @@ inline void EdaDataFile_PropertyRecord::SharedCtor( } EdaDataFile_PropertyRecord::~EdaDataFile_PropertyRecord() { - // @@protoc_insertion_point(destructor:odbdesign.proto.EdaDataFile.PropertyRecord) + // @@protoc_insertion_point(destructor:Odb.Lib.Protobuf.EdaDataFile.PropertyRecord) if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { (void)arena; return; @@ -789,7 +793,7 @@ void EdaDataFile_PropertyRecord::SetCachedSize(int size) const { } void EdaDataFile_PropertyRecord::Clear() { -// @@protoc_insertion_point(message_clear_start:odbdesign.proto.EdaDataFile.PropertyRecord) +// @@protoc_insertion_point(message_clear_start:Odb.Lib.Protobuf.EdaDataFile.PropertyRecord) uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -821,7 +825,7 @@ const char* EdaDataFile_PropertyRecord::_InternalParse(const char* ptr, ::_pbi:: auto str = _internal_mutable_name(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, "odbdesign.proto.EdaDataFile.PropertyRecord.name")); + CHK_(::_pbi::VerifyUTF8(str, "Odb.Lib.Protobuf.EdaDataFile.PropertyRecord.name")); } else goto handle_unusual; continue; @@ -831,7 +835,7 @@ const char* EdaDataFile_PropertyRecord::_InternalParse(const char* ptr, ::_pbi:: auto str = _internal_mutable_value(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, "odbdesign.proto.EdaDataFile.PropertyRecord.value")); + CHK_(::_pbi::VerifyUTF8(str, "Odb.Lib.Protobuf.EdaDataFile.PropertyRecord.value")); } else goto handle_unusual; continue; @@ -872,7 +876,7 @@ const char* EdaDataFile_PropertyRecord::_InternalParse(const char* ptr, ::_pbi:: uint8_t* EdaDataFile_PropertyRecord::_InternalSerialize( uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { - // @@protoc_insertion_point(serialize_to_array_start:odbdesign.proto.EdaDataFile.PropertyRecord) + // @@protoc_insertion_point(serialize_to_array_start:Odb.Lib.Protobuf.EdaDataFile.PropertyRecord) uint32_t cached_has_bits = 0; (void) cached_has_bits; @@ -881,7 +885,7 @@ uint8_t* EdaDataFile_PropertyRecord::_InternalSerialize( ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( this->_internal_name().data(), static_cast(this->_internal_name().length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, - "odbdesign.proto.EdaDataFile.PropertyRecord.name"); + "Odb.Lib.Protobuf.EdaDataFile.PropertyRecord.name"); target = stream->WriteStringMaybeAliased( 1, this->_internal_name(), target); } @@ -891,7 +895,7 @@ uint8_t* EdaDataFile_PropertyRecord::_InternalSerialize( ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( this->_internal_value().data(), static_cast(this->_internal_value().length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, - "odbdesign.proto.EdaDataFile.PropertyRecord.value"); + "Odb.Lib.Protobuf.EdaDataFile.PropertyRecord.value"); target = stream->WriteStringMaybeAliased( 2, this->_internal_value(), target); } @@ -905,12 +909,12 @@ uint8_t* EdaDataFile_PropertyRecord::_InternalSerialize( target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); } - // @@protoc_insertion_point(serialize_to_array_end:odbdesign.proto.EdaDataFile.PropertyRecord) + // @@protoc_insertion_point(serialize_to_array_end:Odb.Lib.Protobuf.EdaDataFile.PropertyRecord) return target; } size_t EdaDataFile_PropertyRecord::ByteSizeLong() const { -// @@protoc_insertion_point(message_byte_size_start:odbdesign.proto.EdaDataFile.PropertyRecord) +// @@protoc_insertion_point(message_byte_size_start:Odb.Lib.Protobuf.EdaDataFile.PropertyRecord) size_t total_size = 0; uint32_t cached_has_bits = 0; @@ -958,7 +962,7 @@ const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*EdaDataFile_PropertyRecord::Ge void EdaDataFile_PropertyRecord::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { auto* const _this = static_cast(&to_msg); auto& from = static_cast(from_msg); - // @@protoc_insertion_point(class_specific_merge_from_start:odbdesign.proto.EdaDataFile.PropertyRecord) + // @@protoc_insertion_point(class_specific_merge_from_start:Odb.Lib.Protobuf.EdaDataFile.PropertyRecord) GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; (void) cached_has_bits; @@ -977,7 +981,7 @@ void EdaDataFile_PropertyRecord::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_ } void EdaDataFile_PropertyRecord::CopyFrom(const EdaDataFile_PropertyRecord& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:odbdesign.proto.EdaDataFile.PropertyRecord) +// @@protoc_insertion_point(class_specific_copy_from_start:Odb.Lib.Protobuf.EdaDataFile.PropertyRecord) if (&from == this) return; Clear(); MergeFrom(from); @@ -1030,7 +1034,7 @@ EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::EdaDataFile_NetRecord_Subnet bool is_message_owned) : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { SharedCtor(arena, is_message_owned); - // @@protoc_insertion_point(arena_constructor:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord) + // @@protoc_insertion_point(arena_constructor:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord) } EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord(const EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord& from) : ::PROTOBUF_NAMESPACE_ID::Message() { @@ -1046,7 +1050,7 @@ EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::EdaDataFile_NetRecord_Subnet ::memcpy(&_impl_.type_, &from._impl_.type_, static_cast(reinterpret_cast(&_impl_.featurenumber_) - reinterpret_cast(&_impl_.type_)) + sizeof(_impl_.featurenumber_)); - // @@protoc_insertion_point(copy_constructor:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord) + // @@protoc_insertion_point(copy_constructor:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord) } inline void EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::SharedCtor( @@ -1063,7 +1067,7 @@ inline void EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::SharedCtor( } EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::~EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord() { - // @@protoc_insertion_point(destructor:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord) + // @@protoc_insertion_point(destructor:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord) if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { (void)arena; return; @@ -1080,7 +1084,7 @@ void EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::SetCachedSize(int size) } void EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::Clear() { -// @@protoc_insertion_point(message_clear_start:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord) +// @@protoc_insertion_point(message_clear_start:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord) uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -1102,12 +1106,12 @@ const char* EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::_InternalParse(c uint32_t tag; ptr = ::_pbi::ReadTag(ptr, &tag); switch (tag >> 3) { - // optional .odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord.Type type = 1; + // optional .Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord.Type type = 1; case 1: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); - _internal_set_type(static_cast<::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord_Type>(val)); + _internal_set_type(static_cast<::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord_Type>(val)); } else goto handle_unusual; continue; @@ -1155,11 +1159,11 @@ const char* EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::_InternalParse(c uint8_t* EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::_InternalSerialize( uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { - // @@protoc_insertion_point(serialize_to_array_start:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord) + // @@protoc_insertion_point(serialize_to_array_start:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord) uint32_t cached_has_bits = 0; (void) cached_has_bits; - // optional .odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord.Type type = 1; + // optional .Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord.Type type = 1; if (_internal_has_type()) { target = stream->EnsureSpace(target); target = ::_pbi::WireFormatLite::WriteEnumToArray( @@ -1182,12 +1186,12 @@ uint8_t* EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::_InternalSerialize( target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); } - // @@protoc_insertion_point(serialize_to_array_end:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord) + // @@protoc_insertion_point(serialize_to_array_end:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord) return target; } size_t EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::ByteSizeLong() const { -// @@protoc_insertion_point(message_byte_size_start:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord) +// @@protoc_insertion_point(message_byte_size_start:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord) size_t total_size = 0; uint32_t cached_has_bits = 0; @@ -1196,7 +1200,7 @@ size_t EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::ByteSizeLong() const cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000007u) { - // optional .odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord.Type type = 1; + // optional .Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord.Type type = 1; if (cached_has_bits & 0x00000001u) { total_size += 1 + ::_pbi::WireFormatLite::EnumSize(this->_internal_type()); @@ -1226,7 +1230,7 @@ const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*EdaDataFile_NetRecord_SubnetRe void EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { auto* const _this = static_cast(&to_msg); auto& from = static_cast(from_msg); - // @@protoc_insertion_point(class_specific_merge_from_start:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord) + // @@protoc_insertion_point(class_specific_merge_from_start:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord) GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; (void) cached_has_bits; @@ -1248,7 +1252,7 @@ void EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::MergeImpl(::PROTOBUF_NA } void EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::CopyFrom(const EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord) +// @@protoc_insertion_point(class_specific_copy_from_start:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord) if (&from == this) return; Clear(); MergeFrom(from); @@ -1308,7 +1312,7 @@ EdaDataFile_NetRecord_SubnetRecord::EdaDataFile_NetRecord_SubnetRecord(::PROTOBU bool is_message_owned) : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { SharedCtor(arena, is_message_owned); - // @@protoc_insertion_point(arena_constructor:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord) + // @@protoc_insertion_point(arena_constructor:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord) } EdaDataFile_NetRecord_SubnetRecord::EdaDataFile_NetRecord_SubnetRecord(const EdaDataFile_NetRecord_SubnetRecord& from) : ::PROTOBUF_NAMESPACE_ID::Message() { @@ -1329,7 +1333,7 @@ EdaDataFile_NetRecord_SubnetRecord::EdaDataFile_NetRecord_SubnetRecord(const Eda ::memcpy(&_impl_.type_, &from._impl_.type_, static_cast(reinterpret_cast(&_impl_.toeprintnumber_) - reinterpret_cast(&_impl_.type_)) + sizeof(_impl_.toeprintnumber_)); - // @@protoc_insertion_point(copy_constructor:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord) + // @@protoc_insertion_point(copy_constructor:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord) } inline void EdaDataFile_NetRecord_SubnetRecord::SharedCtor( @@ -1351,7 +1355,7 @@ inline void EdaDataFile_NetRecord_SubnetRecord::SharedCtor( } EdaDataFile_NetRecord_SubnetRecord::~EdaDataFile_NetRecord_SubnetRecord() { - // @@protoc_insertion_point(destructor:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord) + // @@protoc_insertion_point(destructor:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord) if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { (void)arena; return; @@ -1369,7 +1373,7 @@ void EdaDataFile_NetRecord_SubnetRecord::SetCachedSize(int size) const { } void EdaDataFile_NetRecord_SubnetRecord::Clear() { -// @@protoc_insertion_point(message_clear_start:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord) +// @@protoc_insertion_point(message_clear_start:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord) uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -1392,16 +1396,16 @@ const char* EdaDataFile_NetRecord_SubnetRecord::_InternalParse(const char* ptr, uint32_t tag; ptr = ::_pbi::ReadTag(ptr, &tag); switch (tag >> 3) { - // optional .odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.Type type = 1; + // optional .Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.Type type = 1; case 1: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); - _internal_set_type(static_cast<::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_Type>(val)); + _internal_set_type(static_cast<::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_Type>(val)); } else goto handle_unusual; continue; - // repeated .odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord featureIdRecords = 2; + // repeated .Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord featureIdRecords = 2; case 2: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 18)) { ptr -= 1; @@ -1414,21 +1418,21 @@ const char* EdaDataFile_NetRecord_SubnetRecord::_InternalParse(const char* ptr, } else goto handle_unusual; continue; - // optional .odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FillType fillType = 3; + // optional .Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FillType fillType = 3; case 3: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); - _internal_set_filltype(static_cast<::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FillType>(val)); + _internal_set_filltype(static_cast<::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FillType>(val)); } else goto handle_unusual; continue; - // optional .odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.CutoutType cutoutType = 4; + // optional .Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.CutoutType cutoutType = 4; case 4: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 32)) { uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); - _internal_set_cutouttype(static_cast<::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_CutoutType>(val)); + _internal_set_cutouttype(static_cast<::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_CutoutType>(val)); } else goto handle_unusual; continue; @@ -1441,12 +1445,12 @@ const char* EdaDataFile_NetRecord_SubnetRecord::_InternalParse(const char* ptr, } else goto handle_unusual; continue; - // optional .odbdesign.proto.EdaDataFile.BoardSide side = 6; + // optional .Odb.Lib.Protobuf.EdaDataFile.BoardSide side = 6; case 6: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 48)) { uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); - _internal_set_side(static_cast<::odbdesign::proto::EdaDataFile_BoardSide>(val)); + _internal_set_side(static_cast<::Odb::Lib::Protobuf::EdaDataFile_BoardSide>(val)); } else goto handle_unusual; continue; @@ -1494,18 +1498,18 @@ const char* EdaDataFile_NetRecord_SubnetRecord::_InternalParse(const char* ptr, uint8_t* EdaDataFile_NetRecord_SubnetRecord::_InternalSerialize( uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { - // @@protoc_insertion_point(serialize_to_array_start:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord) + // @@protoc_insertion_point(serialize_to_array_start:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord) uint32_t cached_has_bits = 0; (void) cached_has_bits; - // optional .odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.Type type = 1; + // optional .Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.Type type = 1; if (_internal_has_type()) { target = stream->EnsureSpace(target); target = ::_pbi::WireFormatLite::WriteEnumToArray( 1, this->_internal_type(), target); } - // repeated .odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord featureIdRecords = 2; + // repeated .Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord featureIdRecords = 2; for (unsigned i = 0, n = static_cast(this->_internal_featureidrecords_size()); i < n; i++) { const auto& repfield = this->_internal_featureidrecords(i); @@ -1513,14 +1517,14 @@ uint8_t* EdaDataFile_NetRecord_SubnetRecord::_InternalSerialize( InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream); } - // optional .odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FillType fillType = 3; + // optional .Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FillType fillType = 3; if (_internal_has_filltype()) { target = stream->EnsureSpace(target); target = ::_pbi::WireFormatLite::WriteEnumToArray( 3, this->_internal_filltype(), target); } - // optional .odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.CutoutType cutoutType = 4; + // optional .Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.CutoutType cutoutType = 4; if (_internal_has_cutouttype()) { target = stream->EnsureSpace(target); target = ::_pbi::WireFormatLite::WriteEnumToArray( @@ -1533,7 +1537,7 @@ uint8_t* EdaDataFile_NetRecord_SubnetRecord::_InternalSerialize( target = ::_pbi::WireFormatLite::WriteFloatToArray(5, this->_internal_fillsize(), target); } - // optional .odbdesign.proto.EdaDataFile.BoardSide side = 6; + // optional .Odb.Lib.Protobuf.EdaDataFile.BoardSide side = 6; if (_internal_has_side()) { target = stream->EnsureSpace(target); target = ::_pbi::WireFormatLite::WriteEnumToArray( @@ -1556,19 +1560,19 @@ uint8_t* EdaDataFile_NetRecord_SubnetRecord::_InternalSerialize( target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); } - // @@protoc_insertion_point(serialize_to_array_end:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord) + // @@protoc_insertion_point(serialize_to_array_end:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord) return target; } size_t EdaDataFile_NetRecord_SubnetRecord::ByteSizeLong() const { -// @@protoc_insertion_point(message_byte_size_start:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord) +// @@protoc_insertion_point(message_byte_size_start:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord) size_t total_size = 0; uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - // repeated .odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord featureIdRecords = 2; + // repeated .Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord featureIdRecords = 2; total_size += 1UL * this->_internal_featureidrecords_size(); for (const auto& msg : this->_impl_.featureidrecords_) { total_size += @@ -1577,19 +1581,19 @@ size_t EdaDataFile_NetRecord_SubnetRecord::ByteSizeLong() const { cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x0000007fu) { - // optional .odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.Type type = 1; + // optional .Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.Type type = 1; if (cached_has_bits & 0x00000001u) { total_size += 1 + ::_pbi::WireFormatLite::EnumSize(this->_internal_type()); } - // optional .odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FillType fillType = 3; + // optional .Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FillType fillType = 3; if (cached_has_bits & 0x00000002u) { total_size += 1 + ::_pbi::WireFormatLite::EnumSize(this->_internal_filltype()); } - // optional .odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.CutoutType cutoutType = 4; + // optional .Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.CutoutType cutoutType = 4; if (cached_has_bits & 0x00000004u) { total_size += 1 + ::_pbi::WireFormatLite::EnumSize(this->_internal_cutouttype()); @@ -1600,7 +1604,7 @@ size_t EdaDataFile_NetRecord_SubnetRecord::ByteSizeLong() const { total_size += 1 + 4; } - // optional .odbdesign.proto.EdaDataFile.BoardSide side = 6; + // optional .Odb.Lib.Protobuf.EdaDataFile.BoardSide side = 6; if (cached_has_bits & 0x00000010u) { total_size += 1 + ::_pbi::WireFormatLite::EnumSize(this->_internal_side()); @@ -1630,7 +1634,7 @@ const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*EdaDataFile_NetRecord_SubnetRe void EdaDataFile_NetRecord_SubnetRecord::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { auto* const _this = static_cast(&to_msg); auto& from = static_cast(from_msg); - // @@protoc_insertion_point(class_specific_merge_from_start:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord) + // @@protoc_insertion_point(class_specific_merge_from_start:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord) GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; (void) cached_has_bits; @@ -1665,7 +1669,7 @@ void EdaDataFile_NetRecord_SubnetRecord::MergeImpl(::PROTOBUF_NAMESPACE_ID::Mess } void EdaDataFile_NetRecord_SubnetRecord::CopyFrom(const EdaDataFile_NetRecord_SubnetRecord& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord) +// @@protoc_insertion_point(class_specific_copy_from_start:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord) if (&from == this) return; Clear(); MergeFrom(from); @@ -1714,7 +1718,7 @@ EdaDataFile_NetRecord::EdaDataFile_NetRecord(::PROTOBUF_NAMESPACE_ID::Arena* are bool is_message_owned) : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { SharedCtor(arena, is_message_owned); - // @@protoc_insertion_point(arena_constructor:odbdesign.proto.EdaDataFile.NetRecord) + // @@protoc_insertion_point(arena_constructor:Odb.Lib.Protobuf.EdaDataFile.NetRecord) } EdaDataFile_NetRecord::EdaDataFile_NetRecord(const EdaDataFile_NetRecord& from) : ::PROTOBUF_NAMESPACE_ID::Message() { @@ -1746,7 +1750,7 @@ EdaDataFile_NetRecord::EdaDataFile_NetRecord(const EdaDataFile_NetRecord& from) _this->GetArenaForAllocation()); } _this->_impl_.index_ = from._impl_.index_; - // @@protoc_insertion_point(copy_constructor:odbdesign.proto.EdaDataFile.NetRecord) + // @@protoc_insertion_point(copy_constructor:Odb.Lib.Protobuf.EdaDataFile.NetRecord) } inline void EdaDataFile_NetRecord::SharedCtor( @@ -1773,7 +1777,7 @@ inline void EdaDataFile_NetRecord::SharedCtor( } EdaDataFile_NetRecord::~EdaDataFile_NetRecord() { - // @@protoc_insertion_point(destructor:odbdesign.proto.EdaDataFile.NetRecord) + // @@protoc_insertion_point(destructor:Odb.Lib.Protobuf.EdaDataFile.NetRecord) if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { (void)arena; return; @@ -1794,7 +1798,7 @@ void EdaDataFile_NetRecord::SetCachedSize(int size) const { } void EdaDataFile_NetRecord::Clear() { -// @@protoc_insertion_point(message_clear_start:odbdesign.proto.EdaDataFile.NetRecord) +// @@protoc_insertion_point(message_clear_start:Odb.Lib.Protobuf.EdaDataFile.NetRecord) uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -1828,7 +1832,7 @@ const char* EdaDataFile_NetRecord::_InternalParse(const char* ptr, ::_pbi::Parse auto str = _internal_mutable_name(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, "odbdesign.proto.EdaDataFile.NetRecord.name")); + CHK_(::_pbi::VerifyUTF8(str, "Odb.Lib.Protobuf.EdaDataFile.NetRecord.name")); } else goto handle_unusual; continue; @@ -1838,7 +1842,7 @@ const char* EdaDataFile_NetRecord::_InternalParse(const char* ptr, ::_pbi::Parse auto str = _internal_mutable_attributesidstring(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, "odbdesign.proto.EdaDataFile.NetRecord.attributesIdString")); + CHK_(::_pbi::VerifyUTF8(str, "Odb.Lib.Protobuf.EdaDataFile.NetRecord.attributesIdString")); } else goto handle_unusual; continue; @@ -1851,7 +1855,7 @@ const char* EdaDataFile_NetRecord::_InternalParse(const char* ptr, ::_pbi::Parse } else goto handle_unusual; continue; - // repeated .odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord subnetRecords = 4; + // repeated .Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord subnetRecords = 4; case 4: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 34)) { ptr -= 1; @@ -1864,7 +1868,7 @@ const char* EdaDataFile_NetRecord::_InternalParse(const char* ptr, ::_pbi::Parse } else goto handle_unusual; continue; - // repeated .odbdesign.proto.EdaDataFile.PropertyRecord propertyRecords = 5; + // repeated .Odb.Lib.Protobuf.EdaDataFile.PropertyRecord propertyRecords = 5; case 5: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 42)) { ptr -= 1; @@ -1903,7 +1907,7 @@ const char* EdaDataFile_NetRecord::_InternalParse(const char* ptr, ::_pbi::Parse uint8_t* EdaDataFile_NetRecord::_InternalSerialize( uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { - // @@protoc_insertion_point(serialize_to_array_start:odbdesign.proto.EdaDataFile.NetRecord) + // @@protoc_insertion_point(serialize_to_array_start:Odb.Lib.Protobuf.EdaDataFile.NetRecord) uint32_t cached_has_bits = 0; (void) cached_has_bits; @@ -1912,7 +1916,7 @@ uint8_t* EdaDataFile_NetRecord::_InternalSerialize( ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( this->_internal_name().data(), static_cast(this->_internal_name().length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, - "odbdesign.proto.EdaDataFile.NetRecord.name"); + "Odb.Lib.Protobuf.EdaDataFile.NetRecord.name"); target = stream->WriteStringMaybeAliased( 1, this->_internal_name(), target); } @@ -1922,7 +1926,7 @@ uint8_t* EdaDataFile_NetRecord::_InternalSerialize( ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( this->_internal_attributesidstring().data(), static_cast(this->_internal_attributesidstring().length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, - "odbdesign.proto.EdaDataFile.NetRecord.attributesIdString"); + "Odb.Lib.Protobuf.EdaDataFile.NetRecord.attributesIdString"); target = stream->WriteStringMaybeAliased( 2, this->_internal_attributesidstring(), target); } @@ -1933,7 +1937,7 @@ uint8_t* EdaDataFile_NetRecord::_InternalSerialize( target = ::_pbi::WireFormatLite::WriteUInt32ToArray(3, this->_internal_index(), target); } - // repeated .odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord subnetRecords = 4; + // repeated .Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord subnetRecords = 4; for (unsigned i = 0, n = static_cast(this->_internal_subnetrecords_size()); i < n; i++) { const auto& repfield = this->_internal_subnetrecords(i); @@ -1941,7 +1945,7 @@ uint8_t* EdaDataFile_NetRecord::_InternalSerialize( InternalWriteMessage(4, repfield, repfield.GetCachedSize(), target, stream); } - // repeated .odbdesign.proto.EdaDataFile.PropertyRecord propertyRecords = 5; + // repeated .Odb.Lib.Protobuf.EdaDataFile.PropertyRecord propertyRecords = 5; for (unsigned i = 0, n = static_cast(this->_internal_propertyrecords_size()); i < n; i++) { const auto& repfield = this->_internal_propertyrecords(i); @@ -1953,26 +1957,26 @@ uint8_t* EdaDataFile_NetRecord::_InternalSerialize( target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); } - // @@protoc_insertion_point(serialize_to_array_end:odbdesign.proto.EdaDataFile.NetRecord) + // @@protoc_insertion_point(serialize_to_array_end:Odb.Lib.Protobuf.EdaDataFile.NetRecord) return target; } size_t EdaDataFile_NetRecord::ByteSizeLong() const { -// @@protoc_insertion_point(message_byte_size_start:odbdesign.proto.EdaDataFile.NetRecord) +// @@protoc_insertion_point(message_byte_size_start:Odb.Lib.Protobuf.EdaDataFile.NetRecord) size_t total_size = 0; uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - // repeated .odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord subnetRecords = 4; + // repeated .Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord subnetRecords = 4; total_size += 1UL * this->_internal_subnetrecords_size(); for (const auto& msg : this->_impl_.subnetrecords_) { total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); } - // repeated .odbdesign.proto.EdaDataFile.PropertyRecord propertyRecords = 5; + // repeated .Odb.Lib.Protobuf.EdaDataFile.PropertyRecord propertyRecords = 5; total_size += 1UL * this->_internal_propertyrecords_size(); for (const auto& msg : this->_impl_.propertyrecords_) { total_size += @@ -2014,7 +2018,7 @@ const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*EdaDataFile_NetRecord::GetClas void EdaDataFile_NetRecord::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { auto* const _this = static_cast(&to_msg); auto& from = static_cast(from_msg); - // @@protoc_insertion_point(class_specific_merge_from_start:odbdesign.proto.EdaDataFile.NetRecord) + // @@protoc_insertion_point(class_specific_merge_from_start:Odb.Lib.Protobuf.EdaDataFile.NetRecord) GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; (void) cached_has_bits; @@ -2038,7 +2042,7 @@ void EdaDataFile_NetRecord::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, } void EdaDataFile_NetRecord::CopyFrom(const EdaDataFile_NetRecord& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:odbdesign.proto.EdaDataFile.NetRecord) +// @@protoc_insertion_point(class_specific_copy_from_start:Odb.Lib.Protobuf.EdaDataFile.NetRecord) if (&from == this) return; Clear(); MergeFrom(from); @@ -2125,7 +2129,7 @@ EdaDataFile_PackageRecord_PinRecord::EdaDataFile_PackageRecord_PinRecord(::PROTO bool is_message_owned) : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { SharedCtor(arena, is_message_owned); - // @@protoc_insertion_point(arena_constructor:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord) + // @@protoc_insertion_point(arena_constructor:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord) } EdaDataFile_PackageRecord_PinRecord::EdaDataFile_PackageRecord_PinRecord(const EdaDataFile_PackageRecord_PinRecord& from) : ::PROTOBUF_NAMESPACE_ID::Message() { @@ -2155,7 +2159,7 @@ EdaDataFile_PackageRecord_PinRecord::EdaDataFile_PackageRecord_PinRecord(const E ::memcpy(&_impl_.type_, &from._impl_.type_, static_cast(reinterpret_cast(&_impl_.index_) - reinterpret_cast(&_impl_.type_)) + sizeof(_impl_.index_)); - // @@protoc_insertion_point(copy_constructor:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord) + // @@protoc_insertion_point(copy_constructor:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord) } inline void EdaDataFile_PackageRecord_PinRecord::SharedCtor( @@ -2182,7 +2186,7 @@ inline void EdaDataFile_PackageRecord_PinRecord::SharedCtor( } EdaDataFile_PackageRecord_PinRecord::~EdaDataFile_PackageRecord_PinRecord() { - // @@protoc_insertion_point(destructor:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord) + // @@protoc_insertion_point(destructor:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord) if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { (void)arena; return; @@ -2200,7 +2204,7 @@ void EdaDataFile_PackageRecord_PinRecord::SetCachedSize(int size) const { } void EdaDataFile_PackageRecord_PinRecord::Clear() { -// @@protoc_insertion_point(message_clear_start:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord) +// @@protoc_insertion_point(message_clear_start:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord) uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -2232,16 +2236,16 @@ const char* EdaDataFile_PackageRecord_PinRecord::_InternalParse(const char* ptr, auto str = _internal_mutable_name(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, "odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.name")); + CHK_(::_pbi::VerifyUTF8(str, "Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.name")); } else goto handle_unusual; continue; - // optional .odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.Type type = 2; + // optional .Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.Type type = 2; case 2: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); - _internal_set_type(static_cast<::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_Type>(val)); + _internal_set_type(static_cast<::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_Type>(val)); } else goto handle_unusual; continue; @@ -2272,21 +2276,21 @@ const char* EdaDataFile_PackageRecord_PinRecord::_InternalParse(const char* ptr, } else goto handle_unusual; continue; - // optional .odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.ElectricalType electricalType = 6; + // optional .Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.ElectricalType electricalType = 6; case 6: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 48)) { uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); - _internal_set_electricaltype(static_cast<::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_ElectricalType>(val)); + _internal_set_electricaltype(static_cast<::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_ElectricalType>(val)); } else goto handle_unusual; continue; - // optional .odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.MountType mountType = 7; + // optional .Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.MountType mountType = 7; case 7: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 56)) { uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); - _internal_set_mounttype(static_cast<::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_MountType>(val)); + _internal_set_mounttype(static_cast<::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_MountType>(val)); } else goto handle_unusual; continue; @@ -2334,7 +2338,7 @@ const char* EdaDataFile_PackageRecord_PinRecord::_InternalParse(const char* ptr, uint8_t* EdaDataFile_PackageRecord_PinRecord::_InternalSerialize( uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { - // @@protoc_insertion_point(serialize_to_array_start:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord) + // @@protoc_insertion_point(serialize_to_array_start:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord) uint32_t cached_has_bits = 0; (void) cached_has_bits; @@ -2343,12 +2347,12 @@ uint8_t* EdaDataFile_PackageRecord_PinRecord::_InternalSerialize( ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( this->_internal_name().data(), static_cast(this->_internal_name().length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, - "odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.name"); + "Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.name"); target = stream->WriteStringMaybeAliased( 1, this->_internal_name(), target); } - // optional .odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.Type type = 2; + // optional .Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.Type type = 2; if (_internal_has_type()) { target = stream->EnsureSpace(target); target = ::_pbi::WireFormatLite::WriteEnumToArray( @@ -2373,14 +2377,14 @@ uint8_t* EdaDataFile_PackageRecord_PinRecord::_InternalSerialize( target = ::_pbi::WireFormatLite::WriteFloatToArray(5, this->_internal_finishedholesize(), target); } - // optional .odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.ElectricalType electricalType = 6; + // optional .Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.ElectricalType electricalType = 6; if (_internal_has_electricaltype()) { target = stream->EnsureSpace(target); target = ::_pbi::WireFormatLite::WriteEnumToArray( 6, this->_internal_electricaltype(), target); } - // optional .odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.MountType mountType = 7; + // optional .Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.MountType mountType = 7; if (_internal_has_mounttype()) { target = stream->EnsureSpace(target); target = ::_pbi::WireFormatLite::WriteEnumToArray( @@ -2403,12 +2407,12 @@ uint8_t* EdaDataFile_PackageRecord_PinRecord::_InternalSerialize( target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); } - // @@protoc_insertion_point(serialize_to_array_end:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord) + // @@protoc_insertion_point(serialize_to_array_end:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord) return target; } size_t EdaDataFile_PackageRecord_PinRecord::ByteSizeLong() const { -// @@protoc_insertion_point(message_byte_size_start:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord) +// @@protoc_insertion_point(message_byte_size_start:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord) size_t total_size = 0; uint32_t cached_has_bits = 0; @@ -2424,7 +2428,7 @@ size_t EdaDataFile_PackageRecord_PinRecord::ByteSizeLong() const { this->_internal_name()); } - // optional .odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.Type type = 2; + // optional .Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.Type type = 2; if (cached_has_bits & 0x00000002u) { total_size += 1 + ::_pbi::WireFormatLite::EnumSize(this->_internal_type()); @@ -2445,13 +2449,13 @@ size_t EdaDataFile_PackageRecord_PinRecord::ByteSizeLong() const { total_size += 1 + 4; } - // optional .odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.ElectricalType electricalType = 6; + // optional .Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.ElectricalType electricalType = 6; if (cached_has_bits & 0x00000020u) { total_size += 1 + ::_pbi::WireFormatLite::EnumSize(this->_internal_electricaltype()); } - // optional .odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.MountType mountType = 7; + // optional .Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.MountType mountType = 7; if (cached_has_bits & 0x00000040u) { total_size += 1 + ::_pbi::WireFormatLite::EnumSize(this->_internal_mounttype()); @@ -2481,7 +2485,7 @@ const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*EdaDataFile_PackageRecord_PinR void EdaDataFile_PackageRecord_PinRecord::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { auto* const _this = static_cast(&to_msg); auto& from = static_cast(from_msg); - // @@protoc_insertion_point(class_specific_merge_from_start:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord) + // @@protoc_insertion_point(class_specific_merge_from_start:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord) GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; (void) cached_has_bits; @@ -2521,7 +2525,7 @@ void EdaDataFile_PackageRecord_PinRecord::MergeImpl(::PROTOBUF_NAMESPACE_ID::Mes } void EdaDataFile_PackageRecord_PinRecord::CopyFrom(const EdaDataFile_PackageRecord_PinRecord& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord) +// @@protoc_insertion_point(class_specific_copy_from_start:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord) if (&from == this) return; Clear(); MergeFrom(from); @@ -2590,7 +2594,7 @@ EdaDataFile_PackageRecord::EdaDataFile_PackageRecord(::PROTOBUF_NAMESPACE_ID::Ar if (arena != nullptr && !is_message_owned) { arena->OwnCustomDestructor(this, &EdaDataFile_PackageRecord::ArenaDtor); } - // @@protoc_insertion_point(arena_constructor:odbdesign.proto.EdaDataFile.PackageRecord) + // @@protoc_insertion_point(arena_constructor:Odb.Lib.Protobuf.EdaDataFile.PackageRecord) } EdaDataFile_PackageRecord::EdaDataFile_PackageRecord(const EdaDataFile_PackageRecord& from) : ::PROTOBUF_NAMESPACE_ID::Message() { @@ -2630,7 +2634,7 @@ EdaDataFile_PackageRecord::EdaDataFile_PackageRecord(const EdaDataFile_PackageRe ::memcpy(&_impl_.pitch_, &from._impl_.pitch_, static_cast(reinterpret_cast(&_impl_.ymax_) - reinterpret_cast(&_impl_.pitch_)) + sizeof(_impl_.ymax_)); - // @@protoc_insertion_point(copy_constructor:odbdesign.proto.EdaDataFile.PackageRecord) + // @@protoc_insertion_point(copy_constructor:Odb.Lib.Protobuf.EdaDataFile.PackageRecord) } inline void EdaDataFile_PackageRecord::SharedCtor( @@ -2662,7 +2666,7 @@ inline void EdaDataFile_PackageRecord::SharedCtor( } EdaDataFile_PackageRecord::~EdaDataFile_PackageRecord() { - // @@protoc_insertion_point(destructor:odbdesign.proto.EdaDataFile.PackageRecord) + // @@protoc_insertion_point(destructor:Odb.Lib.Protobuf.EdaDataFile.PackageRecord) if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { (void)arena; ArenaDtor(this); @@ -2690,7 +2694,7 @@ void EdaDataFile_PackageRecord::SetCachedSize(int size) const { } void EdaDataFile_PackageRecord::Clear() { -// @@protoc_insertion_point(message_clear_start:odbdesign.proto.EdaDataFile.PackageRecord) +// @@protoc_insertion_point(message_clear_start:Odb.Lib.Protobuf.EdaDataFile.PackageRecord) uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -2729,7 +2733,7 @@ const char* EdaDataFile_PackageRecord::_InternalParse(const char* ptr, ::_pbi::P auto str = _internal_mutable_name(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, "odbdesign.proto.EdaDataFile.PackageRecord.name")); + CHK_(::_pbi::VerifyUTF8(str, "Odb.Lib.Protobuf.EdaDataFile.PackageRecord.name")); } else goto handle_unusual; continue; @@ -2784,11 +2788,11 @@ const char* EdaDataFile_PackageRecord::_InternalParse(const char* ptr, ::_pbi::P auto str = _internal_mutable_attributesidstring(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, "odbdesign.proto.EdaDataFile.PackageRecord.attributesIdString")); + CHK_(::_pbi::VerifyUTF8(str, "Odb.Lib.Protobuf.EdaDataFile.PackageRecord.attributesIdString")); } else goto handle_unusual; continue; - // repeated .odbdesign.proto.EdaDataFile.PackageRecord.PinRecord pinRecords = 8; + // repeated .Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord pinRecords = 8; case 8: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 66)) { ptr -= 1; @@ -2801,7 +2805,7 @@ const char* EdaDataFile_PackageRecord::_InternalParse(const char* ptr, ::_pbi::P } else goto handle_unusual; continue; - // map pinRecordsByName = 9; + // map pinRecordsByName = 9; case 9: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 74)) { ptr -= 1; @@ -2814,7 +2818,7 @@ const char* EdaDataFile_PackageRecord::_InternalParse(const char* ptr, ::_pbi::P } else goto handle_unusual; continue; - // repeated .odbdesign.proto.EdaDataFile.PropertyRecord propertyRecords = 10; + // repeated .Odb.Lib.Protobuf.EdaDataFile.PropertyRecord propertyRecords = 10; case 10: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 82)) { ptr -= 1; @@ -2853,7 +2857,7 @@ const char* EdaDataFile_PackageRecord::_InternalParse(const char* ptr, ::_pbi::P uint8_t* EdaDataFile_PackageRecord::_InternalSerialize( uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { - // @@protoc_insertion_point(serialize_to_array_start:odbdesign.proto.EdaDataFile.PackageRecord) + // @@protoc_insertion_point(serialize_to_array_start:Odb.Lib.Protobuf.EdaDataFile.PackageRecord) uint32_t cached_has_bits = 0; (void) cached_has_bits; @@ -2862,7 +2866,7 @@ uint8_t* EdaDataFile_PackageRecord::_InternalSerialize( ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( this->_internal_name().data(), static_cast(this->_internal_name().length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, - "odbdesign.proto.EdaDataFile.PackageRecord.name"); + "Odb.Lib.Protobuf.EdaDataFile.PackageRecord.name"); target = stream->WriteStringMaybeAliased( 1, this->_internal_name(), target); } @@ -2902,12 +2906,12 @@ uint8_t* EdaDataFile_PackageRecord::_InternalSerialize( ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( this->_internal_attributesidstring().data(), static_cast(this->_internal_attributesidstring().length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, - "odbdesign.proto.EdaDataFile.PackageRecord.attributesIdString"); + "Odb.Lib.Protobuf.EdaDataFile.PackageRecord.attributesIdString"); target = stream->WriteStringMaybeAliased( 7, this->_internal_attributesidstring(), target); } - // repeated .odbdesign.proto.EdaDataFile.PackageRecord.PinRecord pinRecords = 8; + // repeated .Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord pinRecords = 8; for (unsigned i = 0, n = static_cast(this->_internal_pinrecords_size()); i < n; i++) { const auto& repfield = this->_internal_pinrecords(i); @@ -2915,9 +2919,9 @@ uint8_t* EdaDataFile_PackageRecord::_InternalSerialize( InternalWriteMessage(8, repfield, repfield.GetCachedSize(), target, stream); } - // map pinRecordsByName = 9; + // map pinRecordsByName = 9; if (!this->_internal_pinrecordsbyname().empty()) { - using MapType = ::_pb::Map; + using MapType = ::_pb::Map; using WireHelper = EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse::Funcs; const auto& map_field = this->_internal_pinrecordsbyname(); auto check_utf8 = [](const MapType::value_type& entry) { @@ -2925,7 +2929,7 @@ uint8_t* EdaDataFile_PackageRecord::_InternalSerialize( ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( entry.first.data(), static_cast(entry.first.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, - "odbdesign.proto.EdaDataFile.PackageRecord.PinRecordsByNameEntry.key"); + "Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecordsByNameEntry.key"); }; if (stream->IsSerializationDeterministic() && map_field.size() > 1) { @@ -2941,7 +2945,7 @@ uint8_t* EdaDataFile_PackageRecord::_InternalSerialize( } } - // repeated .odbdesign.proto.EdaDataFile.PropertyRecord propertyRecords = 10; + // repeated .Odb.Lib.Protobuf.EdaDataFile.PropertyRecord propertyRecords = 10; for (unsigned i = 0, n = static_cast(this->_internal_propertyrecords_size()); i < n; i++) { const auto& repfield = this->_internal_propertyrecords(i); @@ -2953,35 +2957,35 @@ uint8_t* EdaDataFile_PackageRecord::_InternalSerialize( target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); } - // @@protoc_insertion_point(serialize_to_array_end:odbdesign.proto.EdaDataFile.PackageRecord) + // @@protoc_insertion_point(serialize_to_array_end:Odb.Lib.Protobuf.EdaDataFile.PackageRecord) return target; } size_t EdaDataFile_PackageRecord::ByteSizeLong() const { -// @@protoc_insertion_point(message_byte_size_start:odbdesign.proto.EdaDataFile.PackageRecord) +// @@protoc_insertion_point(message_byte_size_start:Odb.Lib.Protobuf.EdaDataFile.PackageRecord) size_t total_size = 0; uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - // repeated .odbdesign.proto.EdaDataFile.PackageRecord.PinRecord pinRecords = 8; + // repeated .Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord pinRecords = 8; total_size += 1UL * this->_internal_pinrecords_size(); for (const auto& msg : this->_impl_.pinrecords_) { total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); } - // map pinRecordsByName = 9; + // map pinRecordsByName = 9; total_size += 1 * ::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(this->_internal_pinrecordsbyname_size()); - for (::PROTOBUF_NAMESPACE_ID::Map< std::string, ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord >::const_iterator + for (::PROTOBUF_NAMESPACE_ID::Map< std::string, ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord >::const_iterator it = this->_internal_pinrecordsbyname().begin(); it != this->_internal_pinrecordsbyname().end(); ++it) { total_size += EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse::Funcs::ByteSizeLong(it->first, it->second); } - // repeated .odbdesign.proto.EdaDataFile.PropertyRecord propertyRecords = 10; + // repeated .Odb.Lib.Protobuf.EdaDataFile.PropertyRecord propertyRecords = 10; total_size += 1UL * this->_internal_propertyrecords_size(); for (const auto& msg : this->_impl_.propertyrecords_) { total_size += @@ -3043,7 +3047,7 @@ const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*EdaDataFile_PackageRecord::Get void EdaDataFile_PackageRecord::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { auto* const _this = static_cast(&to_msg); auto& from = static_cast(from_msg); - // @@protoc_insertion_point(class_specific_merge_from_start:odbdesign.proto.EdaDataFile.PackageRecord) + // @@protoc_insertion_point(class_specific_merge_from_start:Odb.Lib.Protobuf.EdaDataFile.PackageRecord) GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; (void) cached_has_bits; @@ -3080,7 +3084,7 @@ void EdaDataFile_PackageRecord::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_m } void EdaDataFile_PackageRecord::CopyFrom(const EdaDataFile_PackageRecord& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:odbdesign.proto.EdaDataFile.PackageRecord) +// @@protoc_insertion_point(class_specific_copy_from_start:Odb.Lib.Protobuf.EdaDataFile.PackageRecord) if (&from == this) return; Clear(); MergeFrom(from); @@ -3172,7 +3176,7 @@ EdaDataFile::EdaDataFile(::PROTOBUF_NAMESPACE_ID::Arena* arena, if (arena != nullptr && !is_message_owned) { arena->OwnCustomDestructor(this, &EdaDataFile::ArenaDtor); } - // @@protoc_insertion_point(arena_constructor:odbdesign.proto.EdaDataFile) + // @@protoc_insertion_point(arena_constructor:Odb.Lib.Protobuf.EdaDataFile) } EdaDataFile::EdaDataFile(const EdaDataFile& from) : ::PROTOBUF_NAMESPACE_ID::Message() { @@ -3218,7 +3222,7 @@ EdaDataFile::EdaDataFile(const EdaDataFile& from) _this->_impl_.source_.Set(from._internal_source(), _this->GetArenaForAllocation()); } - // @@protoc_insertion_point(copy_constructor:odbdesign.proto.EdaDataFile) + // @@protoc_insertion_point(copy_constructor:Odb.Lib.Protobuf.EdaDataFile) } inline void EdaDataFile::SharedCtor( @@ -3254,7 +3258,7 @@ inline void EdaDataFile::SharedCtor( } EdaDataFile::~EdaDataFile() { - // @@protoc_insertion_point(destructor:odbdesign.proto.EdaDataFile) + // @@protoc_insertion_point(destructor:Odb.Lib.Protobuf.EdaDataFile) if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { (void)arena; ArenaDtor(this); @@ -3289,7 +3293,7 @@ void EdaDataFile::SetCachedSize(int size) const { } void EdaDataFile::Clear() { -// @@protoc_insertion_point(message_clear_start:odbdesign.proto.EdaDataFile) +// @@protoc_insertion_point(message_clear_start:Odb.Lib.Protobuf.EdaDataFile) uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -3330,7 +3334,7 @@ const char* EdaDataFile::_InternalParse(const char* ptr, ::_pbi::ParseContext* c auto str = _internal_mutable_path(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, "odbdesign.proto.EdaDataFile.path")); + CHK_(::_pbi::VerifyUTF8(str, "Odb.Lib.Protobuf.EdaDataFile.path")); } else goto handle_unusual; continue; @@ -3340,7 +3344,7 @@ const char* EdaDataFile::_InternalParse(const char* ptr, ::_pbi::ParseContext* c auto str = _internal_mutable_units(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, "odbdesign.proto.EdaDataFile.units")); + CHK_(::_pbi::VerifyUTF8(str, "Odb.Lib.Protobuf.EdaDataFile.units")); } else goto handle_unusual; continue; @@ -3350,7 +3354,7 @@ const char* EdaDataFile::_InternalParse(const char* ptr, ::_pbi::ParseContext* c auto str = _internal_mutable_source(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, "odbdesign.proto.EdaDataFile.source")); + CHK_(::_pbi::VerifyUTF8(str, "Odb.Lib.Protobuf.EdaDataFile.source")); } else goto handle_unusual; continue; @@ -3363,7 +3367,7 @@ const char* EdaDataFile::_InternalParse(const char* ptr, ::_pbi::ParseContext* c auto str = _internal_add_layernames(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, "odbdesign.proto.EdaDataFile.layerNames")); + CHK_(::_pbi::VerifyUTF8(str, "Odb.Lib.Protobuf.EdaDataFile.layerNames")); if (!ctx->DataAvailable(ptr)) break; } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<34>(ptr)); } else @@ -3378,7 +3382,7 @@ const char* EdaDataFile::_InternalParse(const char* ptr, ::_pbi::ParseContext* c auto str = _internal_add_attributenames(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, "odbdesign.proto.EdaDataFile.attributeNames")); + CHK_(::_pbi::VerifyUTF8(str, "Odb.Lib.Protobuf.EdaDataFile.attributeNames")); if (!ctx->DataAvailable(ptr)) break; } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<42>(ptr)); } else @@ -3393,13 +3397,13 @@ const char* EdaDataFile::_InternalParse(const char* ptr, ::_pbi::ParseContext* c auto str = _internal_add_attributetextvalues(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, "odbdesign.proto.EdaDataFile.attributeTextValues")); + CHK_(::_pbi::VerifyUTF8(str, "Odb.Lib.Protobuf.EdaDataFile.attributeTextValues")); if (!ctx->DataAvailable(ptr)) break; } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<50>(ptr)); } else goto handle_unusual; continue; - // repeated .odbdesign.proto.EdaDataFile.NetRecord netRecords = 7; + // repeated .Odb.Lib.Protobuf.EdaDataFile.NetRecord netRecords = 7; case 7: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 58)) { ptr -= 1; @@ -3412,7 +3416,7 @@ const char* EdaDataFile::_InternalParse(const char* ptr, ::_pbi::ParseContext* c } else goto handle_unusual; continue; - // map netRecordsByName = 8; + // map netRecordsByName = 8; case 8: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 66)) { ptr -= 1; @@ -3425,7 +3429,7 @@ const char* EdaDataFile::_InternalParse(const char* ptr, ::_pbi::ParseContext* c } else goto handle_unusual; continue; - // repeated .odbdesign.proto.EdaDataFile.PackageRecord packageRecords = 9; + // repeated .Odb.Lib.Protobuf.EdaDataFile.PackageRecord packageRecords = 9; case 9: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 74)) { ptr -= 1; @@ -3438,7 +3442,7 @@ const char* EdaDataFile::_InternalParse(const char* ptr, ::_pbi::ParseContext* c } else goto handle_unusual; continue; - // map packageRecordsByName = 10; + // map packageRecordsByName = 10; case 10: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 82)) { ptr -= 1; @@ -3477,7 +3481,7 @@ const char* EdaDataFile::_InternalParse(const char* ptr, ::_pbi::ParseContext* c uint8_t* EdaDataFile::_InternalSerialize( uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { - // @@protoc_insertion_point(serialize_to_array_start:odbdesign.proto.EdaDataFile) + // @@protoc_insertion_point(serialize_to_array_start:Odb.Lib.Protobuf.EdaDataFile) uint32_t cached_has_bits = 0; (void) cached_has_bits; @@ -3486,7 +3490,7 @@ uint8_t* EdaDataFile::_InternalSerialize( ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( this->_internal_path().data(), static_cast(this->_internal_path().length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, - "odbdesign.proto.EdaDataFile.path"); + "Odb.Lib.Protobuf.EdaDataFile.path"); target = stream->WriteStringMaybeAliased( 1, this->_internal_path(), target); } @@ -3496,7 +3500,7 @@ uint8_t* EdaDataFile::_InternalSerialize( ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( this->_internal_units().data(), static_cast(this->_internal_units().length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, - "odbdesign.proto.EdaDataFile.units"); + "Odb.Lib.Protobuf.EdaDataFile.units"); target = stream->WriteStringMaybeAliased( 2, this->_internal_units(), target); } @@ -3506,7 +3510,7 @@ uint8_t* EdaDataFile::_InternalSerialize( ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( this->_internal_source().data(), static_cast(this->_internal_source().length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, - "odbdesign.proto.EdaDataFile.source"); + "Odb.Lib.Protobuf.EdaDataFile.source"); target = stream->WriteStringMaybeAliased( 3, this->_internal_source(), target); } @@ -3517,7 +3521,7 @@ uint8_t* EdaDataFile::_InternalSerialize( ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( s.data(), static_cast(s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, - "odbdesign.proto.EdaDataFile.layerNames"); + "Odb.Lib.Protobuf.EdaDataFile.layerNames"); target = stream->WriteString(4, s, target); } @@ -3527,7 +3531,7 @@ uint8_t* EdaDataFile::_InternalSerialize( ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( s.data(), static_cast(s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, - "odbdesign.proto.EdaDataFile.attributeNames"); + "Odb.Lib.Protobuf.EdaDataFile.attributeNames"); target = stream->WriteString(5, s, target); } @@ -3537,11 +3541,11 @@ uint8_t* EdaDataFile::_InternalSerialize( ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( s.data(), static_cast(s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, - "odbdesign.proto.EdaDataFile.attributeTextValues"); + "Odb.Lib.Protobuf.EdaDataFile.attributeTextValues"); target = stream->WriteString(6, s, target); } - // repeated .odbdesign.proto.EdaDataFile.NetRecord netRecords = 7; + // repeated .Odb.Lib.Protobuf.EdaDataFile.NetRecord netRecords = 7; for (unsigned i = 0, n = static_cast(this->_internal_netrecords_size()); i < n; i++) { const auto& repfield = this->_internal_netrecords(i); @@ -3549,9 +3553,9 @@ uint8_t* EdaDataFile::_InternalSerialize( InternalWriteMessage(7, repfield, repfield.GetCachedSize(), target, stream); } - // map netRecordsByName = 8; + // map netRecordsByName = 8; if (!this->_internal_netrecordsbyname().empty()) { - using MapType = ::_pb::Map; + using MapType = ::_pb::Map; using WireHelper = EdaDataFile_NetRecordsByNameEntry_DoNotUse::Funcs; const auto& map_field = this->_internal_netrecordsbyname(); auto check_utf8 = [](const MapType::value_type& entry) { @@ -3559,7 +3563,7 @@ uint8_t* EdaDataFile::_InternalSerialize( ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( entry.first.data(), static_cast(entry.first.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, - "odbdesign.proto.EdaDataFile.NetRecordsByNameEntry.key"); + "Odb.Lib.Protobuf.EdaDataFile.NetRecordsByNameEntry.key"); }; if (stream->IsSerializationDeterministic() && map_field.size() > 1) { @@ -3575,7 +3579,7 @@ uint8_t* EdaDataFile::_InternalSerialize( } } - // repeated .odbdesign.proto.EdaDataFile.PackageRecord packageRecords = 9; + // repeated .Odb.Lib.Protobuf.EdaDataFile.PackageRecord packageRecords = 9; for (unsigned i = 0, n = static_cast(this->_internal_packagerecords_size()); i < n; i++) { const auto& repfield = this->_internal_packagerecords(i); @@ -3583,9 +3587,9 @@ uint8_t* EdaDataFile::_InternalSerialize( InternalWriteMessage(9, repfield, repfield.GetCachedSize(), target, stream); } - // map packageRecordsByName = 10; + // map packageRecordsByName = 10; if (!this->_internal_packagerecordsbyname().empty()) { - using MapType = ::_pb::Map; + using MapType = ::_pb::Map; using WireHelper = EdaDataFile_PackageRecordsByNameEntry_DoNotUse::Funcs; const auto& map_field = this->_internal_packagerecordsbyname(); auto check_utf8 = [](const MapType::value_type& entry) { @@ -3593,7 +3597,7 @@ uint8_t* EdaDataFile::_InternalSerialize( ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( entry.first.data(), static_cast(entry.first.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, - "odbdesign.proto.EdaDataFile.PackageRecordsByNameEntry.key"); + "Odb.Lib.Protobuf.EdaDataFile.PackageRecordsByNameEntry.key"); }; if (stream->IsSerializationDeterministic() && map_field.size() > 1) { @@ -3613,12 +3617,12 @@ uint8_t* EdaDataFile::_InternalSerialize( target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); } - // @@protoc_insertion_point(serialize_to_array_end:odbdesign.proto.EdaDataFile) + // @@protoc_insertion_point(serialize_to_array_end:Odb.Lib.Protobuf.EdaDataFile) return target; } size_t EdaDataFile::ByteSizeLong() const { -// @@protoc_insertion_point(message_byte_size_start:odbdesign.proto.EdaDataFile) +// @@protoc_insertion_point(message_byte_size_start:Odb.Lib.Protobuf.EdaDataFile) size_t total_size = 0; uint32_t cached_has_bits = 0; @@ -3649,33 +3653,33 @@ size_t EdaDataFile::ByteSizeLong() const { _impl_.attributetextvalues_.Get(i)); } - // repeated .odbdesign.proto.EdaDataFile.NetRecord netRecords = 7; + // repeated .Odb.Lib.Protobuf.EdaDataFile.NetRecord netRecords = 7; total_size += 1UL * this->_internal_netrecords_size(); for (const auto& msg : this->_impl_.netrecords_) { total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); } - // map netRecordsByName = 8; + // map netRecordsByName = 8; total_size += 1 * ::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(this->_internal_netrecordsbyname_size()); - for (::PROTOBUF_NAMESPACE_ID::Map< std::string, ::odbdesign::proto::EdaDataFile_NetRecord >::const_iterator + for (::PROTOBUF_NAMESPACE_ID::Map< std::string, ::Odb::Lib::Protobuf::EdaDataFile_NetRecord >::const_iterator it = this->_internal_netrecordsbyname().begin(); it != this->_internal_netrecordsbyname().end(); ++it) { total_size += EdaDataFile_NetRecordsByNameEntry_DoNotUse::Funcs::ByteSizeLong(it->first, it->second); } - // repeated .odbdesign.proto.EdaDataFile.PackageRecord packageRecords = 9; + // repeated .Odb.Lib.Protobuf.EdaDataFile.PackageRecord packageRecords = 9; total_size += 1UL * this->_internal_packagerecords_size(); for (const auto& msg : this->_impl_.packagerecords_) { total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); } - // map packageRecordsByName = 10; + // map packageRecordsByName = 10; total_size += 1 * ::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(this->_internal_packagerecordsbyname_size()); - for (::PROTOBUF_NAMESPACE_ID::Map< std::string, ::odbdesign::proto::EdaDataFile_PackageRecord >::const_iterator + for (::PROTOBUF_NAMESPACE_ID::Map< std::string, ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord >::const_iterator it = this->_internal_packagerecordsbyname().begin(); it != this->_internal_packagerecordsbyname().end(); ++it) { total_size += EdaDataFile_PackageRecordsByNameEntry_DoNotUse::Funcs::ByteSizeLong(it->first, it->second); @@ -3718,7 +3722,7 @@ const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*EdaDataFile::GetClassData() co void EdaDataFile::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { auto* const _this = static_cast(&to_msg); auto& from = static_cast(from_msg); - // @@protoc_insertion_point(class_specific_merge_from_start:odbdesign.proto.EdaDataFile) + // @@protoc_insertion_point(class_specific_merge_from_start:Odb.Lib.Protobuf.EdaDataFile) GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; (void) cached_has_bits; @@ -3746,7 +3750,7 @@ void EdaDataFile::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PR } void EdaDataFile::CopyFrom(const EdaDataFile& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:odbdesign.proto.EdaDataFile) +// @@protoc_insertion_point(class_specific_copy_from_start:Odb.Lib.Protobuf.EdaDataFile) if (&from == this) return; Clear(); MergeFrom(from); @@ -3790,48 +3794,49 @@ ::PROTOBUF_NAMESPACE_ID::Metadata EdaDataFile::GetMetadata() const { } // @@protoc_insertion_point(namespace_scope) -} // namespace proto -} // namespace odbdesign +} // namespace Protobuf +} // namespace Lib +} // namespace Odb PROTOBUF_NAMESPACE_OPEN -template<> PROTOBUF_NOINLINE ::odbdesign::proto::EdaDataFile_PropertyRecord* -Arena::CreateMaybeMessage< ::odbdesign::proto::EdaDataFile_PropertyRecord >(Arena* arena) { - return Arena::CreateMessageInternal< ::odbdesign::proto::EdaDataFile_PropertyRecord >(arena); +template<> PROTOBUF_NOINLINE ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord* +Arena::CreateMaybeMessage< ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord >(Arena* arena) { + return Arena::CreateMessageInternal< ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord >(arena); } -template<> PROTOBUF_NOINLINE ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord* -Arena::CreateMaybeMessage< ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord >(Arena* arena) { - return Arena::CreateMessageInternal< ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord >(arena); +template<> PROTOBUF_NOINLINE ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord* +Arena::CreateMaybeMessage< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord >(Arena* arena) { + return Arena::CreateMessageInternal< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord >(arena); } -template<> PROTOBUF_NOINLINE ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord* -Arena::CreateMaybeMessage< ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord >(Arena* arena) { - return Arena::CreateMessageInternal< ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord >(arena); +template<> PROTOBUF_NOINLINE ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord* +Arena::CreateMaybeMessage< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord >(Arena* arena) { + return Arena::CreateMessageInternal< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord >(arena); } -template<> PROTOBUF_NOINLINE ::odbdesign::proto::EdaDataFile_NetRecord* -Arena::CreateMaybeMessage< ::odbdesign::proto::EdaDataFile_NetRecord >(Arena* arena) { - return Arena::CreateMessageInternal< ::odbdesign::proto::EdaDataFile_NetRecord >(arena); +template<> PROTOBUF_NOINLINE ::Odb::Lib::Protobuf::EdaDataFile_NetRecord* +Arena::CreateMaybeMessage< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord >(Arena* arena) { + return Arena::CreateMessageInternal< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord >(arena); } -template<> PROTOBUF_NOINLINE ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse* -Arena::CreateMaybeMessage< ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse >(Arena* arena) { - return Arena::CreateMessageInternal< ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse >(arena); +template<> PROTOBUF_NOINLINE ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse* +Arena::CreateMaybeMessage< ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse >(Arena* arena) { + return Arena::CreateMessageInternal< ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse >(arena); } -template<> PROTOBUF_NOINLINE ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord* -Arena::CreateMaybeMessage< ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord >(Arena* arena) { - return Arena::CreateMessageInternal< ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord >(arena); +template<> PROTOBUF_NOINLINE ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord* +Arena::CreateMaybeMessage< ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord >(Arena* arena) { + return Arena::CreateMessageInternal< ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord >(arena); } -template<> PROTOBUF_NOINLINE ::odbdesign::proto::EdaDataFile_PackageRecord* -Arena::CreateMaybeMessage< ::odbdesign::proto::EdaDataFile_PackageRecord >(Arena* arena) { - return Arena::CreateMessageInternal< ::odbdesign::proto::EdaDataFile_PackageRecord >(arena); +template<> PROTOBUF_NOINLINE ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord* +Arena::CreateMaybeMessage< ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord >(Arena* arena) { + return Arena::CreateMessageInternal< ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord >(arena); } -template<> PROTOBUF_NOINLINE ::odbdesign::proto::EdaDataFile_NetRecordsByNameEntry_DoNotUse* -Arena::CreateMaybeMessage< ::odbdesign::proto::EdaDataFile_NetRecordsByNameEntry_DoNotUse >(Arena* arena) { - return Arena::CreateMessageInternal< ::odbdesign::proto::EdaDataFile_NetRecordsByNameEntry_DoNotUse >(arena); +template<> PROTOBUF_NOINLINE ::Odb::Lib::Protobuf::EdaDataFile_NetRecordsByNameEntry_DoNotUse* +Arena::CreateMaybeMessage< ::Odb::Lib::Protobuf::EdaDataFile_NetRecordsByNameEntry_DoNotUse >(Arena* arena) { + return Arena::CreateMessageInternal< ::Odb::Lib::Protobuf::EdaDataFile_NetRecordsByNameEntry_DoNotUse >(arena); } -template<> PROTOBUF_NOINLINE ::odbdesign::proto::EdaDataFile_PackageRecordsByNameEntry_DoNotUse* -Arena::CreateMaybeMessage< ::odbdesign::proto::EdaDataFile_PackageRecordsByNameEntry_DoNotUse >(Arena* arena) { - return Arena::CreateMessageInternal< ::odbdesign::proto::EdaDataFile_PackageRecordsByNameEntry_DoNotUse >(arena); +template<> PROTOBUF_NOINLINE ::Odb::Lib::Protobuf::EdaDataFile_PackageRecordsByNameEntry_DoNotUse* +Arena::CreateMaybeMessage< ::Odb::Lib::Protobuf::EdaDataFile_PackageRecordsByNameEntry_DoNotUse >(Arena* arena) { + return Arena::CreateMessageInternal< ::Odb::Lib::Protobuf::EdaDataFile_PackageRecordsByNameEntry_DoNotUse >(arena); } -template<> PROTOBUF_NOINLINE ::odbdesign::proto::EdaDataFile* -Arena::CreateMaybeMessage< ::odbdesign::proto::EdaDataFile >(Arena* arena) { - return Arena::CreateMessageInternal< ::odbdesign::proto::EdaDataFile >(arena); +template<> PROTOBUF_NOINLINE ::Odb::Lib::Protobuf::EdaDataFile* +Arena::CreateMaybeMessage< ::Odb::Lib::Protobuf::EdaDataFile >(Arena* arena) { + return Arena::CreateMessageInternal< ::Odb::Lib::Protobuf::EdaDataFile >(arena); } PROTOBUF_NAMESPACE_CLOSE diff --git a/OdbDesignLib/proto/edadatafile.pb.h b/OdbDesignLib/proto/edadatafile.pb.h index 70a1753a..6f1c3d88 100644 --- a/OdbDesignLib/proto/edadatafile.pb.h +++ b/OdbDesignLib/proto/edadatafile.pb.h @@ -48,8 +48,9 @@ struct TableStruct_edadatafile_2eproto { static const uint32_t offsets[]; }; extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_edadatafile_2eproto; -namespace odbdesign { -namespace proto { +namespace Odb { +namespace Lib { +namespace Protobuf { class EdaDataFile; struct EdaDataFileDefaultTypeInternal; extern EdaDataFileDefaultTypeInternal _EdaDataFile_default_instance_; @@ -80,22 +81,24 @@ extern EdaDataFile_PackageRecordsByNameEntry_DoNotUseDefaultTypeInternal _EdaDat class EdaDataFile_PropertyRecord; struct EdaDataFile_PropertyRecordDefaultTypeInternal; extern EdaDataFile_PropertyRecordDefaultTypeInternal _EdaDataFile_PropertyRecord_default_instance_; -} // namespace proto -} // namespace odbdesign +} // namespace Protobuf +} // namespace Lib +} // namespace Odb PROTOBUF_NAMESPACE_OPEN -template<> ::odbdesign::proto::EdaDataFile* Arena::CreateMaybeMessage<::odbdesign::proto::EdaDataFile>(Arena*); -template<> ::odbdesign::proto::EdaDataFile_NetRecord* Arena::CreateMaybeMessage<::odbdesign::proto::EdaDataFile_NetRecord>(Arena*); -template<> ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord* Arena::CreateMaybeMessage<::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord>(Arena*); -template<> ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord* Arena::CreateMaybeMessage<::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord>(Arena*); -template<> ::odbdesign::proto::EdaDataFile_NetRecordsByNameEntry_DoNotUse* Arena::CreateMaybeMessage<::odbdesign::proto::EdaDataFile_NetRecordsByNameEntry_DoNotUse>(Arena*); -template<> ::odbdesign::proto::EdaDataFile_PackageRecord* Arena::CreateMaybeMessage<::odbdesign::proto::EdaDataFile_PackageRecord>(Arena*); -template<> ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord* Arena::CreateMaybeMessage<::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord>(Arena*); -template<> ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse* Arena::CreateMaybeMessage<::odbdesign::proto::EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse>(Arena*); -template<> ::odbdesign::proto::EdaDataFile_PackageRecordsByNameEntry_DoNotUse* Arena::CreateMaybeMessage<::odbdesign::proto::EdaDataFile_PackageRecordsByNameEntry_DoNotUse>(Arena*); -template<> ::odbdesign::proto::EdaDataFile_PropertyRecord* Arena::CreateMaybeMessage<::odbdesign::proto::EdaDataFile_PropertyRecord>(Arena*); +template<> ::Odb::Lib::Protobuf::EdaDataFile* Arena::CreateMaybeMessage<::Odb::Lib::Protobuf::EdaDataFile>(Arena*); +template<> ::Odb::Lib::Protobuf::EdaDataFile_NetRecord* Arena::CreateMaybeMessage<::Odb::Lib::Protobuf::EdaDataFile_NetRecord>(Arena*); +template<> ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord* Arena::CreateMaybeMessage<::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord>(Arena*); +template<> ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord* Arena::CreateMaybeMessage<::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord>(Arena*); +template<> ::Odb::Lib::Protobuf::EdaDataFile_NetRecordsByNameEntry_DoNotUse* Arena::CreateMaybeMessage<::Odb::Lib::Protobuf::EdaDataFile_NetRecordsByNameEntry_DoNotUse>(Arena*); +template<> ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord* Arena::CreateMaybeMessage<::Odb::Lib::Protobuf::EdaDataFile_PackageRecord>(Arena*); +template<> ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord* Arena::CreateMaybeMessage<::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord>(Arena*); +template<> ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse* Arena::CreateMaybeMessage<::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse>(Arena*); +template<> ::Odb::Lib::Protobuf::EdaDataFile_PackageRecordsByNameEntry_DoNotUse* Arena::CreateMaybeMessage<::Odb::Lib::Protobuf::EdaDataFile_PackageRecordsByNameEntry_DoNotUse>(Arena*); +template<> ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord* Arena::CreateMaybeMessage<::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord>(Arena*); PROTOBUF_NAMESPACE_CLOSE -namespace odbdesign { -namespace proto { +namespace Odb { +namespace Lib { +namespace Protobuf { enum EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord_Type : int { EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord_Type_COPPER = 0, @@ -313,7 +316,7 @@ inline bool EdaDataFile_BoardSide_Parse( // =================================================================== class EdaDataFile_PropertyRecord final : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:odbdesign.proto.EdaDataFile.PropertyRecord) */ { + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:Odb.Lib.Protobuf.EdaDataFile.PropertyRecord) */ { public: inline EdaDataFile_PropertyRecord() : EdaDataFile_PropertyRecord(nullptr) {} ~EdaDataFile_PropertyRecord() override; @@ -416,7 +419,7 @@ class EdaDataFile_PropertyRecord final : private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { - return "odbdesign.proto.EdaDataFile.PropertyRecord"; + return "Odb.Lib.Protobuf.EdaDataFile.PropertyRecord"; } protected: explicit EdaDataFile_PropertyRecord(::PROTOBUF_NAMESPACE_ID::Arena* arena, @@ -495,7 +498,7 @@ class EdaDataFile_PropertyRecord final : std::string* _internal_mutable_value(); public: - // @@protoc_insertion_point(class_scope:odbdesign.proto.EdaDataFile.PropertyRecord) + // @@protoc_insertion_point(class_scope:Odb.Lib.Protobuf.EdaDataFile.PropertyRecord) private: class _Internal; @@ -515,7 +518,7 @@ class EdaDataFile_PropertyRecord final : // ------------------------------------------------------------------- class EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord final : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord) */ { + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord) */ { public: inline EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord() : EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord(nullptr) {} ~EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord() override; @@ -618,7 +621,7 @@ class EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord final : private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { - return "odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord"; + return "Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord"; } protected: explicit EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord(::PROTOBUF_NAMESPACE_ID::Arena* arena, @@ -671,17 +674,17 @@ class EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord final : kLayerNumberFieldNumber = 2, kFeatureNumberFieldNumber = 3, }; - // optional .odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord.Type type = 1; + // optional .Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord.Type type = 1; bool has_type() const; private: bool _internal_has_type() const; public: void clear_type(); - ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord_Type type() const; - void set_type(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord_Type value); + ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord_Type type() const; + void set_type(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord_Type value); private: - ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord_Type _internal_type() const; - void _internal_set_type(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord_Type value); + ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord_Type _internal_type() const; + void _internal_set_type(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord_Type value); public: // optional uint32 layerNumber = 2; @@ -710,7 +713,7 @@ class EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord final : void _internal_set_featurenumber(uint32_t value); public: - // @@protoc_insertion_point(class_scope:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord) + // @@protoc_insertion_point(class_scope:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord) private: class _Internal; @@ -730,7 +733,7 @@ class EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord final : // ------------------------------------------------------------------- class EdaDataFile_NetRecord_SubnetRecord final : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord) */ { + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord) */ { public: inline EdaDataFile_NetRecord_SubnetRecord() : EdaDataFile_NetRecord_SubnetRecord(nullptr) {} ~EdaDataFile_NetRecord_SubnetRecord() override; @@ -833,7 +836,7 @@ class EdaDataFile_NetRecord_SubnetRecord final : private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { - return "odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord"; + return "Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord"; } protected: explicit EdaDataFile_NetRecord_SubnetRecord(::PROTOBUF_NAMESPACE_ID::Arena* arena, @@ -959,61 +962,61 @@ class EdaDataFile_NetRecord_SubnetRecord final : kComponentNumberFieldNumber = 7, kToeprintNumberFieldNumber = 8, }; - // repeated .odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord featureIdRecords = 2; + // repeated .Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord featureIdRecords = 2; int featureidrecords_size() const; private: int _internal_featureidrecords_size() const; public: void clear_featureidrecords(); - ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord* mutable_featureidrecords(int index); - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord >* + ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord* mutable_featureidrecords(int index); + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord >* mutable_featureidrecords(); private: - const ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord& _internal_featureidrecords(int index) const; - ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord* _internal_add_featureidrecords(); + const ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord& _internal_featureidrecords(int index) const; + ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord* _internal_add_featureidrecords(); public: - const ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord& featureidrecords(int index) const; - ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord* add_featureidrecords(); - const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord >& + const ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord& featureidrecords(int index) const; + ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord* add_featureidrecords(); + const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord >& featureidrecords() const; - // optional .odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.Type type = 1; + // optional .Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.Type type = 1; bool has_type() const; private: bool _internal_has_type() const; public: void clear_type(); - ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_Type type() const; - void set_type(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_Type value); + ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_Type type() const; + void set_type(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_Type value); private: - ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_Type _internal_type() const; - void _internal_set_type(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_Type value); + ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_Type _internal_type() const; + void _internal_set_type(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_Type value); public: - // optional .odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FillType fillType = 3; + // optional .Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FillType fillType = 3; bool has_filltype() const; private: bool _internal_has_filltype() const; public: void clear_filltype(); - ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FillType filltype() const; - void set_filltype(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FillType value); + ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FillType filltype() const; + void set_filltype(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FillType value); private: - ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FillType _internal_filltype() const; - void _internal_set_filltype(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FillType value); + ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FillType _internal_filltype() const; + void _internal_set_filltype(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FillType value); public: - // optional .odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.CutoutType cutoutType = 4; + // optional .Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.CutoutType cutoutType = 4; bool has_cutouttype() const; private: bool _internal_has_cutouttype() const; public: void clear_cutouttype(); - ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_CutoutType cutouttype() const; - void set_cutouttype(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_CutoutType value); + ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_CutoutType cutouttype() const; + void set_cutouttype(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_CutoutType value); private: - ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_CutoutType _internal_cutouttype() const; - void _internal_set_cutouttype(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_CutoutType value); + ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_CutoutType _internal_cutouttype() const; + void _internal_set_cutouttype(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_CutoutType value); public: // optional float fillSize = 5; @@ -1029,17 +1032,17 @@ class EdaDataFile_NetRecord_SubnetRecord final : void _internal_set_fillsize(float value); public: - // optional .odbdesign.proto.EdaDataFile.BoardSide side = 6; + // optional .Odb.Lib.Protobuf.EdaDataFile.BoardSide side = 6; bool has_side() const; private: bool _internal_has_side() const; public: void clear_side(); - ::odbdesign::proto::EdaDataFile_BoardSide side() const; - void set_side(::odbdesign::proto::EdaDataFile_BoardSide value); + ::Odb::Lib::Protobuf::EdaDataFile_BoardSide side() const; + void set_side(::Odb::Lib::Protobuf::EdaDataFile_BoardSide value); private: - ::odbdesign::proto::EdaDataFile_BoardSide _internal_side() const; - void _internal_set_side(::odbdesign::proto::EdaDataFile_BoardSide value); + ::Odb::Lib::Protobuf::EdaDataFile_BoardSide _internal_side() const; + void _internal_set_side(::Odb::Lib::Protobuf::EdaDataFile_BoardSide value); public: // optional uint32 componentNumber = 7; @@ -1068,7 +1071,7 @@ class EdaDataFile_NetRecord_SubnetRecord final : void _internal_set_toeprintnumber(uint32_t value); public: - // @@protoc_insertion_point(class_scope:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord) + // @@protoc_insertion_point(class_scope:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord) private: class _Internal; @@ -1078,7 +1081,7 @@ class EdaDataFile_NetRecord_SubnetRecord final : struct Impl_ { ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord > featureidrecords_; + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord > featureidrecords_; int type_; int filltype_; int cutouttype_; @@ -1093,7 +1096,7 @@ class EdaDataFile_NetRecord_SubnetRecord final : // ------------------------------------------------------------------- class EdaDataFile_NetRecord final : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:odbdesign.proto.EdaDataFile.NetRecord) */ { + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:Odb.Lib.Protobuf.EdaDataFile.NetRecord) */ { public: inline EdaDataFile_NetRecord() : EdaDataFile_NetRecord(nullptr) {} ~EdaDataFile_NetRecord() override; @@ -1196,7 +1199,7 @@ class EdaDataFile_NetRecord final : private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { - return "odbdesign.proto.EdaDataFile.NetRecord"; + return "Odb.Lib.Protobuf.EdaDataFile.NetRecord"; } protected: explicit EdaDataFile_NetRecord(::PROTOBUF_NAMESPACE_ID::Arena* arena, @@ -1221,40 +1224,40 @@ class EdaDataFile_NetRecord final : kAttributesIdStringFieldNumber = 2, kIndexFieldNumber = 3, }; - // repeated .odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord subnetRecords = 4; + // repeated .Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord subnetRecords = 4; int subnetrecords_size() const; private: int _internal_subnetrecords_size() const; public: void clear_subnetrecords(); - ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord* mutable_subnetrecords(int index); - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord >* + ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord* mutable_subnetrecords(int index); + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord >* mutable_subnetrecords(); private: - const ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord& _internal_subnetrecords(int index) const; - ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord* _internal_add_subnetrecords(); + const ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord& _internal_subnetrecords(int index) const; + ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord* _internal_add_subnetrecords(); public: - const ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord& subnetrecords(int index) const; - ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord* add_subnetrecords(); - const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord >& + const ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord& subnetrecords(int index) const; + ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord* add_subnetrecords(); + const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord >& subnetrecords() const; - // repeated .odbdesign.proto.EdaDataFile.PropertyRecord propertyRecords = 5; + // repeated .Odb.Lib.Protobuf.EdaDataFile.PropertyRecord propertyRecords = 5; int propertyrecords_size() const; private: int _internal_propertyrecords_size() const; public: void clear_propertyrecords(); - ::odbdesign::proto::EdaDataFile_PropertyRecord* mutable_propertyrecords(int index); - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_PropertyRecord >* + ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord* mutable_propertyrecords(int index); + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord >* mutable_propertyrecords(); private: - const ::odbdesign::proto::EdaDataFile_PropertyRecord& _internal_propertyrecords(int index) const; - ::odbdesign::proto::EdaDataFile_PropertyRecord* _internal_add_propertyrecords(); + const ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord& _internal_propertyrecords(int index) const; + ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord* _internal_add_propertyrecords(); public: - const ::odbdesign::proto::EdaDataFile_PropertyRecord& propertyrecords(int index) const; - ::odbdesign::proto::EdaDataFile_PropertyRecord* add_propertyrecords(); - const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_PropertyRecord >& + const ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord& propertyrecords(int index) const; + ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord* add_propertyrecords(); + const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord >& propertyrecords() const; // optional string name = 1; @@ -1306,7 +1309,7 @@ class EdaDataFile_NetRecord final : void _internal_set_index(uint32_t value); public: - // @@protoc_insertion_point(class_scope:odbdesign.proto.EdaDataFile.NetRecord) + // @@protoc_insertion_point(class_scope:Odb.Lib.Protobuf.EdaDataFile.NetRecord) private: class _Internal; @@ -1316,8 +1319,8 @@ class EdaDataFile_NetRecord final : struct Impl_ { ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord > subnetrecords_; - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_PropertyRecord > propertyrecords_; + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord > subnetrecords_; + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord > propertyrecords_; ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_; ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr attributesidstring_; uint32_t index_; @@ -1328,12 +1331,12 @@ class EdaDataFile_NetRecord final : // ------------------------------------------------------------------- class EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse : public ::PROTOBUF_NAMESPACE_ID::internal::MapEntry { public: typedef ::PROTOBUF_NAMESPACE_ID::internal::MapEntry SuperType; EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse(); @@ -1343,7 +1346,7 @@ class EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse : public ::PROTOB void MergeFrom(const EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse& other); static const EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse* internal_default_instance() { return reinterpret_cast(&_EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse_default_instance_); } static bool ValidateKey(std::string* s) { - return ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(s->data(), static_cast(s->size()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::PARSE, "odbdesign.proto.EdaDataFile.PackageRecord.PinRecordsByNameEntry.key"); + return ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(s->data(), static_cast(s->size()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::PARSE, "Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecordsByNameEntry.key"); } static bool ValidateValue(void*) { return true; } using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; @@ -1354,7 +1357,7 @@ class EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse : public ::PROTOB // ------------------------------------------------------------------- class EdaDataFile_PackageRecord_PinRecord final : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord) */ { + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord) */ { public: inline EdaDataFile_PackageRecord_PinRecord() : EdaDataFile_PackageRecord_PinRecord(nullptr) {} ~EdaDataFile_PackageRecord_PinRecord() override; @@ -1457,7 +1460,7 @@ class EdaDataFile_PackageRecord_PinRecord final : private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { - return "odbdesign.proto.EdaDataFile.PackageRecord.PinRecord"; + return "Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord"; } protected: explicit EdaDataFile_PackageRecord_PinRecord(::PROTOBUF_NAMESPACE_ID::Arena* arena, @@ -1608,17 +1611,17 @@ class EdaDataFile_PackageRecord_PinRecord final : std::string* _internal_mutable_name(); public: - // optional .odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.Type type = 2; + // optional .Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.Type type = 2; bool has_type() const; private: bool _internal_has_type() const; public: void clear_type(); - ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_Type type() const; - void set_type(::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_Type value); + ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_Type type() const; + void set_type(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_Type value); private: - ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_Type _internal_type() const; - void _internal_set_type(::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_Type value); + ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_Type _internal_type() const; + void _internal_set_type(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_Type value); public: // optional float xCenter = 3; @@ -1660,30 +1663,30 @@ class EdaDataFile_PackageRecord_PinRecord final : void _internal_set_finishedholesize(float value); public: - // optional .odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.ElectricalType electricalType = 6; + // optional .Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.ElectricalType electricalType = 6; bool has_electricaltype() const; private: bool _internal_has_electricaltype() const; public: void clear_electricaltype(); - ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_ElectricalType electricaltype() const; - void set_electricaltype(::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_ElectricalType value); + ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_ElectricalType electricaltype() const; + void set_electricaltype(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_ElectricalType value); private: - ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_ElectricalType _internal_electricaltype() const; - void _internal_set_electricaltype(::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_ElectricalType value); + ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_ElectricalType _internal_electricaltype() const; + void _internal_set_electricaltype(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_ElectricalType value); public: - // optional .odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.MountType mountType = 7; + // optional .Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.MountType mountType = 7; bool has_mounttype() const; private: bool _internal_has_mounttype() const; public: void clear_mounttype(); - ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_MountType mounttype() const; - void set_mounttype(::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_MountType value); + ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_MountType mounttype() const; + void set_mounttype(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_MountType value); private: - ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_MountType _internal_mounttype() const; - void _internal_set_mounttype(::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_MountType value); + ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_MountType _internal_mounttype() const; + void _internal_set_mounttype(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_MountType value); public: // optional uint32 id = 8; @@ -1712,7 +1715,7 @@ class EdaDataFile_PackageRecord_PinRecord final : void _internal_set_index(uint32_t value); public: - // @@protoc_insertion_point(class_scope:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord) + // @@protoc_insertion_point(class_scope:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord) private: class _Internal; @@ -1738,7 +1741,7 @@ class EdaDataFile_PackageRecord_PinRecord final : // ------------------------------------------------------------------- class EdaDataFile_PackageRecord final : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:odbdesign.proto.EdaDataFile.PackageRecord) */ { + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:Odb.Lib.Protobuf.EdaDataFile.PackageRecord) */ { public: inline EdaDataFile_PackageRecord() : EdaDataFile_PackageRecord(nullptr) {} ~EdaDataFile_PackageRecord() override; @@ -1841,7 +1844,7 @@ class EdaDataFile_PackageRecord final : private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { - return "odbdesign.proto.EdaDataFile.PackageRecord"; + return "Odb.Lib.Protobuf.EdaDataFile.PackageRecord"; } protected: explicit EdaDataFile_PackageRecord(::PROTOBUF_NAMESPACE_ID::Arena* arena, @@ -1873,57 +1876,57 @@ class EdaDataFile_PackageRecord final : kXMaxFieldNumber = 5, kYMaxFieldNumber = 6, }; - // repeated .odbdesign.proto.EdaDataFile.PackageRecord.PinRecord pinRecords = 8; + // repeated .Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord pinRecords = 8; int pinrecords_size() const; private: int _internal_pinrecords_size() const; public: void clear_pinrecords(); - ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord* mutable_pinrecords(int index); - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord >* + ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord* mutable_pinrecords(int index); + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord >* mutable_pinrecords(); private: - const ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord& _internal_pinrecords(int index) const; - ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord* _internal_add_pinrecords(); + const ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord& _internal_pinrecords(int index) const; + ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord* _internal_add_pinrecords(); public: - const ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord& pinrecords(int index) const; - ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord* add_pinrecords(); - const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord >& + const ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord& pinrecords(int index) const; + ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord* add_pinrecords(); + const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord >& pinrecords() const; - // map pinRecordsByName = 9; + // map pinRecordsByName = 9; int pinrecordsbyname_size() const; private: int _internal_pinrecordsbyname_size() const; public: void clear_pinrecordsbyname(); private: - const ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord >& + const ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord >& _internal_pinrecordsbyname() const; - ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord >* + ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord >* _internal_mutable_pinrecordsbyname(); public: - const ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord >& + const ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord >& pinrecordsbyname() const; - ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord >* + ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord >* mutable_pinrecordsbyname(); - // repeated .odbdesign.proto.EdaDataFile.PropertyRecord propertyRecords = 10; + // repeated .Odb.Lib.Protobuf.EdaDataFile.PropertyRecord propertyRecords = 10; int propertyrecords_size() const; private: int _internal_propertyrecords_size() const; public: void clear_propertyrecords(); - ::odbdesign::proto::EdaDataFile_PropertyRecord* mutable_propertyrecords(int index); - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_PropertyRecord >* + ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord* mutable_propertyrecords(int index); + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord >* mutable_propertyrecords(); private: - const ::odbdesign::proto::EdaDataFile_PropertyRecord& _internal_propertyrecords(int index) const; - ::odbdesign::proto::EdaDataFile_PropertyRecord* _internal_add_propertyrecords(); + const ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord& _internal_propertyrecords(int index) const; + ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord* _internal_add_propertyrecords(); public: - const ::odbdesign::proto::EdaDataFile_PropertyRecord& propertyrecords(int index) const; - ::odbdesign::proto::EdaDataFile_PropertyRecord* add_propertyrecords(); - const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_PropertyRecord >& + const ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord& propertyrecords(int index) const; + ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord* add_propertyrecords(); + const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord >& propertyrecords() const; // optional string name = 1; @@ -2027,7 +2030,7 @@ class EdaDataFile_PackageRecord final : void _internal_set_ymax(float value); public: - // @@protoc_insertion_point(class_scope:odbdesign.proto.EdaDataFile.PackageRecord) + // @@protoc_insertion_point(class_scope:Odb.Lib.Protobuf.EdaDataFile.PackageRecord) private: class _Internal; @@ -2037,13 +2040,13 @@ class EdaDataFile_PackageRecord final : struct Impl_ { ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord > pinrecords_; + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord > pinrecords_; ::PROTOBUF_NAMESPACE_ID::internal::MapField< EdaDataFile_PackageRecord_PinRecordsByNameEntry_DoNotUse, - std::string, ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord, + std::string, ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord, ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_STRING, ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_MESSAGE> pinrecordsbyname_; - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_PropertyRecord > propertyrecords_; + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord > propertyrecords_; ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_; ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr attributesidstring_; float pitch_; @@ -2058,12 +2061,12 @@ class EdaDataFile_PackageRecord final : // ------------------------------------------------------------------- class EdaDataFile_NetRecordsByNameEntry_DoNotUse : public ::PROTOBUF_NAMESPACE_ID::internal::MapEntry { public: typedef ::PROTOBUF_NAMESPACE_ID::internal::MapEntry SuperType; EdaDataFile_NetRecordsByNameEntry_DoNotUse(); @@ -2073,7 +2076,7 @@ class EdaDataFile_NetRecordsByNameEntry_DoNotUse : public ::PROTOBUF_NAMESPACE_I void MergeFrom(const EdaDataFile_NetRecordsByNameEntry_DoNotUse& other); static const EdaDataFile_NetRecordsByNameEntry_DoNotUse* internal_default_instance() { return reinterpret_cast(&_EdaDataFile_NetRecordsByNameEntry_DoNotUse_default_instance_); } static bool ValidateKey(std::string* s) { - return ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(s->data(), static_cast(s->size()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::PARSE, "odbdesign.proto.EdaDataFile.NetRecordsByNameEntry.key"); + return ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(s->data(), static_cast(s->size()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::PARSE, "Odb.Lib.Protobuf.EdaDataFile.NetRecordsByNameEntry.key"); } static bool ValidateValue(void*) { return true; } using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; @@ -2084,12 +2087,12 @@ class EdaDataFile_NetRecordsByNameEntry_DoNotUse : public ::PROTOBUF_NAMESPACE_I // ------------------------------------------------------------------- class EdaDataFile_PackageRecordsByNameEntry_DoNotUse : public ::PROTOBUF_NAMESPACE_ID::internal::MapEntry { public: typedef ::PROTOBUF_NAMESPACE_ID::internal::MapEntry SuperType; EdaDataFile_PackageRecordsByNameEntry_DoNotUse(); @@ -2099,7 +2102,7 @@ class EdaDataFile_PackageRecordsByNameEntry_DoNotUse : public ::PROTOBUF_NAMESPA void MergeFrom(const EdaDataFile_PackageRecordsByNameEntry_DoNotUse& other); static const EdaDataFile_PackageRecordsByNameEntry_DoNotUse* internal_default_instance() { return reinterpret_cast(&_EdaDataFile_PackageRecordsByNameEntry_DoNotUse_default_instance_); } static bool ValidateKey(std::string* s) { - return ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(s->data(), static_cast(s->size()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::PARSE, "odbdesign.proto.EdaDataFile.PackageRecordsByNameEntry.key"); + return ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(s->data(), static_cast(s->size()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::PARSE, "Odb.Lib.Protobuf.EdaDataFile.PackageRecordsByNameEntry.key"); } static bool ValidateValue(void*) { return true; } using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; @@ -2110,7 +2113,7 @@ class EdaDataFile_PackageRecordsByNameEntry_DoNotUse : public ::PROTOBUF_NAMESPA // ------------------------------------------------------------------- class EdaDataFile final : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:odbdesign.proto.EdaDataFile) */ { + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:Odb.Lib.Protobuf.EdaDataFile) */ { public: inline EdaDataFile() : EdaDataFile(nullptr) {} ~EdaDataFile() override; @@ -2213,7 +2216,7 @@ class EdaDataFile final : private: friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { - return "odbdesign.proto.EdaDataFile"; + return "Odb.Lib.Protobuf.EdaDataFile"; } protected: explicit EdaDataFile(::PROTOBUF_NAMESPACE_ID::Arena* arena, @@ -2349,74 +2352,74 @@ class EdaDataFile final : std::string* _internal_add_attributetextvalues(); public: - // repeated .odbdesign.proto.EdaDataFile.NetRecord netRecords = 7; + // repeated .Odb.Lib.Protobuf.EdaDataFile.NetRecord netRecords = 7; int netrecords_size() const; private: int _internal_netrecords_size() const; public: void clear_netrecords(); - ::odbdesign::proto::EdaDataFile_NetRecord* mutable_netrecords(int index); - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_NetRecord >* + ::Odb::Lib::Protobuf::EdaDataFile_NetRecord* mutable_netrecords(int index); + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord >* mutable_netrecords(); private: - const ::odbdesign::proto::EdaDataFile_NetRecord& _internal_netrecords(int index) const; - ::odbdesign::proto::EdaDataFile_NetRecord* _internal_add_netrecords(); + const ::Odb::Lib::Protobuf::EdaDataFile_NetRecord& _internal_netrecords(int index) const; + ::Odb::Lib::Protobuf::EdaDataFile_NetRecord* _internal_add_netrecords(); public: - const ::odbdesign::proto::EdaDataFile_NetRecord& netrecords(int index) const; - ::odbdesign::proto::EdaDataFile_NetRecord* add_netrecords(); - const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_NetRecord >& + const ::Odb::Lib::Protobuf::EdaDataFile_NetRecord& netrecords(int index) const; + ::Odb::Lib::Protobuf::EdaDataFile_NetRecord* add_netrecords(); + const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord >& netrecords() const; - // map netRecordsByName = 8; + // map netRecordsByName = 8; int netrecordsbyname_size() const; private: int _internal_netrecordsbyname_size() const; public: void clear_netrecordsbyname(); private: - const ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::odbdesign::proto::EdaDataFile_NetRecord >& + const ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::Odb::Lib::Protobuf::EdaDataFile_NetRecord >& _internal_netrecordsbyname() const; - ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::odbdesign::proto::EdaDataFile_NetRecord >* + ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::Odb::Lib::Protobuf::EdaDataFile_NetRecord >* _internal_mutable_netrecordsbyname(); public: - const ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::odbdesign::proto::EdaDataFile_NetRecord >& + const ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::Odb::Lib::Protobuf::EdaDataFile_NetRecord >& netrecordsbyname() const; - ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::odbdesign::proto::EdaDataFile_NetRecord >* + ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::Odb::Lib::Protobuf::EdaDataFile_NetRecord >* mutable_netrecordsbyname(); - // repeated .odbdesign.proto.EdaDataFile.PackageRecord packageRecords = 9; + // repeated .Odb.Lib.Protobuf.EdaDataFile.PackageRecord packageRecords = 9; int packagerecords_size() const; private: int _internal_packagerecords_size() const; public: void clear_packagerecords(); - ::odbdesign::proto::EdaDataFile_PackageRecord* mutable_packagerecords(int index); - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_PackageRecord >* + ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord* mutable_packagerecords(int index); + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord >* mutable_packagerecords(); private: - const ::odbdesign::proto::EdaDataFile_PackageRecord& _internal_packagerecords(int index) const; - ::odbdesign::proto::EdaDataFile_PackageRecord* _internal_add_packagerecords(); + const ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord& _internal_packagerecords(int index) const; + ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord* _internal_add_packagerecords(); public: - const ::odbdesign::proto::EdaDataFile_PackageRecord& packagerecords(int index) const; - ::odbdesign::proto::EdaDataFile_PackageRecord* add_packagerecords(); - const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_PackageRecord >& + const ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord& packagerecords(int index) const; + ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord* add_packagerecords(); + const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord >& packagerecords() const; - // map packageRecordsByName = 10; + // map packageRecordsByName = 10; int packagerecordsbyname_size() const; private: int _internal_packagerecordsbyname_size() const; public: void clear_packagerecordsbyname(); private: - const ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::odbdesign::proto::EdaDataFile_PackageRecord >& + const ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord >& _internal_packagerecordsbyname() const; - ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::odbdesign::proto::EdaDataFile_PackageRecord >* + ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord >* _internal_mutable_packagerecordsbyname(); public: - const ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::odbdesign::proto::EdaDataFile_PackageRecord >& + const ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord >& packagerecordsbyname() const; - ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::odbdesign::proto::EdaDataFile_PackageRecord >* + ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord >* mutable_packagerecordsbyname(); // optional string path = 1; @@ -2473,7 +2476,7 @@ class EdaDataFile final : std::string* _internal_mutable_source(); public: - // @@protoc_insertion_point(class_scope:odbdesign.proto.EdaDataFile) + // @@protoc_insertion_point(class_scope:Odb.Lib.Protobuf.EdaDataFile) private: class _Internal; @@ -2486,16 +2489,16 @@ class EdaDataFile final : ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField layernames_; ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField attributenames_; ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField attributetextvalues_; - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_NetRecord > netrecords_; + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord > netrecords_; ::PROTOBUF_NAMESPACE_ID::internal::MapField< EdaDataFile_NetRecordsByNameEntry_DoNotUse, - std::string, ::odbdesign::proto::EdaDataFile_NetRecord, + std::string, ::Odb::Lib::Protobuf::EdaDataFile_NetRecord, ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_STRING, ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_MESSAGE> netrecordsbyname_; - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_PackageRecord > packagerecords_; + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord > packagerecords_; ::PROTOBUF_NAMESPACE_ID::internal::MapField< EdaDataFile_PackageRecordsByNameEntry_DoNotUse, - std::string, ::odbdesign::proto::EdaDataFile_PackageRecord, + std::string, ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord, ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_STRING, ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_MESSAGE> packagerecordsbyname_; ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr path_; @@ -2529,7 +2532,7 @@ inline void EdaDataFile_PropertyRecord::clear_name() { _impl_._has_bits_[0] &= ~0x00000001u; } inline const std::string& EdaDataFile_PropertyRecord::name() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.PropertyRecord.name) + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.PropertyRecord.name) return _internal_name(); } template @@ -2537,11 +2540,11 @@ inline PROTOBUF_ALWAYS_INLINE void EdaDataFile_PropertyRecord::set_name(ArgT0&& arg0, ArgT... args) { _impl_._has_bits_[0] |= 0x00000001u; _impl_.name_.Set(static_cast(arg0), args..., GetArenaForAllocation()); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.PropertyRecord.name) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.PropertyRecord.name) } inline std::string* EdaDataFile_PropertyRecord::mutable_name() { std::string* _s = _internal_mutable_name(); - // @@protoc_insertion_point(field_mutable:odbdesign.proto.EdaDataFile.PropertyRecord.name) + // @@protoc_insertion_point(field_mutable:Odb.Lib.Protobuf.EdaDataFile.PropertyRecord.name) return _s; } inline const std::string& EdaDataFile_PropertyRecord::_internal_name() const { @@ -2556,7 +2559,7 @@ inline std::string* EdaDataFile_PropertyRecord::_internal_mutable_name() { return _impl_.name_.Mutable(GetArenaForAllocation()); } inline std::string* EdaDataFile_PropertyRecord::release_name() { - // @@protoc_insertion_point(field_release:odbdesign.proto.EdaDataFile.PropertyRecord.name) + // @@protoc_insertion_point(field_release:Odb.Lib.Protobuf.EdaDataFile.PropertyRecord.name) if (!_internal_has_name()) { return nullptr; } @@ -2581,7 +2584,7 @@ inline void EdaDataFile_PropertyRecord::set_allocated_name(std::string* name) { _impl_.name_.Set("", GetArenaForAllocation()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - // @@protoc_insertion_point(field_set_allocated:odbdesign.proto.EdaDataFile.PropertyRecord.name) + // @@protoc_insertion_point(field_set_allocated:Odb.Lib.Protobuf.EdaDataFile.PropertyRecord.name) } // optional string value = 2; @@ -2597,7 +2600,7 @@ inline void EdaDataFile_PropertyRecord::clear_value() { _impl_._has_bits_[0] &= ~0x00000002u; } inline const std::string& EdaDataFile_PropertyRecord::value() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.PropertyRecord.value) + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.PropertyRecord.value) return _internal_value(); } template @@ -2605,11 +2608,11 @@ inline PROTOBUF_ALWAYS_INLINE void EdaDataFile_PropertyRecord::set_value(ArgT0&& arg0, ArgT... args) { _impl_._has_bits_[0] |= 0x00000002u; _impl_.value_.Set(static_cast(arg0), args..., GetArenaForAllocation()); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.PropertyRecord.value) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.PropertyRecord.value) } inline std::string* EdaDataFile_PropertyRecord::mutable_value() { std::string* _s = _internal_mutable_value(); - // @@protoc_insertion_point(field_mutable:odbdesign.proto.EdaDataFile.PropertyRecord.value) + // @@protoc_insertion_point(field_mutable:Odb.Lib.Protobuf.EdaDataFile.PropertyRecord.value) return _s; } inline const std::string& EdaDataFile_PropertyRecord::_internal_value() const { @@ -2624,7 +2627,7 @@ inline std::string* EdaDataFile_PropertyRecord::_internal_mutable_value() { return _impl_.value_.Mutable(GetArenaForAllocation()); } inline std::string* EdaDataFile_PropertyRecord::release_value() { - // @@protoc_insertion_point(field_release:odbdesign.proto.EdaDataFile.PropertyRecord.value) + // @@protoc_insertion_point(field_release:Odb.Lib.Protobuf.EdaDataFile.PropertyRecord.value) if (!_internal_has_value()) { return nullptr; } @@ -2649,7 +2652,7 @@ inline void EdaDataFile_PropertyRecord::set_allocated_value(std::string* value) _impl_.value_.Set("", GetArenaForAllocation()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - // @@protoc_insertion_point(field_set_allocated:odbdesign.proto.EdaDataFile.PropertyRecord.value) + // @@protoc_insertion_point(field_set_allocated:Odb.Lib.Protobuf.EdaDataFile.PropertyRecord.value) } // repeated float floatValues = 3; @@ -2666,19 +2669,19 @@ inline float EdaDataFile_PropertyRecord::_internal_floatvalues(int index) const return _impl_.floatvalues_.Get(index); } inline float EdaDataFile_PropertyRecord::floatvalues(int index) const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.PropertyRecord.floatValues) + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.PropertyRecord.floatValues) return _internal_floatvalues(index); } inline void EdaDataFile_PropertyRecord::set_floatvalues(int index, float value) { _impl_.floatvalues_.Set(index, value); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.PropertyRecord.floatValues) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.PropertyRecord.floatValues) } inline void EdaDataFile_PropertyRecord::_internal_add_floatvalues(float value) { _impl_.floatvalues_.Add(value); } inline void EdaDataFile_PropertyRecord::add_floatvalues(float value) { _internal_add_floatvalues(value); - // @@protoc_insertion_point(field_add:odbdesign.proto.EdaDataFile.PropertyRecord.floatValues) + // @@protoc_insertion_point(field_add:Odb.Lib.Protobuf.EdaDataFile.PropertyRecord.floatValues) } inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< float >& EdaDataFile_PropertyRecord::_internal_floatvalues() const { @@ -2686,7 +2689,7 @@ EdaDataFile_PropertyRecord::_internal_floatvalues() const { } inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< float >& EdaDataFile_PropertyRecord::floatvalues() const { - // @@protoc_insertion_point(field_list:odbdesign.proto.EdaDataFile.PropertyRecord.floatValues) + // @@protoc_insertion_point(field_list:Odb.Lib.Protobuf.EdaDataFile.PropertyRecord.floatValues) return _internal_floatvalues(); } inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< float >* @@ -2695,7 +2698,7 @@ EdaDataFile_PropertyRecord::_internal_mutable_floatvalues() { } inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< float >* EdaDataFile_PropertyRecord::mutable_floatvalues() { - // @@protoc_insertion_point(field_mutable_list:odbdesign.proto.EdaDataFile.PropertyRecord.floatValues) + // @@protoc_insertion_point(field_mutable_list:Odb.Lib.Protobuf.EdaDataFile.PropertyRecord.floatValues) return _internal_mutable_floatvalues(); } @@ -2703,7 +2706,7 @@ EdaDataFile_PropertyRecord::mutable_floatvalues() { // EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord -// optional .odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord.Type type = 1; +// optional .Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord.Type type = 1; inline bool EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::_internal_has_type() const { bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0; return value; @@ -2715,20 +2718,20 @@ inline void EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::clear_type() { _impl_.type_ = 0; _impl_._has_bits_[0] &= ~0x00000001u; } -inline ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord_Type EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::_internal_type() const { - return static_cast< ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord_Type >(_impl_.type_); +inline ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord_Type EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::_internal_type() const { + return static_cast< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord_Type >(_impl_.type_); } -inline ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord_Type EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::type() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord.type) +inline ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord_Type EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::type() const { + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord.type) return _internal_type(); } -inline void EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::_internal_set_type(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord_Type value) { +inline void EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::_internal_set_type(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord_Type value) { _impl_._has_bits_[0] |= 0x00000001u; _impl_.type_ = value; } -inline void EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::set_type(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord_Type value) { +inline void EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::set_type(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord_Type value) { _internal_set_type(value); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord.type) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord.type) } // optional uint32 layerNumber = 2; @@ -2747,7 +2750,7 @@ inline uint32_t EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::_internal_la return _impl_.layernumber_; } inline uint32_t EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::layernumber() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord.layerNumber) + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord.layerNumber) return _internal_layernumber(); } inline void EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::_internal_set_layernumber(uint32_t value) { @@ -2756,7 +2759,7 @@ inline void EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::_internal_set_la } inline void EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::set_layernumber(uint32_t value) { _internal_set_layernumber(value); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord.layerNumber) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord.layerNumber) } // optional uint32 featureNumber = 3; @@ -2775,7 +2778,7 @@ inline uint32_t EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::_internal_fe return _impl_.featurenumber_; } inline uint32_t EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::featurenumber() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord.featureNumber) + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord.featureNumber) return _internal_featurenumber(); } inline void EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::_internal_set_featurenumber(uint32_t value) { @@ -2784,14 +2787,14 @@ inline void EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::_internal_set_fe } inline void EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord::set_featurenumber(uint32_t value) { _internal_set_featurenumber(value); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord.featureNumber) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord.featureNumber) } // ------------------------------------------------------------------- // EdaDataFile_NetRecord_SubnetRecord -// optional .odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.Type type = 1; +// optional .Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.Type type = 1; inline bool EdaDataFile_NetRecord_SubnetRecord::_internal_has_type() const { bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0; return value; @@ -2803,23 +2806,23 @@ inline void EdaDataFile_NetRecord_SubnetRecord::clear_type() { _impl_.type_ = 0; _impl_._has_bits_[0] &= ~0x00000001u; } -inline ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_Type EdaDataFile_NetRecord_SubnetRecord::_internal_type() const { - return static_cast< ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_Type >(_impl_.type_); +inline ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_Type EdaDataFile_NetRecord_SubnetRecord::_internal_type() const { + return static_cast< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_Type >(_impl_.type_); } -inline ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_Type EdaDataFile_NetRecord_SubnetRecord::type() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.type) +inline ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_Type EdaDataFile_NetRecord_SubnetRecord::type() const { + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.type) return _internal_type(); } -inline void EdaDataFile_NetRecord_SubnetRecord::_internal_set_type(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_Type value) { +inline void EdaDataFile_NetRecord_SubnetRecord::_internal_set_type(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_Type value) { _impl_._has_bits_[0] |= 0x00000001u; _impl_.type_ = value; } -inline void EdaDataFile_NetRecord_SubnetRecord::set_type(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_Type value) { +inline void EdaDataFile_NetRecord_SubnetRecord::set_type(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_Type value) { _internal_set_type(value); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.type) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.type) } -// repeated .odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord featureIdRecords = 2; +// repeated .Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FeatureIdRecord featureIdRecords = 2; inline int EdaDataFile_NetRecord_SubnetRecord::_internal_featureidrecords_size() const { return _impl_.featureidrecords_.size(); } @@ -2829,37 +2832,37 @@ inline int EdaDataFile_NetRecord_SubnetRecord::featureidrecords_size() const { inline void EdaDataFile_NetRecord_SubnetRecord::clear_featureidrecords() { _impl_.featureidrecords_.Clear(); } -inline ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord* EdaDataFile_NetRecord_SubnetRecord::mutable_featureidrecords(int index) { - // @@protoc_insertion_point(field_mutable:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.featureIdRecords) +inline ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord* EdaDataFile_NetRecord_SubnetRecord::mutable_featureidrecords(int index) { + // @@protoc_insertion_point(field_mutable:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.featureIdRecords) return _impl_.featureidrecords_.Mutable(index); } -inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord >* +inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord >* EdaDataFile_NetRecord_SubnetRecord::mutable_featureidrecords() { - // @@protoc_insertion_point(field_mutable_list:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.featureIdRecords) + // @@protoc_insertion_point(field_mutable_list:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.featureIdRecords) return &_impl_.featureidrecords_; } -inline const ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord& EdaDataFile_NetRecord_SubnetRecord::_internal_featureidrecords(int index) const { +inline const ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord& EdaDataFile_NetRecord_SubnetRecord::_internal_featureidrecords(int index) const { return _impl_.featureidrecords_.Get(index); } -inline const ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord& EdaDataFile_NetRecord_SubnetRecord::featureidrecords(int index) const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.featureIdRecords) +inline const ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord& EdaDataFile_NetRecord_SubnetRecord::featureidrecords(int index) const { + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.featureIdRecords) return _internal_featureidrecords(index); } -inline ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord* EdaDataFile_NetRecord_SubnetRecord::_internal_add_featureidrecords() { +inline ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord* EdaDataFile_NetRecord_SubnetRecord::_internal_add_featureidrecords() { return _impl_.featureidrecords_.Add(); } -inline ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord* EdaDataFile_NetRecord_SubnetRecord::add_featureidrecords() { - ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord* _add = _internal_add_featureidrecords(); - // @@protoc_insertion_point(field_add:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.featureIdRecords) +inline ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord* EdaDataFile_NetRecord_SubnetRecord::add_featureidrecords() { + ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord* _add = _internal_add_featureidrecords(); + // @@protoc_insertion_point(field_add:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.featureIdRecords) return _add; } -inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord >& +inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord >& EdaDataFile_NetRecord_SubnetRecord::featureidrecords() const { - // @@protoc_insertion_point(field_list:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.featureIdRecords) + // @@protoc_insertion_point(field_list:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.featureIdRecords) return _impl_.featureidrecords_; } -// optional .odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.FillType fillType = 3; +// optional .Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.FillType fillType = 3; inline bool EdaDataFile_NetRecord_SubnetRecord::_internal_has_filltype() const { bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0; return value; @@ -2871,23 +2874,23 @@ inline void EdaDataFile_NetRecord_SubnetRecord::clear_filltype() { _impl_.filltype_ = 0; _impl_._has_bits_[0] &= ~0x00000002u; } -inline ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FillType EdaDataFile_NetRecord_SubnetRecord::_internal_filltype() const { - return static_cast< ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FillType >(_impl_.filltype_); +inline ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FillType EdaDataFile_NetRecord_SubnetRecord::_internal_filltype() const { + return static_cast< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FillType >(_impl_.filltype_); } -inline ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FillType EdaDataFile_NetRecord_SubnetRecord::filltype() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.fillType) +inline ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FillType EdaDataFile_NetRecord_SubnetRecord::filltype() const { + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.fillType) return _internal_filltype(); } -inline void EdaDataFile_NetRecord_SubnetRecord::_internal_set_filltype(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FillType value) { +inline void EdaDataFile_NetRecord_SubnetRecord::_internal_set_filltype(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FillType value) { _impl_._has_bits_[0] |= 0x00000002u; _impl_.filltype_ = value; } -inline void EdaDataFile_NetRecord_SubnetRecord::set_filltype(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FillType value) { +inline void EdaDataFile_NetRecord_SubnetRecord::set_filltype(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FillType value) { _internal_set_filltype(value); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.fillType) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.fillType) } -// optional .odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.CutoutType cutoutType = 4; +// optional .Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.CutoutType cutoutType = 4; inline bool EdaDataFile_NetRecord_SubnetRecord::_internal_has_cutouttype() const { bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0; return value; @@ -2899,20 +2902,20 @@ inline void EdaDataFile_NetRecord_SubnetRecord::clear_cutouttype() { _impl_.cutouttype_ = 0; _impl_._has_bits_[0] &= ~0x00000004u; } -inline ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_CutoutType EdaDataFile_NetRecord_SubnetRecord::_internal_cutouttype() const { - return static_cast< ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_CutoutType >(_impl_.cutouttype_); +inline ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_CutoutType EdaDataFile_NetRecord_SubnetRecord::_internal_cutouttype() const { + return static_cast< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_CutoutType >(_impl_.cutouttype_); } -inline ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_CutoutType EdaDataFile_NetRecord_SubnetRecord::cutouttype() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.cutoutType) +inline ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_CutoutType EdaDataFile_NetRecord_SubnetRecord::cutouttype() const { + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.cutoutType) return _internal_cutouttype(); } -inline void EdaDataFile_NetRecord_SubnetRecord::_internal_set_cutouttype(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_CutoutType value) { +inline void EdaDataFile_NetRecord_SubnetRecord::_internal_set_cutouttype(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_CutoutType value) { _impl_._has_bits_[0] |= 0x00000004u; _impl_.cutouttype_ = value; } -inline void EdaDataFile_NetRecord_SubnetRecord::set_cutouttype(::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_CutoutType value) { +inline void EdaDataFile_NetRecord_SubnetRecord::set_cutouttype(::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_CutoutType value) { _internal_set_cutouttype(value); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.cutoutType) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.cutoutType) } // optional float fillSize = 5; @@ -2931,7 +2934,7 @@ inline float EdaDataFile_NetRecord_SubnetRecord::_internal_fillsize() const { return _impl_.fillsize_; } inline float EdaDataFile_NetRecord_SubnetRecord::fillsize() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.fillSize) + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.fillSize) return _internal_fillsize(); } inline void EdaDataFile_NetRecord_SubnetRecord::_internal_set_fillsize(float value) { @@ -2940,10 +2943,10 @@ inline void EdaDataFile_NetRecord_SubnetRecord::_internal_set_fillsize(float val } inline void EdaDataFile_NetRecord_SubnetRecord::set_fillsize(float value) { _internal_set_fillsize(value); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.fillSize) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.fillSize) } -// optional .odbdesign.proto.EdaDataFile.BoardSide side = 6; +// optional .Odb.Lib.Protobuf.EdaDataFile.BoardSide side = 6; inline bool EdaDataFile_NetRecord_SubnetRecord::_internal_has_side() const { bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0; return value; @@ -2955,20 +2958,20 @@ inline void EdaDataFile_NetRecord_SubnetRecord::clear_side() { _impl_.side_ = 0; _impl_._has_bits_[0] &= ~0x00000010u; } -inline ::odbdesign::proto::EdaDataFile_BoardSide EdaDataFile_NetRecord_SubnetRecord::_internal_side() const { - return static_cast< ::odbdesign::proto::EdaDataFile_BoardSide >(_impl_.side_); +inline ::Odb::Lib::Protobuf::EdaDataFile_BoardSide EdaDataFile_NetRecord_SubnetRecord::_internal_side() const { + return static_cast< ::Odb::Lib::Protobuf::EdaDataFile_BoardSide >(_impl_.side_); } -inline ::odbdesign::proto::EdaDataFile_BoardSide EdaDataFile_NetRecord_SubnetRecord::side() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.side) +inline ::Odb::Lib::Protobuf::EdaDataFile_BoardSide EdaDataFile_NetRecord_SubnetRecord::side() const { + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.side) return _internal_side(); } -inline void EdaDataFile_NetRecord_SubnetRecord::_internal_set_side(::odbdesign::proto::EdaDataFile_BoardSide value) { +inline void EdaDataFile_NetRecord_SubnetRecord::_internal_set_side(::Odb::Lib::Protobuf::EdaDataFile_BoardSide value) { _impl_._has_bits_[0] |= 0x00000010u; _impl_.side_ = value; } -inline void EdaDataFile_NetRecord_SubnetRecord::set_side(::odbdesign::proto::EdaDataFile_BoardSide value) { +inline void EdaDataFile_NetRecord_SubnetRecord::set_side(::Odb::Lib::Protobuf::EdaDataFile_BoardSide value) { _internal_set_side(value); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.side) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.side) } // optional uint32 componentNumber = 7; @@ -2987,7 +2990,7 @@ inline uint32_t EdaDataFile_NetRecord_SubnetRecord::_internal_componentnumber() return _impl_.componentnumber_; } inline uint32_t EdaDataFile_NetRecord_SubnetRecord::componentnumber() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.componentNumber) + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.componentNumber) return _internal_componentnumber(); } inline void EdaDataFile_NetRecord_SubnetRecord::_internal_set_componentnumber(uint32_t value) { @@ -2996,7 +2999,7 @@ inline void EdaDataFile_NetRecord_SubnetRecord::_internal_set_componentnumber(ui } inline void EdaDataFile_NetRecord_SubnetRecord::set_componentnumber(uint32_t value) { _internal_set_componentnumber(value); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.componentNumber) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.componentNumber) } // optional uint32 toeprintNumber = 8; @@ -3015,7 +3018,7 @@ inline uint32_t EdaDataFile_NetRecord_SubnetRecord::_internal_toeprintnumber() c return _impl_.toeprintnumber_; } inline uint32_t EdaDataFile_NetRecord_SubnetRecord::toeprintnumber() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.toeprintNumber) + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.toeprintNumber) return _internal_toeprintnumber(); } inline void EdaDataFile_NetRecord_SubnetRecord::_internal_set_toeprintnumber(uint32_t value) { @@ -3024,7 +3027,7 @@ inline void EdaDataFile_NetRecord_SubnetRecord::_internal_set_toeprintnumber(uin } inline void EdaDataFile_NetRecord_SubnetRecord::set_toeprintnumber(uint32_t value) { _internal_set_toeprintnumber(value); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord.toeprintNumber) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord.toeprintNumber) } // ------------------------------------------------------------------- @@ -3044,7 +3047,7 @@ inline void EdaDataFile_NetRecord::clear_name() { _impl_._has_bits_[0] &= ~0x00000001u; } inline const std::string& EdaDataFile_NetRecord::name() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.NetRecord.name) + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.NetRecord.name) return _internal_name(); } template @@ -3052,11 +3055,11 @@ inline PROTOBUF_ALWAYS_INLINE void EdaDataFile_NetRecord::set_name(ArgT0&& arg0, ArgT... args) { _impl_._has_bits_[0] |= 0x00000001u; _impl_.name_.Set(static_cast(arg0), args..., GetArenaForAllocation()); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.NetRecord.name) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.NetRecord.name) } inline std::string* EdaDataFile_NetRecord::mutable_name() { std::string* _s = _internal_mutable_name(); - // @@protoc_insertion_point(field_mutable:odbdesign.proto.EdaDataFile.NetRecord.name) + // @@protoc_insertion_point(field_mutable:Odb.Lib.Protobuf.EdaDataFile.NetRecord.name) return _s; } inline const std::string& EdaDataFile_NetRecord::_internal_name() const { @@ -3071,7 +3074,7 @@ inline std::string* EdaDataFile_NetRecord::_internal_mutable_name() { return _impl_.name_.Mutable(GetArenaForAllocation()); } inline std::string* EdaDataFile_NetRecord::release_name() { - // @@protoc_insertion_point(field_release:odbdesign.proto.EdaDataFile.NetRecord.name) + // @@protoc_insertion_point(field_release:Odb.Lib.Protobuf.EdaDataFile.NetRecord.name) if (!_internal_has_name()) { return nullptr; } @@ -3096,7 +3099,7 @@ inline void EdaDataFile_NetRecord::set_allocated_name(std::string* name) { _impl_.name_.Set("", GetArenaForAllocation()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - // @@protoc_insertion_point(field_set_allocated:odbdesign.proto.EdaDataFile.NetRecord.name) + // @@protoc_insertion_point(field_set_allocated:Odb.Lib.Protobuf.EdaDataFile.NetRecord.name) } // optional string attributesIdString = 2; @@ -3112,7 +3115,7 @@ inline void EdaDataFile_NetRecord::clear_attributesidstring() { _impl_._has_bits_[0] &= ~0x00000002u; } inline const std::string& EdaDataFile_NetRecord::attributesidstring() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.NetRecord.attributesIdString) + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.NetRecord.attributesIdString) return _internal_attributesidstring(); } template @@ -3120,11 +3123,11 @@ inline PROTOBUF_ALWAYS_INLINE void EdaDataFile_NetRecord::set_attributesidstring(ArgT0&& arg0, ArgT... args) { _impl_._has_bits_[0] |= 0x00000002u; _impl_.attributesidstring_.Set(static_cast(arg0), args..., GetArenaForAllocation()); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.NetRecord.attributesIdString) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.NetRecord.attributesIdString) } inline std::string* EdaDataFile_NetRecord::mutable_attributesidstring() { std::string* _s = _internal_mutable_attributesidstring(); - // @@protoc_insertion_point(field_mutable:odbdesign.proto.EdaDataFile.NetRecord.attributesIdString) + // @@protoc_insertion_point(field_mutable:Odb.Lib.Protobuf.EdaDataFile.NetRecord.attributesIdString) return _s; } inline const std::string& EdaDataFile_NetRecord::_internal_attributesidstring() const { @@ -3139,7 +3142,7 @@ inline std::string* EdaDataFile_NetRecord::_internal_mutable_attributesidstring( return _impl_.attributesidstring_.Mutable(GetArenaForAllocation()); } inline std::string* EdaDataFile_NetRecord::release_attributesidstring() { - // @@protoc_insertion_point(field_release:odbdesign.proto.EdaDataFile.NetRecord.attributesIdString) + // @@protoc_insertion_point(field_release:Odb.Lib.Protobuf.EdaDataFile.NetRecord.attributesIdString) if (!_internal_has_attributesidstring()) { return nullptr; } @@ -3164,7 +3167,7 @@ inline void EdaDataFile_NetRecord::set_allocated_attributesidstring(std::string* _impl_.attributesidstring_.Set("", GetArenaForAllocation()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - // @@protoc_insertion_point(field_set_allocated:odbdesign.proto.EdaDataFile.NetRecord.attributesIdString) + // @@protoc_insertion_point(field_set_allocated:Odb.Lib.Protobuf.EdaDataFile.NetRecord.attributesIdString) } // optional uint32 index = 3; @@ -3183,7 +3186,7 @@ inline uint32_t EdaDataFile_NetRecord::_internal_index() const { return _impl_.index_; } inline uint32_t EdaDataFile_NetRecord::index() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.NetRecord.index) + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.NetRecord.index) return _internal_index(); } inline void EdaDataFile_NetRecord::_internal_set_index(uint32_t value) { @@ -3192,10 +3195,10 @@ inline void EdaDataFile_NetRecord::_internal_set_index(uint32_t value) { } inline void EdaDataFile_NetRecord::set_index(uint32_t value) { _internal_set_index(value); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.NetRecord.index) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.NetRecord.index) } -// repeated .odbdesign.proto.EdaDataFile.NetRecord.SubnetRecord subnetRecords = 4; +// repeated .Odb.Lib.Protobuf.EdaDataFile.NetRecord.SubnetRecord subnetRecords = 4; inline int EdaDataFile_NetRecord::_internal_subnetrecords_size() const { return _impl_.subnetrecords_.size(); } @@ -3205,37 +3208,37 @@ inline int EdaDataFile_NetRecord::subnetrecords_size() const { inline void EdaDataFile_NetRecord::clear_subnetrecords() { _impl_.subnetrecords_.Clear(); } -inline ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord* EdaDataFile_NetRecord::mutable_subnetrecords(int index) { - // @@protoc_insertion_point(field_mutable:odbdesign.proto.EdaDataFile.NetRecord.subnetRecords) +inline ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord* EdaDataFile_NetRecord::mutable_subnetrecords(int index) { + // @@protoc_insertion_point(field_mutable:Odb.Lib.Protobuf.EdaDataFile.NetRecord.subnetRecords) return _impl_.subnetrecords_.Mutable(index); } -inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord >* +inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord >* EdaDataFile_NetRecord::mutable_subnetrecords() { - // @@protoc_insertion_point(field_mutable_list:odbdesign.proto.EdaDataFile.NetRecord.subnetRecords) + // @@protoc_insertion_point(field_mutable_list:Odb.Lib.Protobuf.EdaDataFile.NetRecord.subnetRecords) return &_impl_.subnetrecords_; } -inline const ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord& EdaDataFile_NetRecord::_internal_subnetrecords(int index) const { +inline const ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord& EdaDataFile_NetRecord::_internal_subnetrecords(int index) const { return _impl_.subnetrecords_.Get(index); } -inline const ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord& EdaDataFile_NetRecord::subnetrecords(int index) const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.NetRecord.subnetRecords) +inline const ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord& EdaDataFile_NetRecord::subnetrecords(int index) const { + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.NetRecord.subnetRecords) return _internal_subnetrecords(index); } -inline ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord* EdaDataFile_NetRecord::_internal_add_subnetrecords() { +inline ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord* EdaDataFile_NetRecord::_internal_add_subnetrecords() { return _impl_.subnetrecords_.Add(); } -inline ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord* EdaDataFile_NetRecord::add_subnetrecords() { - ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord* _add = _internal_add_subnetrecords(); - // @@protoc_insertion_point(field_add:odbdesign.proto.EdaDataFile.NetRecord.subnetRecords) +inline ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord* EdaDataFile_NetRecord::add_subnetrecords() { + ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord* _add = _internal_add_subnetrecords(); + // @@protoc_insertion_point(field_add:Odb.Lib.Protobuf.EdaDataFile.NetRecord.subnetRecords) return _add; } -inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord >& +inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord >& EdaDataFile_NetRecord::subnetrecords() const { - // @@protoc_insertion_point(field_list:odbdesign.proto.EdaDataFile.NetRecord.subnetRecords) + // @@protoc_insertion_point(field_list:Odb.Lib.Protobuf.EdaDataFile.NetRecord.subnetRecords) return _impl_.subnetrecords_; } -// repeated .odbdesign.proto.EdaDataFile.PropertyRecord propertyRecords = 5; +// repeated .Odb.Lib.Protobuf.EdaDataFile.PropertyRecord propertyRecords = 5; inline int EdaDataFile_NetRecord::_internal_propertyrecords_size() const { return _impl_.propertyrecords_.size(); } @@ -3245,33 +3248,33 @@ inline int EdaDataFile_NetRecord::propertyrecords_size() const { inline void EdaDataFile_NetRecord::clear_propertyrecords() { _impl_.propertyrecords_.Clear(); } -inline ::odbdesign::proto::EdaDataFile_PropertyRecord* EdaDataFile_NetRecord::mutable_propertyrecords(int index) { - // @@protoc_insertion_point(field_mutable:odbdesign.proto.EdaDataFile.NetRecord.propertyRecords) +inline ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord* EdaDataFile_NetRecord::mutable_propertyrecords(int index) { + // @@protoc_insertion_point(field_mutable:Odb.Lib.Protobuf.EdaDataFile.NetRecord.propertyRecords) return _impl_.propertyrecords_.Mutable(index); } -inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_PropertyRecord >* +inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord >* EdaDataFile_NetRecord::mutable_propertyrecords() { - // @@protoc_insertion_point(field_mutable_list:odbdesign.proto.EdaDataFile.NetRecord.propertyRecords) + // @@protoc_insertion_point(field_mutable_list:Odb.Lib.Protobuf.EdaDataFile.NetRecord.propertyRecords) return &_impl_.propertyrecords_; } -inline const ::odbdesign::proto::EdaDataFile_PropertyRecord& EdaDataFile_NetRecord::_internal_propertyrecords(int index) const { +inline const ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord& EdaDataFile_NetRecord::_internal_propertyrecords(int index) const { return _impl_.propertyrecords_.Get(index); } -inline const ::odbdesign::proto::EdaDataFile_PropertyRecord& EdaDataFile_NetRecord::propertyrecords(int index) const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.NetRecord.propertyRecords) +inline const ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord& EdaDataFile_NetRecord::propertyrecords(int index) const { + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.NetRecord.propertyRecords) return _internal_propertyrecords(index); } -inline ::odbdesign::proto::EdaDataFile_PropertyRecord* EdaDataFile_NetRecord::_internal_add_propertyrecords() { +inline ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord* EdaDataFile_NetRecord::_internal_add_propertyrecords() { return _impl_.propertyrecords_.Add(); } -inline ::odbdesign::proto::EdaDataFile_PropertyRecord* EdaDataFile_NetRecord::add_propertyrecords() { - ::odbdesign::proto::EdaDataFile_PropertyRecord* _add = _internal_add_propertyrecords(); - // @@protoc_insertion_point(field_add:odbdesign.proto.EdaDataFile.NetRecord.propertyRecords) +inline ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord* EdaDataFile_NetRecord::add_propertyrecords() { + ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord* _add = _internal_add_propertyrecords(); + // @@protoc_insertion_point(field_add:Odb.Lib.Protobuf.EdaDataFile.NetRecord.propertyRecords) return _add; } -inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_PropertyRecord >& +inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord >& EdaDataFile_NetRecord::propertyrecords() const { - // @@protoc_insertion_point(field_list:odbdesign.proto.EdaDataFile.NetRecord.propertyRecords) + // @@protoc_insertion_point(field_list:Odb.Lib.Protobuf.EdaDataFile.NetRecord.propertyRecords) return _impl_.propertyrecords_; } @@ -3294,7 +3297,7 @@ inline void EdaDataFile_PackageRecord_PinRecord::clear_name() { _impl_._has_bits_[0] &= ~0x00000001u; } inline const std::string& EdaDataFile_PackageRecord_PinRecord::name() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.name) + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.name) return _internal_name(); } template @@ -3302,11 +3305,11 @@ inline PROTOBUF_ALWAYS_INLINE void EdaDataFile_PackageRecord_PinRecord::set_name(ArgT0&& arg0, ArgT... args) { _impl_._has_bits_[0] |= 0x00000001u; _impl_.name_.Set(static_cast(arg0), args..., GetArenaForAllocation()); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.name) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.name) } inline std::string* EdaDataFile_PackageRecord_PinRecord::mutable_name() { std::string* _s = _internal_mutable_name(); - // @@protoc_insertion_point(field_mutable:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.name) + // @@protoc_insertion_point(field_mutable:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.name) return _s; } inline const std::string& EdaDataFile_PackageRecord_PinRecord::_internal_name() const { @@ -3321,7 +3324,7 @@ inline std::string* EdaDataFile_PackageRecord_PinRecord::_internal_mutable_name( return _impl_.name_.Mutable(GetArenaForAllocation()); } inline std::string* EdaDataFile_PackageRecord_PinRecord::release_name() { - // @@protoc_insertion_point(field_release:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.name) + // @@protoc_insertion_point(field_release:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.name) if (!_internal_has_name()) { return nullptr; } @@ -3346,10 +3349,10 @@ inline void EdaDataFile_PackageRecord_PinRecord::set_allocated_name(std::string* _impl_.name_.Set("", GetArenaForAllocation()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - // @@protoc_insertion_point(field_set_allocated:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.name) + // @@protoc_insertion_point(field_set_allocated:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.name) } -// optional .odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.Type type = 2; +// optional .Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.Type type = 2; inline bool EdaDataFile_PackageRecord_PinRecord::_internal_has_type() const { bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0; return value; @@ -3361,20 +3364,20 @@ inline void EdaDataFile_PackageRecord_PinRecord::clear_type() { _impl_.type_ = 0; _impl_._has_bits_[0] &= ~0x00000002u; } -inline ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_Type EdaDataFile_PackageRecord_PinRecord::_internal_type() const { - return static_cast< ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_Type >(_impl_.type_); +inline ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_Type EdaDataFile_PackageRecord_PinRecord::_internal_type() const { + return static_cast< ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_Type >(_impl_.type_); } -inline ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_Type EdaDataFile_PackageRecord_PinRecord::type() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.type) +inline ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_Type EdaDataFile_PackageRecord_PinRecord::type() const { + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.type) return _internal_type(); } -inline void EdaDataFile_PackageRecord_PinRecord::_internal_set_type(::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_Type value) { +inline void EdaDataFile_PackageRecord_PinRecord::_internal_set_type(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_Type value) { _impl_._has_bits_[0] |= 0x00000002u; _impl_.type_ = value; } -inline void EdaDataFile_PackageRecord_PinRecord::set_type(::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_Type value) { +inline void EdaDataFile_PackageRecord_PinRecord::set_type(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_Type value) { _internal_set_type(value); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.type) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.type) } // optional float xCenter = 3; @@ -3393,7 +3396,7 @@ inline float EdaDataFile_PackageRecord_PinRecord::_internal_xcenter() const { return _impl_.xcenter_; } inline float EdaDataFile_PackageRecord_PinRecord::xcenter() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.xCenter) + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.xCenter) return _internal_xcenter(); } inline void EdaDataFile_PackageRecord_PinRecord::_internal_set_xcenter(float value) { @@ -3402,7 +3405,7 @@ inline void EdaDataFile_PackageRecord_PinRecord::_internal_set_xcenter(float val } inline void EdaDataFile_PackageRecord_PinRecord::set_xcenter(float value) { _internal_set_xcenter(value); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.xCenter) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.xCenter) } // optional float yCenter = 4; @@ -3421,7 +3424,7 @@ inline float EdaDataFile_PackageRecord_PinRecord::_internal_ycenter() const { return _impl_.ycenter_; } inline float EdaDataFile_PackageRecord_PinRecord::ycenter() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.yCenter) + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.yCenter) return _internal_ycenter(); } inline void EdaDataFile_PackageRecord_PinRecord::_internal_set_ycenter(float value) { @@ -3430,7 +3433,7 @@ inline void EdaDataFile_PackageRecord_PinRecord::_internal_set_ycenter(float val } inline void EdaDataFile_PackageRecord_PinRecord::set_ycenter(float value) { _internal_set_ycenter(value); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.yCenter) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.yCenter) } // optional float finishedHoleSize = 5; @@ -3449,7 +3452,7 @@ inline float EdaDataFile_PackageRecord_PinRecord::_internal_finishedholesize() c return _impl_.finishedholesize_; } inline float EdaDataFile_PackageRecord_PinRecord::finishedholesize() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.finishedHoleSize) + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.finishedHoleSize) return _internal_finishedholesize(); } inline void EdaDataFile_PackageRecord_PinRecord::_internal_set_finishedholesize(float value) { @@ -3458,10 +3461,10 @@ inline void EdaDataFile_PackageRecord_PinRecord::_internal_set_finishedholesize( } inline void EdaDataFile_PackageRecord_PinRecord::set_finishedholesize(float value) { _internal_set_finishedholesize(value); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.finishedHoleSize) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.finishedHoleSize) } -// optional .odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.ElectricalType electricalType = 6; +// optional .Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.ElectricalType electricalType = 6; inline bool EdaDataFile_PackageRecord_PinRecord::_internal_has_electricaltype() const { bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0; return value; @@ -3473,23 +3476,23 @@ inline void EdaDataFile_PackageRecord_PinRecord::clear_electricaltype() { _impl_.electricaltype_ = 0; _impl_._has_bits_[0] &= ~0x00000020u; } -inline ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_ElectricalType EdaDataFile_PackageRecord_PinRecord::_internal_electricaltype() const { - return static_cast< ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_ElectricalType >(_impl_.electricaltype_); +inline ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_ElectricalType EdaDataFile_PackageRecord_PinRecord::_internal_electricaltype() const { + return static_cast< ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_ElectricalType >(_impl_.electricaltype_); } -inline ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_ElectricalType EdaDataFile_PackageRecord_PinRecord::electricaltype() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.electricalType) +inline ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_ElectricalType EdaDataFile_PackageRecord_PinRecord::electricaltype() const { + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.electricalType) return _internal_electricaltype(); } -inline void EdaDataFile_PackageRecord_PinRecord::_internal_set_electricaltype(::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_ElectricalType value) { +inline void EdaDataFile_PackageRecord_PinRecord::_internal_set_electricaltype(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_ElectricalType value) { _impl_._has_bits_[0] |= 0x00000020u; _impl_.electricaltype_ = value; } -inline void EdaDataFile_PackageRecord_PinRecord::set_electricaltype(::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_ElectricalType value) { +inline void EdaDataFile_PackageRecord_PinRecord::set_electricaltype(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_ElectricalType value) { _internal_set_electricaltype(value); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.electricalType) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.electricalType) } -// optional .odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.MountType mountType = 7; +// optional .Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.MountType mountType = 7; inline bool EdaDataFile_PackageRecord_PinRecord::_internal_has_mounttype() const { bool value = (_impl_._has_bits_[0] & 0x00000040u) != 0; return value; @@ -3501,20 +3504,20 @@ inline void EdaDataFile_PackageRecord_PinRecord::clear_mounttype() { _impl_.mounttype_ = 0; _impl_._has_bits_[0] &= ~0x00000040u; } -inline ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_MountType EdaDataFile_PackageRecord_PinRecord::_internal_mounttype() const { - return static_cast< ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_MountType >(_impl_.mounttype_); +inline ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_MountType EdaDataFile_PackageRecord_PinRecord::_internal_mounttype() const { + return static_cast< ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_MountType >(_impl_.mounttype_); } -inline ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_MountType EdaDataFile_PackageRecord_PinRecord::mounttype() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.mountType) +inline ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_MountType EdaDataFile_PackageRecord_PinRecord::mounttype() const { + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.mountType) return _internal_mounttype(); } -inline void EdaDataFile_PackageRecord_PinRecord::_internal_set_mounttype(::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_MountType value) { +inline void EdaDataFile_PackageRecord_PinRecord::_internal_set_mounttype(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_MountType value) { _impl_._has_bits_[0] |= 0x00000040u; _impl_.mounttype_ = value; } -inline void EdaDataFile_PackageRecord_PinRecord::set_mounttype(::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_MountType value) { +inline void EdaDataFile_PackageRecord_PinRecord::set_mounttype(::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_MountType value) { _internal_set_mounttype(value); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.mountType) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.mountType) } // optional uint32 id = 8; @@ -3533,7 +3536,7 @@ inline uint32_t EdaDataFile_PackageRecord_PinRecord::_internal_id() const { return _impl_.id_; } inline uint32_t EdaDataFile_PackageRecord_PinRecord::id() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.id) + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.id) return _internal_id(); } inline void EdaDataFile_PackageRecord_PinRecord::_internal_set_id(uint32_t value) { @@ -3542,7 +3545,7 @@ inline void EdaDataFile_PackageRecord_PinRecord::_internal_set_id(uint32_t value } inline void EdaDataFile_PackageRecord_PinRecord::set_id(uint32_t value) { _internal_set_id(value); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.id) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.id) } // optional uint32 index = 9; @@ -3561,7 +3564,7 @@ inline uint32_t EdaDataFile_PackageRecord_PinRecord::_internal_index() const { return _impl_.index_; } inline uint32_t EdaDataFile_PackageRecord_PinRecord::index() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.index) + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.index) return _internal_index(); } inline void EdaDataFile_PackageRecord_PinRecord::_internal_set_index(uint32_t value) { @@ -3570,7 +3573,7 @@ inline void EdaDataFile_PackageRecord_PinRecord::_internal_set_index(uint32_t va } inline void EdaDataFile_PackageRecord_PinRecord::set_index(uint32_t value) { _internal_set_index(value); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.PackageRecord.PinRecord.index) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord.index) } // ------------------------------------------------------------------- @@ -3590,7 +3593,7 @@ inline void EdaDataFile_PackageRecord::clear_name() { _impl_._has_bits_[0] &= ~0x00000001u; } inline const std::string& EdaDataFile_PackageRecord::name() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.PackageRecord.name) + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.name) return _internal_name(); } template @@ -3598,11 +3601,11 @@ inline PROTOBUF_ALWAYS_INLINE void EdaDataFile_PackageRecord::set_name(ArgT0&& arg0, ArgT... args) { _impl_._has_bits_[0] |= 0x00000001u; _impl_.name_.Set(static_cast(arg0), args..., GetArenaForAllocation()); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.PackageRecord.name) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.name) } inline std::string* EdaDataFile_PackageRecord::mutable_name() { std::string* _s = _internal_mutable_name(); - // @@protoc_insertion_point(field_mutable:odbdesign.proto.EdaDataFile.PackageRecord.name) + // @@protoc_insertion_point(field_mutable:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.name) return _s; } inline const std::string& EdaDataFile_PackageRecord::_internal_name() const { @@ -3617,7 +3620,7 @@ inline std::string* EdaDataFile_PackageRecord::_internal_mutable_name() { return _impl_.name_.Mutable(GetArenaForAllocation()); } inline std::string* EdaDataFile_PackageRecord::release_name() { - // @@protoc_insertion_point(field_release:odbdesign.proto.EdaDataFile.PackageRecord.name) + // @@protoc_insertion_point(field_release:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.name) if (!_internal_has_name()) { return nullptr; } @@ -3642,7 +3645,7 @@ inline void EdaDataFile_PackageRecord::set_allocated_name(std::string* name) { _impl_.name_.Set("", GetArenaForAllocation()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - // @@protoc_insertion_point(field_set_allocated:odbdesign.proto.EdaDataFile.PackageRecord.name) + // @@protoc_insertion_point(field_set_allocated:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.name) } // optional float pitch = 2; @@ -3661,7 +3664,7 @@ inline float EdaDataFile_PackageRecord::_internal_pitch() const { return _impl_.pitch_; } inline float EdaDataFile_PackageRecord::pitch() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.PackageRecord.pitch) + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.pitch) return _internal_pitch(); } inline void EdaDataFile_PackageRecord::_internal_set_pitch(float value) { @@ -3670,7 +3673,7 @@ inline void EdaDataFile_PackageRecord::_internal_set_pitch(float value) { } inline void EdaDataFile_PackageRecord::set_pitch(float value) { _internal_set_pitch(value); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.PackageRecord.pitch) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.pitch) } // optional float xMin = 3; @@ -3689,7 +3692,7 @@ inline float EdaDataFile_PackageRecord::_internal_xmin() const { return _impl_.xmin_; } inline float EdaDataFile_PackageRecord::xmin() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.PackageRecord.xMin) + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.xMin) return _internal_xmin(); } inline void EdaDataFile_PackageRecord::_internal_set_xmin(float value) { @@ -3698,7 +3701,7 @@ inline void EdaDataFile_PackageRecord::_internal_set_xmin(float value) { } inline void EdaDataFile_PackageRecord::set_xmin(float value) { _internal_set_xmin(value); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.PackageRecord.xMin) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.xMin) } // optional float yMin = 4; @@ -3717,7 +3720,7 @@ inline float EdaDataFile_PackageRecord::_internal_ymin() const { return _impl_.ymin_; } inline float EdaDataFile_PackageRecord::ymin() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.PackageRecord.yMin) + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.yMin) return _internal_ymin(); } inline void EdaDataFile_PackageRecord::_internal_set_ymin(float value) { @@ -3726,7 +3729,7 @@ inline void EdaDataFile_PackageRecord::_internal_set_ymin(float value) { } inline void EdaDataFile_PackageRecord::set_ymin(float value) { _internal_set_ymin(value); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.PackageRecord.yMin) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.yMin) } // optional float xMax = 5; @@ -3745,7 +3748,7 @@ inline float EdaDataFile_PackageRecord::_internal_xmax() const { return _impl_.xmax_; } inline float EdaDataFile_PackageRecord::xmax() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.PackageRecord.xMax) + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.xMax) return _internal_xmax(); } inline void EdaDataFile_PackageRecord::_internal_set_xmax(float value) { @@ -3754,7 +3757,7 @@ inline void EdaDataFile_PackageRecord::_internal_set_xmax(float value) { } inline void EdaDataFile_PackageRecord::set_xmax(float value) { _internal_set_xmax(value); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.PackageRecord.xMax) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.xMax) } // optional float yMax = 6; @@ -3773,7 +3776,7 @@ inline float EdaDataFile_PackageRecord::_internal_ymax() const { return _impl_.ymax_; } inline float EdaDataFile_PackageRecord::ymax() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.PackageRecord.yMax) + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.yMax) return _internal_ymax(); } inline void EdaDataFile_PackageRecord::_internal_set_ymax(float value) { @@ -3782,7 +3785,7 @@ inline void EdaDataFile_PackageRecord::_internal_set_ymax(float value) { } inline void EdaDataFile_PackageRecord::set_ymax(float value) { _internal_set_ymax(value); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.PackageRecord.yMax) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.yMax) } // optional string attributesIdString = 7; @@ -3798,7 +3801,7 @@ inline void EdaDataFile_PackageRecord::clear_attributesidstring() { _impl_._has_bits_[0] &= ~0x00000002u; } inline const std::string& EdaDataFile_PackageRecord::attributesidstring() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.PackageRecord.attributesIdString) + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.attributesIdString) return _internal_attributesidstring(); } template @@ -3806,11 +3809,11 @@ inline PROTOBUF_ALWAYS_INLINE void EdaDataFile_PackageRecord::set_attributesidstring(ArgT0&& arg0, ArgT... args) { _impl_._has_bits_[0] |= 0x00000002u; _impl_.attributesidstring_.Set(static_cast(arg0), args..., GetArenaForAllocation()); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.PackageRecord.attributesIdString) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.attributesIdString) } inline std::string* EdaDataFile_PackageRecord::mutable_attributesidstring() { std::string* _s = _internal_mutable_attributesidstring(); - // @@protoc_insertion_point(field_mutable:odbdesign.proto.EdaDataFile.PackageRecord.attributesIdString) + // @@protoc_insertion_point(field_mutable:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.attributesIdString) return _s; } inline const std::string& EdaDataFile_PackageRecord::_internal_attributesidstring() const { @@ -3825,7 +3828,7 @@ inline std::string* EdaDataFile_PackageRecord::_internal_mutable_attributesidstr return _impl_.attributesidstring_.Mutable(GetArenaForAllocation()); } inline std::string* EdaDataFile_PackageRecord::release_attributesidstring() { - // @@protoc_insertion_point(field_release:odbdesign.proto.EdaDataFile.PackageRecord.attributesIdString) + // @@protoc_insertion_point(field_release:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.attributesIdString) if (!_internal_has_attributesidstring()) { return nullptr; } @@ -3850,10 +3853,10 @@ inline void EdaDataFile_PackageRecord::set_allocated_attributesidstring(std::str _impl_.attributesidstring_.Set("", GetArenaForAllocation()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - // @@protoc_insertion_point(field_set_allocated:odbdesign.proto.EdaDataFile.PackageRecord.attributesIdString) + // @@protoc_insertion_point(field_set_allocated:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.attributesIdString) } -// repeated .odbdesign.proto.EdaDataFile.PackageRecord.PinRecord pinRecords = 8; +// repeated .Odb.Lib.Protobuf.EdaDataFile.PackageRecord.PinRecord pinRecords = 8; inline int EdaDataFile_PackageRecord::_internal_pinrecords_size() const { return _impl_.pinrecords_.size(); } @@ -3863,37 +3866,37 @@ inline int EdaDataFile_PackageRecord::pinrecords_size() const { inline void EdaDataFile_PackageRecord::clear_pinrecords() { _impl_.pinrecords_.Clear(); } -inline ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord* EdaDataFile_PackageRecord::mutable_pinrecords(int index) { - // @@protoc_insertion_point(field_mutable:odbdesign.proto.EdaDataFile.PackageRecord.pinRecords) +inline ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord* EdaDataFile_PackageRecord::mutable_pinrecords(int index) { + // @@protoc_insertion_point(field_mutable:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.pinRecords) return _impl_.pinrecords_.Mutable(index); } -inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord >* +inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord >* EdaDataFile_PackageRecord::mutable_pinrecords() { - // @@protoc_insertion_point(field_mutable_list:odbdesign.proto.EdaDataFile.PackageRecord.pinRecords) + // @@protoc_insertion_point(field_mutable_list:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.pinRecords) return &_impl_.pinrecords_; } -inline const ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord& EdaDataFile_PackageRecord::_internal_pinrecords(int index) const { +inline const ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord& EdaDataFile_PackageRecord::_internal_pinrecords(int index) const { return _impl_.pinrecords_.Get(index); } -inline const ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord& EdaDataFile_PackageRecord::pinrecords(int index) const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.PackageRecord.pinRecords) +inline const ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord& EdaDataFile_PackageRecord::pinrecords(int index) const { + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.pinRecords) return _internal_pinrecords(index); } -inline ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord* EdaDataFile_PackageRecord::_internal_add_pinrecords() { +inline ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord* EdaDataFile_PackageRecord::_internal_add_pinrecords() { return _impl_.pinrecords_.Add(); } -inline ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord* EdaDataFile_PackageRecord::add_pinrecords() { - ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord* _add = _internal_add_pinrecords(); - // @@protoc_insertion_point(field_add:odbdesign.proto.EdaDataFile.PackageRecord.pinRecords) +inline ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord* EdaDataFile_PackageRecord::add_pinrecords() { + ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord* _add = _internal_add_pinrecords(); + // @@protoc_insertion_point(field_add:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.pinRecords) return _add; } -inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord >& +inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord >& EdaDataFile_PackageRecord::pinrecords() const { - // @@protoc_insertion_point(field_list:odbdesign.proto.EdaDataFile.PackageRecord.pinRecords) + // @@protoc_insertion_point(field_list:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.pinRecords) return _impl_.pinrecords_; } -// map pinRecordsByName = 9; +// map pinRecordsByName = 9; inline int EdaDataFile_PackageRecord::_internal_pinrecordsbyname_size() const { return _impl_.pinrecordsbyname_.size(); } @@ -3903,26 +3906,26 @@ inline int EdaDataFile_PackageRecord::pinrecordsbyname_size() const { inline void EdaDataFile_PackageRecord::clear_pinrecordsbyname() { _impl_.pinrecordsbyname_.Clear(); } -inline const ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord >& +inline const ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord >& EdaDataFile_PackageRecord::_internal_pinrecordsbyname() const { return _impl_.pinrecordsbyname_.GetMap(); } -inline const ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord >& +inline const ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord >& EdaDataFile_PackageRecord::pinrecordsbyname() const { - // @@protoc_insertion_point(field_map:odbdesign.proto.EdaDataFile.PackageRecord.pinRecordsByName) + // @@protoc_insertion_point(field_map:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.pinRecordsByName) return _internal_pinrecordsbyname(); } -inline ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord >* +inline ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord >* EdaDataFile_PackageRecord::_internal_mutable_pinrecordsbyname() { return _impl_.pinrecordsbyname_.MutableMap(); } -inline ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord >* +inline ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord >* EdaDataFile_PackageRecord::mutable_pinrecordsbyname() { - // @@protoc_insertion_point(field_mutable_map:odbdesign.proto.EdaDataFile.PackageRecord.pinRecordsByName) + // @@protoc_insertion_point(field_mutable_map:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.pinRecordsByName) return _internal_mutable_pinrecordsbyname(); } -// repeated .odbdesign.proto.EdaDataFile.PropertyRecord propertyRecords = 10; +// repeated .Odb.Lib.Protobuf.EdaDataFile.PropertyRecord propertyRecords = 10; inline int EdaDataFile_PackageRecord::_internal_propertyrecords_size() const { return _impl_.propertyrecords_.size(); } @@ -3932,33 +3935,33 @@ inline int EdaDataFile_PackageRecord::propertyrecords_size() const { inline void EdaDataFile_PackageRecord::clear_propertyrecords() { _impl_.propertyrecords_.Clear(); } -inline ::odbdesign::proto::EdaDataFile_PropertyRecord* EdaDataFile_PackageRecord::mutable_propertyrecords(int index) { - // @@protoc_insertion_point(field_mutable:odbdesign.proto.EdaDataFile.PackageRecord.propertyRecords) +inline ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord* EdaDataFile_PackageRecord::mutable_propertyrecords(int index) { + // @@protoc_insertion_point(field_mutable:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.propertyRecords) return _impl_.propertyrecords_.Mutable(index); } -inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_PropertyRecord >* +inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord >* EdaDataFile_PackageRecord::mutable_propertyrecords() { - // @@protoc_insertion_point(field_mutable_list:odbdesign.proto.EdaDataFile.PackageRecord.propertyRecords) + // @@protoc_insertion_point(field_mutable_list:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.propertyRecords) return &_impl_.propertyrecords_; } -inline const ::odbdesign::proto::EdaDataFile_PropertyRecord& EdaDataFile_PackageRecord::_internal_propertyrecords(int index) const { +inline const ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord& EdaDataFile_PackageRecord::_internal_propertyrecords(int index) const { return _impl_.propertyrecords_.Get(index); } -inline const ::odbdesign::proto::EdaDataFile_PropertyRecord& EdaDataFile_PackageRecord::propertyrecords(int index) const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.PackageRecord.propertyRecords) +inline const ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord& EdaDataFile_PackageRecord::propertyrecords(int index) const { + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.propertyRecords) return _internal_propertyrecords(index); } -inline ::odbdesign::proto::EdaDataFile_PropertyRecord* EdaDataFile_PackageRecord::_internal_add_propertyrecords() { +inline ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord* EdaDataFile_PackageRecord::_internal_add_propertyrecords() { return _impl_.propertyrecords_.Add(); } -inline ::odbdesign::proto::EdaDataFile_PropertyRecord* EdaDataFile_PackageRecord::add_propertyrecords() { - ::odbdesign::proto::EdaDataFile_PropertyRecord* _add = _internal_add_propertyrecords(); - // @@protoc_insertion_point(field_add:odbdesign.proto.EdaDataFile.PackageRecord.propertyRecords) +inline ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord* EdaDataFile_PackageRecord::add_propertyrecords() { + ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord* _add = _internal_add_propertyrecords(); + // @@protoc_insertion_point(field_add:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.propertyRecords) return _add; } -inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_PropertyRecord >& +inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_PropertyRecord >& EdaDataFile_PackageRecord::propertyrecords() const { - // @@protoc_insertion_point(field_list:odbdesign.proto.EdaDataFile.PackageRecord.propertyRecords) + // @@protoc_insertion_point(field_list:Odb.Lib.Protobuf.EdaDataFile.PackageRecord.propertyRecords) return _impl_.propertyrecords_; } @@ -3983,7 +3986,7 @@ inline void EdaDataFile::clear_path() { _impl_._has_bits_[0] &= ~0x00000001u; } inline const std::string& EdaDataFile::path() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.path) + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.path) return _internal_path(); } template @@ -3991,11 +3994,11 @@ inline PROTOBUF_ALWAYS_INLINE void EdaDataFile::set_path(ArgT0&& arg0, ArgT... args) { _impl_._has_bits_[0] |= 0x00000001u; _impl_.path_.Set(static_cast(arg0), args..., GetArenaForAllocation()); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.path) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.path) } inline std::string* EdaDataFile::mutable_path() { std::string* _s = _internal_mutable_path(); - // @@protoc_insertion_point(field_mutable:odbdesign.proto.EdaDataFile.path) + // @@protoc_insertion_point(field_mutable:Odb.Lib.Protobuf.EdaDataFile.path) return _s; } inline const std::string& EdaDataFile::_internal_path() const { @@ -4010,7 +4013,7 @@ inline std::string* EdaDataFile::_internal_mutable_path() { return _impl_.path_.Mutable(GetArenaForAllocation()); } inline std::string* EdaDataFile::release_path() { - // @@protoc_insertion_point(field_release:odbdesign.proto.EdaDataFile.path) + // @@protoc_insertion_point(field_release:Odb.Lib.Protobuf.EdaDataFile.path) if (!_internal_has_path()) { return nullptr; } @@ -4035,7 +4038,7 @@ inline void EdaDataFile::set_allocated_path(std::string* path) { _impl_.path_.Set("", GetArenaForAllocation()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - // @@protoc_insertion_point(field_set_allocated:odbdesign.proto.EdaDataFile.path) + // @@protoc_insertion_point(field_set_allocated:Odb.Lib.Protobuf.EdaDataFile.path) } // optional string units = 2; @@ -4051,7 +4054,7 @@ inline void EdaDataFile::clear_units() { _impl_._has_bits_[0] &= ~0x00000002u; } inline const std::string& EdaDataFile::units() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.units) + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.units) return _internal_units(); } template @@ -4059,11 +4062,11 @@ inline PROTOBUF_ALWAYS_INLINE void EdaDataFile::set_units(ArgT0&& arg0, ArgT... args) { _impl_._has_bits_[0] |= 0x00000002u; _impl_.units_.Set(static_cast(arg0), args..., GetArenaForAllocation()); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.units) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.units) } inline std::string* EdaDataFile::mutable_units() { std::string* _s = _internal_mutable_units(); - // @@protoc_insertion_point(field_mutable:odbdesign.proto.EdaDataFile.units) + // @@protoc_insertion_point(field_mutable:Odb.Lib.Protobuf.EdaDataFile.units) return _s; } inline const std::string& EdaDataFile::_internal_units() const { @@ -4078,7 +4081,7 @@ inline std::string* EdaDataFile::_internal_mutable_units() { return _impl_.units_.Mutable(GetArenaForAllocation()); } inline std::string* EdaDataFile::release_units() { - // @@protoc_insertion_point(field_release:odbdesign.proto.EdaDataFile.units) + // @@protoc_insertion_point(field_release:Odb.Lib.Protobuf.EdaDataFile.units) if (!_internal_has_units()) { return nullptr; } @@ -4103,7 +4106,7 @@ inline void EdaDataFile::set_allocated_units(std::string* units) { _impl_.units_.Set("", GetArenaForAllocation()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - // @@protoc_insertion_point(field_set_allocated:odbdesign.proto.EdaDataFile.units) + // @@protoc_insertion_point(field_set_allocated:Odb.Lib.Protobuf.EdaDataFile.units) } // optional string source = 3; @@ -4119,7 +4122,7 @@ inline void EdaDataFile::clear_source() { _impl_._has_bits_[0] &= ~0x00000004u; } inline const std::string& EdaDataFile::source() const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.source) + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.source) return _internal_source(); } template @@ -4127,11 +4130,11 @@ inline PROTOBUF_ALWAYS_INLINE void EdaDataFile::set_source(ArgT0&& arg0, ArgT... args) { _impl_._has_bits_[0] |= 0x00000004u; _impl_.source_.Set(static_cast(arg0), args..., GetArenaForAllocation()); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.source) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.source) } inline std::string* EdaDataFile::mutable_source() { std::string* _s = _internal_mutable_source(); - // @@protoc_insertion_point(field_mutable:odbdesign.proto.EdaDataFile.source) + // @@protoc_insertion_point(field_mutable:Odb.Lib.Protobuf.EdaDataFile.source) return _s; } inline const std::string& EdaDataFile::_internal_source() const { @@ -4146,7 +4149,7 @@ inline std::string* EdaDataFile::_internal_mutable_source() { return _impl_.source_.Mutable(GetArenaForAllocation()); } inline std::string* EdaDataFile::release_source() { - // @@protoc_insertion_point(field_release:odbdesign.proto.EdaDataFile.source) + // @@protoc_insertion_point(field_release:Odb.Lib.Protobuf.EdaDataFile.source) if (!_internal_has_source()) { return nullptr; } @@ -4171,7 +4174,7 @@ inline void EdaDataFile::set_allocated_source(std::string* source) { _impl_.source_.Set("", GetArenaForAllocation()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - // @@protoc_insertion_point(field_set_allocated:odbdesign.proto.EdaDataFile.source) + // @@protoc_insertion_point(field_set_allocated:Odb.Lib.Protobuf.EdaDataFile.source) } // repeated string layerNames = 4; @@ -4186,66 +4189,66 @@ inline void EdaDataFile::clear_layernames() { } inline std::string* EdaDataFile::add_layernames() { std::string* _s = _internal_add_layernames(); - // @@protoc_insertion_point(field_add_mutable:odbdesign.proto.EdaDataFile.layerNames) + // @@protoc_insertion_point(field_add_mutable:Odb.Lib.Protobuf.EdaDataFile.layerNames) return _s; } inline const std::string& EdaDataFile::_internal_layernames(int index) const { return _impl_.layernames_.Get(index); } inline const std::string& EdaDataFile::layernames(int index) const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.layerNames) + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.layerNames) return _internal_layernames(index); } inline std::string* EdaDataFile::mutable_layernames(int index) { - // @@protoc_insertion_point(field_mutable:odbdesign.proto.EdaDataFile.layerNames) + // @@protoc_insertion_point(field_mutable:Odb.Lib.Protobuf.EdaDataFile.layerNames) return _impl_.layernames_.Mutable(index); } inline void EdaDataFile::set_layernames(int index, const std::string& value) { _impl_.layernames_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.layerNames) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.layerNames) } inline void EdaDataFile::set_layernames(int index, std::string&& value) { _impl_.layernames_.Mutable(index)->assign(std::move(value)); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.layerNames) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.layerNames) } inline void EdaDataFile::set_layernames(int index, const char* value) { GOOGLE_DCHECK(value != nullptr); _impl_.layernames_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:odbdesign.proto.EdaDataFile.layerNames) + // @@protoc_insertion_point(field_set_char:Odb.Lib.Protobuf.EdaDataFile.layerNames) } inline void EdaDataFile::set_layernames(int index, const char* value, size_t size) { _impl_.layernames_.Mutable(index)->assign( reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:odbdesign.proto.EdaDataFile.layerNames) + // @@protoc_insertion_point(field_set_pointer:Odb.Lib.Protobuf.EdaDataFile.layerNames) } inline std::string* EdaDataFile::_internal_add_layernames() { return _impl_.layernames_.Add(); } inline void EdaDataFile::add_layernames(const std::string& value) { _impl_.layernames_.Add()->assign(value); - // @@protoc_insertion_point(field_add:odbdesign.proto.EdaDataFile.layerNames) + // @@protoc_insertion_point(field_add:Odb.Lib.Protobuf.EdaDataFile.layerNames) } inline void EdaDataFile::add_layernames(std::string&& value) { _impl_.layernames_.Add(std::move(value)); - // @@protoc_insertion_point(field_add:odbdesign.proto.EdaDataFile.layerNames) + // @@protoc_insertion_point(field_add:Odb.Lib.Protobuf.EdaDataFile.layerNames) } inline void EdaDataFile::add_layernames(const char* value) { GOOGLE_DCHECK(value != nullptr); _impl_.layernames_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:odbdesign.proto.EdaDataFile.layerNames) + // @@protoc_insertion_point(field_add_char:Odb.Lib.Protobuf.EdaDataFile.layerNames) } inline void EdaDataFile::add_layernames(const char* value, size_t size) { _impl_.layernames_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:odbdesign.proto.EdaDataFile.layerNames) + // @@protoc_insertion_point(field_add_pointer:Odb.Lib.Protobuf.EdaDataFile.layerNames) } inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField& EdaDataFile::layernames() const { - // @@protoc_insertion_point(field_list:odbdesign.proto.EdaDataFile.layerNames) + // @@protoc_insertion_point(field_list:Odb.Lib.Protobuf.EdaDataFile.layerNames) return _impl_.layernames_; } inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField* EdaDataFile::mutable_layernames() { - // @@protoc_insertion_point(field_mutable_list:odbdesign.proto.EdaDataFile.layerNames) + // @@protoc_insertion_point(field_mutable_list:Odb.Lib.Protobuf.EdaDataFile.layerNames) return &_impl_.layernames_; } @@ -4261,66 +4264,66 @@ inline void EdaDataFile::clear_attributenames() { } inline std::string* EdaDataFile::add_attributenames() { std::string* _s = _internal_add_attributenames(); - // @@protoc_insertion_point(field_add_mutable:odbdesign.proto.EdaDataFile.attributeNames) + // @@protoc_insertion_point(field_add_mutable:Odb.Lib.Protobuf.EdaDataFile.attributeNames) return _s; } inline const std::string& EdaDataFile::_internal_attributenames(int index) const { return _impl_.attributenames_.Get(index); } inline const std::string& EdaDataFile::attributenames(int index) const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.attributeNames) + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.attributeNames) return _internal_attributenames(index); } inline std::string* EdaDataFile::mutable_attributenames(int index) { - // @@protoc_insertion_point(field_mutable:odbdesign.proto.EdaDataFile.attributeNames) + // @@protoc_insertion_point(field_mutable:Odb.Lib.Protobuf.EdaDataFile.attributeNames) return _impl_.attributenames_.Mutable(index); } inline void EdaDataFile::set_attributenames(int index, const std::string& value) { _impl_.attributenames_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.attributeNames) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.attributeNames) } inline void EdaDataFile::set_attributenames(int index, std::string&& value) { _impl_.attributenames_.Mutable(index)->assign(std::move(value)); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.attributeNames) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.attributeNames) } inline void EdaDataFile::set_attributenames(int index, const char* value) { GOOGLE_DCHECK(value != nullptr); _impl_.attributenames_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:odbdesign.proto.EdaDataFile.attributeNames) + // @@protoc_insertion_point(field_set_char:Odb.Lib.Protobuf.EdaDataFile.attributeNames) } inline void EdaDataFile::set_attributenames(int index, const char* value, size_t size) { _impl_.attributenames_.Mutable(index)->assign( reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:odbdesign.proto.EdaDataFile.attributeNames) + // @@protoc_insertion_point(field_set_pointer:Odb.Lib.Protobuf.EdaDataFile.attributeNames) } inline std::string* EdaDataFile::_internal_add_attributenames() { return _impl_.attributenames_.Add(); } inline void EdaDataFile::add_attributenames(const std::string& value) { _impl_.attributenames_.Add()->assign(value); - // @@protoc_insertion_point(field_add:odbdesign.proto.EdaDataFile.attributeNames) + // @@protoc_insertion_point(field_add:Odb.Lib.Protobuf.EdaDataFile.attributeNames) } inline void EdaDataFile::add_attributenames(std::string&& value) { _impl_.attributenames_.Add(std::move(value)); - // @@protoc_insertion_point(field_add:odbdesign.proto.EdaDataFile.attributeNames) + // @@protoc_insertion_point(field_add:Odb.Lib.Protobuf.EdaDataFile.attributeNames) } inline void EdaDataFile::add_attributenames(const char* value) { GOOGLE_DCHECK(value != nullptr); _impl_.attributenames_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:odbdesign.proto.EdaDataFile.attributeNames) + // @@protoc_insertion_point(field_add_char:Odb.Lib.Protobuf.EdaDataFile.attributeNames) } inline void EdaDataFile::add_attributenames(const char* value, size_t size) { _impl_.attributenames_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:odbdesign.proto.EdaDataFile.attributeNames) + // @@protoc_insertion_point(field_add_pointer:Odb.Lib.Protobuf.EdaDataFile.attributeNames) } inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField& EdaDataFile::attributenames() const { - // @@protoc_insertion_point(field_list:odbdesign.proto.EdaDataFile.attributeNames) + // @@protoc_insertion_point(field_list:Odb.Lib.Protobuf.EdaDataFile.attributeNames) return _impl_.attributenames_; } inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField* EdaDataFile::mutable_attributenames() { - // @@protoc_insertion_point(field_mutable_list:odbdesign.proto.EdaDataFile.attributeNames) + // @@protoc_insertion_point(field_mutable_list:Odb.Lib.Protobuf.EdaDataFile.attributeNames) return &_impl_.attributenames_; } @@ -4336,70 +4339,70 @@ inline void EdaDataFile::clear_attributetextvalues() { } inline std::string* EdaDataFile::add_attributetextvalues() { std::string* _s = _internal_add_attributetextvalues(); - // @@protoc_insertion_point(field_add_mutable:odbdesign.proto.EdaDataFile.attributeTextValues) + // @@protoc_insertion_point(field_add_mutable:Odb.Lib.Protobuf.EdaDataFile.attributeTextValues) return _s; } inline const std::string& EdaDataFile::_internal_attributetextvalues(int index) const { return _impl_.attributetextvalues_.Get(index); } inline const std::string& EdaDataFile::attributetextvalues(int index) const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.attributeTextValues) + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.attributeTextValues) return _internal_attributetextvalues(index); } inline std::string* EdaDataFile::mutable_attributetextvalues(int index) { - // @@protoc_insertion_point(field_mutable:odbdesign.proto.EdaDataFile.attributeTextValues) + // @@protoc_insertion_point(field_mutable:Odb.Lib.Protobuf.EdaDataFile.attributeTextValues) return _impl_.attributetextvalues_.Mutable(index); } inline void EdaDataFile::set_attributetextvalues(int index, const std::string& value) { _impl_.attributetextvalues_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.attributeTextValues) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.attributeTextValues) } inline void EdaDataFile::set_attributetextvalues(int index, std::string&& value) { _impl_.attributetextvalues_.Mutable(index)->assign(std::move(value)); - // @@protoc_insertion_point(field_set:odbdesign.proto.EdaDataFile.attributeTextValues) + // @@protoc_insertion_point(field_set:Odb.Lib.Protobuf.EdaDataFile.attributeTextValues) } inline void EdaDataFile::set_attributetextvalues(int index, const char* value) { GOOGLE_DCHECK(value != nullptr); _impl_.attributetextvalues_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:odbdesign.proto.EdaDataFile.attributeTextValues) + // @@protoc_insertion_point(field_set_char:Odb.Lib.Protobuf.EdaDataFile.attributeTextValues) } inline void EdaDataFile::set_attributetextvalues(int index, const char* value, size_t size) { _impl_.attributetextvalues_.Mutable(index)->assign( reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:odbdesign.proto.EdaDataFile.attributeTextValues) + // @@protoc_insertion_point(field_set_pointer:Odb.Lib.Protobuf.EdaDataFile.attributeTextValues) } inline std::string* EdaDataFile::_internal_add_attributetextvalues() { return _impl_.attributetextvalues_.Add(); } inline void EdaDataFile::add_attributetextvalues(const std::string& value) { _impl_.attributetextvalues_.Add()->assign(value); - // @@protoc_insertion_point(field_add:odbdesign.proto.EdaDataFile.attributeTextValues) + // @@protoc_insertion_point(field_add:Odb.Lib.Protobuf.EdaDataFile.attributeTextValues) } inline void EdaDataFile::add_attributetextvalues(std::string&& value) { _impl_.attributetextvalues_.Add(std::move(value)); - // @@protoc_insertion_point(field_add:odbdesign.proto.EdaDataFile.attributeTextValues) + // @@protoc_insertion_point(field_add:Odb.Lib.Protobuf.EdaDataFile.attributeTextValues) } inline void EdaDataFile::add_attributetextvalues(const char* value) { GOOGLE_DCHECK(value != nullptr); _impl_.attributetextvalues_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:odbdesign.proto.EdaDataFile.attributeTextValues) + // @@protoc_insertion_point(field_add_char:Odb.Lib.Protobuf.EdaDataFile.attributeTextValues) } inline void EdaDataFile::add_attributetextvalues(const char* value, size_t size) { _impl_.attributetextvalues_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:odbdesign.proto.EdaDataFile.attributeTextValues) + // @@protoc_insertion_point(field_add_pointer:Odb.Lib.Protobuf.EdaDataFile.attributeTextValues) } inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField& EdaDataFile::attributetextvalues() const { - // @@protoc_insertion_point(field_list:odbdesign.proto.EdaDataFile.attributeTextValues) + // @@protoc_insertion_point(field_list:Odb.Lib.Protobuf.EdaDataFile.attributeTextValues) return _impl_.attributetextvalues_; } inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField* EdaDataFile::mutable_attributetextvalues() { - // @@protoc_insertion_point(field_mutable_list:odbdesign.proto.EdaDataFile.attributeTextValues) + // @@protoc_insertion_point(field_mutable_list:Odb.Lib.Protobuf.EdaDataFile.attributeTextValues) return &_impl_.attributetextvalues_; } -// repeated .odbdesign.proto.EdaDataFile.NetRecord netRecords = 7; +// repeated .Odb.Lib.Protobuf.EdaDataFile.NetRecord netRecords = 7; inline int EdaDataFile::_internal_netrecords_size() const { return _impl_.netrecords_.size(); } @@ -4409,37 +4412,37 @@ inline int EdaDataFile::netrecords_size() const { inline void EdaDataFile::clear_netrecords() { _impl_.netrecords_.Clear(); } -inline ::odbdesign::proto::EdaDataFile_NetRecord* EdaDataFile::mutable_netrecords(int index) { - // @@protoc_insertion_point(field_mutable:odbdesign.proto.EdaDataFile.netRecords) +inline ::Odb::Lib::Protobuf::EdaDataFile_NetRecord* EdaDataFile::mutable_netrecords(int index) { + // @@protoc_insertion_point(field_mutable:Odb.Lib.Protobuf.EdaDataFile.netRecords) return _impl_.netrecords_.Mutable(index); } -inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_NetRecord >* +inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord >* EdaDataFile::mutable_netrecords() { - // @@protoc_insertion_point(field_mutable_list:odbdesign.proto.EdaDataFile.netRecords) + // @@protoc_insertion_point(field_mutable_list:Odb.Lib.Protobuf.EdaDataFile.netRecords) return &_impl_.netrecords_; } -inline const ::odbdesign::proto::EdaDataFile_NetRecord& EdaDataFile::_internal_netrecords(int index) const { +inline const ::Odb::Lib::Protobuf::EdaDataFile_NetRecord& EdaDataFile::_internal_netrecords(int index) const { return _impl_.netrecords_.Get(index); } -inline const ::odbdesign::proto::EdaDataFile_NetRecord& EdaDataFile::netrecords(int index) const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.netRecords) +inline const ::Odb::Lib::Protobuf::EdaDataFile_NetRecord& EdaDataFile::netrecords(int index) const { + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.netRecords) return _internal_netrecords(index); } -inline ::odbdesign::proto::EdaDataFile_NetRecord* EdaDataFile::_internal_add_netrecords() { +inline ::Odb::Lib::Protobuf::EdaDataFile_NetRecord* EdaDataFile::_internal_add_netrecords() { return _impl_.netrecords_.Add(); } -inline ::odbdesign::proto::EdaDataFile_NetRecord* EdaDataFile::add_netrecords() { - ::odbdesign::proto::EdaDataFile_NetRecord* _add = _internal_add_netrecords(); - // @@protoc_insertion_point(field_add:odbdesign.proto.EdaDataFile.netRecords) +inline ::Odb::Lib::Protobuf::EdaDataFile_NetRecord* EdaDataFile::add_netrecords() { + ::Odb::Lib::Protobuf::EdaDataFile_NetRecord* _add = _internal_add_netrecords(); + // @@protoc_insertion_point(field_add:Odb.Lib.Protobuf.EdaDataFile.netRecords) return _add; } -inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_NetRecord >& +inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord >& EdaDataFile::netrecords() const { - // @@protoc_insertion_point(field_list:odbdesign.proto.EdaDataFile.netRecords) + // @@protoc_insertion_point(field_list:Odb.Lib.Protobuf.EdaDataFile.netRecords) return _impl_.netrecords_; } -// map netRecordsByName = 8; +// map netRecordsByName = 8; inline int EdaDataFile::_internal_netrecordsbyname_size() const { return _impl_.netrecordsbyname_.size(); } @@ -4449,26 +4452,26 @@ inline int EdaDataFile::netrecordsbyname_size() const { inline void EdaDataFile::clear_netrecordsbyname() { _impl_.netrecordsbyname_.Clear(); } -inline const ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::odbdesign::proto::EdaDataFile_NetRecord >& +inline const ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::Odb::Lib::Protobuf::EdaDataFile_NetRecord >& EdaDataFile::_internal_netrecordsbyname() const { return _impl_.netrecordsbyname_.GetMap(); } -inline const ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::odbdesign::proto::EdaDataFile_NetRecord >& +inline const ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::Odb::Lib::Protobuf::EdaDataFile_NetRecord >& EdaDataFile::netrecordsbyname() const { - // @@protoc_insertion_point(field_map:odbdesign.proto.EdaDataFile.netRecordsByName) + // @@protoc_insertion_point(field_map:Odb.Lib.Protobuf.EdaDataFile.netRecordsByName) return _internal_netrecordsbyname(); } -inline ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::odbdesign::proto::EdaDataFile_NetRecord >* +inline ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::Odb::Lib::Protobuf::EdaDataFile_NetRecord >* EdaDataFile::_internal_mutable_netrecordsbyname() { return _impl_.netrecordsbyname_.MutableMap(); } -inline ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::odbdesign::proto::EdaDataFile_NetRecord >* +inline ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::Odb::Lib::Protobuf::EdaDataFile_NetRecord >* EdaDataFile::mutable_netrecordsbyname() { - // @@protoc_insertion_point(field_mutable_map:odbdesign.proto.EdaDataFile.netRecordsByName) + // @@protoc_insertion_point(field_mutable_map:Odb.Lib.Protobuf.EdaDataFile.netRecordsByName) return _internal_mutable_netrecordsbyname(); } -// repeated .odbdesign.proto.EdaDataFile.PackageRecord packageRecords = 9; +// repeated .Odb.Lib.Protobuf.EdaDataFile.PackageRecord packageRecords = 9; inline int EdaDataFile::_internal_packagerecords_size() const { return _impl_.packagerecords_.size(); } @@ -4478,37 +4481,37 @@ inline int EdaDataFile::packagerecords_size() const { inline void EdaDataFile::clear_packagerecords() { _impl_.packagerecords_.Clear(); } -inline ::odbdesign::proto::EdaDataFile_PackageRecord* EdaDataFile::mutable_packagerecords(int index) { - // @@protoc_insertion_point(field_mutable:odbdesign.proto.EdaDataFile.packageRecords) +inline ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord* EdaDataFile::mutable_packagerecords(int index) { + // @@protoc_insertion_point(field_mutable:Odb.Lib.Protobuf.EdaDataFile.packageRecords) return _impl_.packagerecords_.Mutable(index); } -inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_PackageRecord >* +inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord >* EdaDataFile::mutable_packagerecords() { - // @@protoc_insertion_point(field_mutable_list:odbdesign.proto.EdaDataFile.packageRecords) + // @@protoc_insertion_point(field_mutable_list:Odb.Lib.Protobuf.EdaDataFile.packageRecords) return &_impl_.packagerecords_; } -inline const ::odbdesign::proto::EdaDataFile_PackageRecord& EdaDataFile::_internal_packagerecords(int index) const { +inline const ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord& EdaDataFile::_internal_packagerecords(int index) const { return _impl_.packagerecords_.Get(index); } -inline const ::odbdesign::proto::EdaDataFile_PackageRecord& EdaDataFile::packagerecords(int index) const { - // @@protoc_insertion_point(field_get:odbdesign.proto.EdaDataFile.packageRecords) +inline const ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord& EdaDataFile::packagerecords(int index) const { + // @@protoc_insertion_point(field_get:Odb.Lib.Protobuf.EdaDataFile.packageRecords) return _internal_packagerecords(index); } -inline ::odbdesign::proto::EdaDataFile_PackageRecord* EdaDataFile::_internal_add_packagerecords() { +inline ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord* EdaDataFile::_internal_add_packagerecords() { return _impl_.packagerecords_.Add(); } -inline ::odbdesign::proto::EdaDataFile_PackageRecord* EdaDataFile::add_packagerecords() { - ::odbdesign::proto::EdaDataFile_PackageRecord* _add = _internal_add_packagerecords(); - // @@protoc_insertion_point(field_add:odbdesign.proto.EdaDataFile.packageRecords) +inline ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord* EdaDataFile::add_packagerecords() { + ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord* _add = _internal_add_packagerecords(); + // @@protoc_insertion_point(field_add:Odb.Lib.Protobuf.EdaDataFile.packageRecords) return _add; } -inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::odbdesign::proto::EdaDataFile_PackageRecord >& +inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord >& EdaDataFile::packagerecords() const { - // @@protoc_insertion_point(field_list:odbdesign.proto.EdaDataFile.packageRecords) + // @@protoc_insertion_point(field_list:Odb.Lib.Protobuf.EdaDataFile.packageRecords) return _impl_.packagerecords_; } -// map packageRecordsByName = 10; +// map packageRecordsByName = 10; inline int EdaDataFile::_internal_packagerecordsbyname_size() const { return _impl_.packagerecordsbyname_.size(); } @@ -4518,22 +4521,22 @@ inline int EdaDataFile::packagerecordsbyname_size() const { inline void EdaDataFile::clear_packagerecordsbyname() { _impl_.packagerecordsbyname_.Clear(); } -inline const ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::odbdesign::proto::EdaDataFile_PackageRecord >& +inline const ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord >& EdaDataFile::_internal_packagerecordsbyname() const { return _impl_.packagerecordsbyname_.GetMap(); } -inline const ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::odbdesign::proto::EdaDataFile_PackageRecord >& +inline const ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord >& EdaDataFile::packagerecordsbyname() const { - // @@protoc_insertion_point(field_map:odbdesign.proto.EdaDataFile.packageRecordsByName) + // @@protoc_insertion_point(field_map:Odb.Lib.Protobuf.EdaDataFile.packageRecordsByName) return _internal_packagerecordsbyname(); } -inline ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::odbdesign::proto::EdaDataFile_PackageRecord >* +inline ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord >* EdaDataFile::_internal_mutable_packagerecordsbyname() { return _impl_.packagerecordsbyname_.MutableMap(); } -inline ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::odbdesign::proto::EdaDataFile_PackageRecord >* +inline ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord >* EdaDataFile::mutable_packagerecordsbyname() { - // @@protoc_insertion_point(field_mutable_map:odbdesign.proto.EdaDataFile.packageRecordsByName) + // @@protoc_insertion_point(field_mutable_map:Odb.Lib.Protobuf.EdaDataFile.packageRecordsByName) return _internal_mutable_packagerecordsbyname(); } @@ -4561,50 +4564,51 @@ EdaDataFile::mutable_packagerecordsbyname() { // @@protoc_insertion_point(namespace_scope) -} // namespace proto -} // namespace odbdesign +} // namespace Protobuf +} // namespace Lib +} // namespace Odb PROTOBUF_NAMESPACE_OPEN -template <> struct is_proto_enum< ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord_Type> : ::std::true_type {}; +template <> struct is_proto_enum< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord_Type> : ::std::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord_Type>() { - return ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord_Type_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord_Type>() { + return ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FeatureIdRecord_Type_descriptor(); } -template <> struct is_proto_enum< ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_Type> : ::std::true_type {}; +template <> struct is_proto_enum< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_Type> : ::std::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_Type>() { - return ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_Type_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_Type>() { + return ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_Type_descriptor(); } -template <> struct is_proto_enum< ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FillType> : ::std::true_type {}; +template <> struct is_proto_enum< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FillType> : ::std::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FillType>() { - return ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_FillType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FillType>() { + return ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_FillType_descriptor(); } -template <> struct is_proto_enum< ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_CutoutType> : ::std::true_type {}; +template <> struct is_proto_enum< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_CutoutType> : ::std::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_CutoutType>() { - return ::odbdesign::proto::EdaDataFile_NetRecord_SubnetRecord_CutoutType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_CutoutType>() { + return ::Odb::Lib::Protobuf::EdaDataFile_NetRecord_SubnetRecord_CutoutType_descriptor(); } -template <> struct is_proto_enum< ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_Type> : ::std::true_type {}; +template <> struct is_proto_enum< ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_Type> : ::std::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_Type>() { - return ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_Type_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_Type>() { + return ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_Type_descriptor(); } -template <> struct is_proto_enum< ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_ElectricalType> : ::std::true_type {}; +template <> struct is_proto_enum< ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_ElectricalType> : ::std::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_ElectricalType>() { - return ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_ElectricalType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_ElectricalType>() { + return ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_ElectricalType_descriptor(); } -template <> struct is_proto_enum< ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_MountType> : ::std::true_type {}; +template <> struct is_proto_enum< ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_MountType> : ::std::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_MountType>() { - return ::odbdesign::proto::EdaDataFile_PackageRecord_PinRecord_MountType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_MountType>() { + return ::Odb::Lib::Protobuf::EdaDataFile_PackageRecord_PinRecord_MountType_descriptor(); } -template <> struct is_proto_enum< ::odbdesign::proto::EdaDataFile_BoardSide> : ::std::true_type {}; +template <> struct is_proto_enum< ::Odb::Lib::Protobuf::EdaDataFile_BoardSide> : ::std::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::odbdesign::proto::EdaDataFile_BoardSide>() { - return ::odbdesign::proto::EdaDataFile_BoardSide_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::Odb::Lib::Protobuf::EdaDataFile_BoardSide>() { + return ::Odb::Lib::Protobuf::EdaDataFile_BoardSide_descriptor(); } PROTOBUF_NAMESPACE_CLOSE diff --git a/OdbDesignLib/protoc/edadatafile.proto b/OdbDesignLib/protoc/edadatafile.proto index eb1f5816..e4c45cab 100644 --- a/OdbDesignLib/protoc/edadatafile.proto +++ b/OdbDesignLib/protoc/edadatafile.proto @@ -1,6 +1,9 @@ syntax = "proto3"; -package odbdesign.proto; +//// https://protobuf.dev/reference/cpp/cpp-generated/#message +//option optimize_for = CODE_SIZE; + +package Odb.Lib.Protobuf; // // EdaDataFile.h diff --git a/OdbDesignServer/CMakeLists.txt b/OdbDesignServer/CMakeLists.txt index 1b952483..f904470f 100644 --- a/OdbDesignServer/CMakeLists.txt +++ b/OdbDesignServer/CMakeLists.txt @@ -3,44 +3,14 @@ add_executable(OdbDesignServer "main.cpp" "Controllers/HelloWorldController.h" "Controllers/HelloWorldController.cpp" "OdbDesignServerApp.h" "OdbDesignServerApp.cpp" "Controllers/StepsEdaDataController.cpp" "Controllers/StepsEdaDataController.h" "OdbDesignServer.h" ) -target_compile_options(OdbDesignServer PRIVATE - $<$,$,$>: - -Wall> - $<$: - /wd4250>) - -# link to zlib (required for Crow HTTP compression) -find_package(ZLIB REQUIRED) -target_link_libraries(OdbDesignServer PRIVATE ZLIB::ZLIB) - # link to Crow -add_compile_definitions(CROW_ENABLE_COMPRESSION) find_package(Crow CONFIG REQUIRED) target_link_libraries(OdbDesignServer PRIVATE Crow::Crow) +# link to OdbDesign library +target_link_libraries(OdbDesignServer PRIVATE OdbDesign) + # workaround to remove error: "C++ command-line error: invalid macro definition: _CROW_ICD-NOTFOUND" # (see https://github.com/CrowCpp/Crow/issues/661#issuecomment-1702544225) list(REMOVE_ITEM _CROW_ICD "_CROW_ICD-NOTFOUND") set_target_properties(Crow::Crow PROPERTIES INTERFACE_COMPILE_DEFINITIONS "${_CROW_ICD}") - -# link to OdbDesign library -target_link_libraries(OdbDesignServer PRIVATE OdbDesign) - -if (NOT CI) - # TODO: add POST_BUILD commands for Linux (dest. directory will be ${CMAKE_CURRENT_BINARY_DIR}) - # copy templates directory to output directory - add_custom_command( - TARGET OdbDesignServer POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_directory - ${CMAKE_SOURCE_DIR}/OdbDesignServer/templates - #${CMAKE_CURRENT_BINARY_DIR}/templates) - ${PROJECT_BINARY_DIR}/templates) - - # copy designs directory to output directory - add_custom_command( - TARGET OdbDesignServer POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_directory - ${CMAKE_SOURCE_DIR}/OdbDesignServer/designs - #${CMAKE_CURRENT_BINARY_DIR}/designs) - ${PROJECT_BINARY_DIR}/designs) -endif() diff --git a/OdbDesignServer/Controllers/HelloWorldController.cpp b/OdbDesignServer/Controllers/HelloWorldController.cpp index 32f7da10..30d81207 100644 --- a/OdbDesignServer/Controllers/HelloWorldController.cpp +++ b/OdbDesignServer/Controllers/HelloWorldController.cpp @@ -1,6 +1,7 @@ #include "HelloWorldController.h" #include "../OdbDesignServerApp.h" +using namespace Odb::Lib; namespace Odb::App::Server { diff --git a/OdbDesignServer/Controllers/HelloWorldController.h b/OdbDesignServer/Controllers/HelloWorldController.h index 84263621..5fd94c08 100644 --- a/OdbDesignServer/Controllers/HelloWorldController.h +++ b/OdbDesignServer/Controllers/HelloWorldController.h @@ -3,14 +3,13 @@ #include "RouteController.h" #include "IOdbServerApp.h" -using namespace Odb::Lib; namespace Odb::App::Server { - class HelloWorldController : public RouteController + class HelloWorldController : public Odb::Lib::RouteController { public: - HelloWorldController(IOdbServerApp& serverApp); + HelloWorldController(Odb::Lib::IOdbServerApp& serverApp); void register_routes() override; diff --git a/OdbDesignServer/Controllers/StepsEdaDataController.h b/OdbDesignServer/Controllers/StepsEdaDataController.h index e24b8685..ae2815a3 100644 --- a/OdbDesignServer/Controllers/StepsEdaDataController.h +++ b/OdbDesignServer/Controllers/StepsEdaDataController.h @@ -4,14 +4,13 @@ #include "crow_win.h" #include "IOdbServerApp.h" -using namespace Odb::Lib; namespace Odb::App::Server { - class StepsEdaDataController : public RouteController + class StepsEdaDataController : public Odb::Lib::RouteController { public: - StepsEdaDataController(IOdbServerApp& serverApp); + StepsEdaDataController(Odb::Lib::IOdbServerApp& serverApp); void register_routes() override; diff --git a/OdbDesignServer/OdbDesignServerApp.h b/OdbDesignServer/OdbDesignServerApp.h index ae05e929..54e5fde9 100644 --- a/OdbDesignServer/OdbDesignServerApp.h +++ b/OdbDesignServer/OdbDesignServerApp.h @@ -3,11 +3,10 @@ #include "OdbDesignServer.h" #include "OdbServerAppBase.h" -using namespace Odb::Lib; namespace Odb::App::Server { - class OdbDesignServerApp : public OdbServerAppBase + class OdbDesignServerApp : public Odb::Lib::OdbServerAppBase { public: OdbDesignServerApp(int argc, char* argv[]); diff --git a/Utils/CommandLineArgs.cpp b/Utils/CommandLineArgs.cpp index 2cb9d4ce..7ef3a725 100644 --- a/Utils/CommandLineArgs.cpp +++ b/Utils/CommandLineArgs.cpp @@ -1,4 +1,11 @@ #include "CommandLineArgs.h" +#include "CommandLineArgs.h" +#include "CommandLineArgs.h" +#include "CommandLineArgs.h" +#include +#include +#include "str_trim.h" +#include namespace Utils @@ -10,10 +17,93 @@ namespace Utils { m_vecArguments.push_back(argv[i]); } + parse(); } CommandLineArgs::CommandLineArgs(const std::vector& vecArgv) : m_vecArguments(vecArgv) { + parse(); + } + + bool CommandLineArgs::boolArg(const std::string& name) const + { + auto strB = getArgValue(name); + if (strB.length() == 0) throw std::invalid_argument("Argument not found: " + name); + bool b; + std::istringstream(strB) >> std::boolalpha >> b; + return b; + } + + std::string CommandLineArgs::stringArg(const std::string& name) const + { + return getArgValue(name); + } + + int CommandLineArgs::intArg(const std::string& name) const + { + auto strI = getArgValue(name); + if (strI.length() == 0) throw std::invalid_argument("Argument not found: " + name); + return std::stoi(strI); + } + + double CommandLineArgs::doubleArg(const std::string& name) const + { + auto strD = getArgValue(name); + if (strD.length() == 0) throw std::invalid_argument("Argument not found: " + name); + return std::stod(strD); + } + + std::string CommandLineArgs::getArgValue(const std::string& name) const + { + auto findIt = m_mapArguments.find(name); + if (findIt == m_mapArguments.end()) return ""; + return findIt->second; + } + + void Utils::CommandLineArgs::parse() + { + for (std::size_t i = 0; i < m_vecArguments.size(); i++) + { + auto& arg = m_vecArguments[i]; + if (arg.length() > 0) + { + if (arg[0] == '-' || arg[0] == '/') + { + Utils::str_ltrim(arg, '-'); + Utils::str_ltrim(arg, '/'); + + std::string nextArg; + if (i + 1 < m_vecArguments.size()) + { + nextArg = m_vecArguments[i + 1]; + } + + if (nextArg.length() > 0 && + nextArg[0] != '-' && + nextArg[0] != '/') + { + m_mapArguments[arg] = nextArg; + i++; + } + else + { + m_mapArguments[arg] = "true"; + } + + //if (i + 1 < m_vecArguments.size() && + // m_vecArguments[i + 1].length() > 0 && + // (m_vecArguments[i + 1][0] != '-' || m_vecArguments[i + 1][0] != '/')) + //{ + // + // m_mapArguments[arg] = m_vecArguments[i+++1]; + //} + //else + //{ + // m_mapArguments[arg] = "true"; + //} + } + } + } } } \ No newline at end of file diff --git a/Utils/CommandLineArgs.h b/Utils/CommandLineArgs.h index 322d1879..ed9b1e81 100644 --- a/Utils/CommandLineArgs.h +++ b/Utils/CommandLineArgs.h @@ -3,6 +3,8 @@ #include #include #include "utils_export.h" +#include +#include namespace Utils @@ -13,8 +15,18 @@ namespace Utils CommandLineArgs(int argc, char* argv[]); CommandLineArgs(const std::vector& vecArgv); + bool boolArg(const std::string& name) const; + std::string stringArg(const std::string& name) const; + int intArg(const std::string& name) const; + double doubleArg(const std::string& name) const; + protected: std::vector m_vecArguments; + std::map m_mapArguments; + + std::string getArgValue(const std::string& name) const; - }; + void parse(); + + }; } diff --git a/Utils/Logger.cpp b/Utils/Logger.cpp index 56c31af8..d434c77e 100644 --- a/Utils/Logger.cpp +++ b/Utils/Logger.cpp @@ -17,7 +17,7 @@ namespace Utils { } - inline Logger* Logger::instance() + /*static*/ Logger* Logger::instance() { if (_instance == nullptr) { @@ -28,8 +28,8 @@ namespace Utils /*static*/ Logger* Logger::_instance = nullptr; - inline Logger::Level Logger::logLevel() const { return m_level; } - inline void Logger::logLevel(Logger::Level level) { m_level = level; } + Logger::Level Logger::logLevel() const { return m_level; } + void Logger::logLevel(Logger::Level level) { m_level = level; } void Logger::log(Level level, const std::string& message, const std::string& file, int line) { diff --git a/Utils/Logger.h b/Utils/Logger.h index 80adc409..fb3a0e75 100644 --- a/Utils/Logger.h +++ b/Utils/Logger.h @@ -4,9 +4,6 @@ #include #include "utils_export.h" -using namespace std::chrono; - - namespace Utils { @@ -42,7 +39,7 @@ namespace Utils { std::string message; Level level; - system_clock::time_point timeStamp; + std::chrono::system_clock::time_point timeStamp; std::string file; int line; diff --git a/Utils/bin2ascii.h b/Utils/bin2ascii.h index cc1692b8..b429cb3a 100644 --- a/Utils/bin2ascii.h +++ b/Utils/bin2ascii.h @@ -2,7 +2,7 @@ #include #include -#include "export.h" +#include "utils_export.h" // adapted from https://github.com/yinqiwen/pbjson/blob/5cb78413cb4d223e26a8c89d424b8c0623b79832/src/bin2ascii.h diff --git a/Utils/str_trim.cpp b/Utils/str_trim.cpp index c20c6e59..807683e1 100644 --- a/Utils/str_trim.cpp +++ b/Utils/str_trim.cpp @@ -34,6 +34,33 @@ namespace Utils return str_ltrim(str_rtrim(s)); } + std::string& str_ltrim(std::string& s, char toRemove) + { + auto it = std::find_if(s.begin(), s.end(), + [toRemove](char c) { + return c != toRemove; + }); + s.erase(s.begin(), it); + return s; + } + + // trim from end (in place) + std::string& str_rtrim(std::string& s, char toRemove) + { + auto it = std::find_if(s.rbegin(), s.rend(), + [toRemove](char c) { + return !std::isspace(c); + }); + s.erase(it.base(), s.end()); + return s; + } + + // trim from both ends (in place) + std::string& str_trim(std::string& s, char toRemove) + { + return str_ltrim(str_rtrim(s, toRemove), toRemove); + } + // trim from start (copying) std::string str_ltrim_copy(std::string s) { @@ -54,4 +81,24 @@ namespace Utils auto copy(s); return str_trim(copy); } + + std::string str_ltrim_copy(std::string s, char toRemove) + { + auto copy(s); + return str_ltrim(copy, toRemove); + } + + // trim from end (copying) + std::string str_rtrim_copy(std::string s, char toRemove) + { + auto copy(s); + return str_rtrim(copy, toRemove); + } + + // trim from both ends (copying) + std::string str_trim_copy(std::string s, char toRemove) + { + auto copy(s); + return str_trim(copy, toRemove); + } } diff --git a/Utils/str_trim.h b/Utils/str_trim.h index b85f4809..9f23481f 100644 --- a/Utils/str_trim.h +++ b/Utils/str_trim.h @@ -13,10 +13,22 @@ namespace Utils // trim from both ends (in place) UTILS_EXPORT std::string& str_trim(std::string& s); + UTILS_EXPORT std::string& str_ltrim(std::string& s, char toRemove); + // trim from end (in place) + UTILS_EXPORT std::string& str_rtrim(std::string& s, char toRemove); + // trim from both ends (in place) + UTILS_EXPORT std::string& str_trim(std::string& s, char toRemove); + // trim from start (copying) UTILS_EXPORT std::string str_ltrim_copy(std::string s); // trim from end (copying) UTILS_EXPORT std::string str_rtrim_copy(std::string s); // trim from both ends (copying) UTILS_EXPORT std::string str_trim_copy(std::string s); + + UTILS_EXPORT std::string str_ltrim_copy(std::string s, char toRemove); + // trim from end (copying) + UTILS_EXPORT std::string str_rtrim_copy(std::string s, char toRemove); + // trim from both ends (copying) + UTILS_EXPORT std::string str_trim_copy(std::string s, char toRemove); } \ No newline at end of file diff --git a/Utils/timestamp.h b/Utils/timestamp.h index be0f25cc..13a6889f 100644 --- a/Utils/timestamp.h +++ b/Utils/timestamp.h @@ -8,13 +8,11 @@ #include #include "utils_export.h" -using namespace std::chrono; - namespace Utils { - std::string UTILS_EXPORT make_timestamp(const system_clock::time_point& timepoint); + std::string UTILS_EXPORT make_timestamp(const std::chrono::system_clock::time_point& timepoint); std::string UTILS_EXPORT make_timestamp(); - system_clock::time_point UTILS_EXPORT parse_timestamp(const std::string& timestamp, const std::string& format); + std::chrono::system_clock::time_point UTILS_EXPORT parse_timestamp(const std::string& timestamp, const std::string& format); } diff --git a/docs/README.md b/docs/README.md index 1a5eec0f..6d6efb83 100644 --- a/docs/README.md +++ b/docs/README.md @@ -34,6 +34,26 @@ The diagram describes the current state of parser implementation and data availa ![image](https://github.com/nam20485/OdbDesign/assets/1829396/d92b77f1-7edc-4c90-b6df-21cea3ee92fe) +### CI/CD Build Statuses + +#### Branches + +##### `development` + +| | | | +|-|-|-| +| Build | | [![CMake Build Multi-Platform](https://github.com/nam20485/OdbDesign/actions/workflows/cmake-multi-platform.yml/badge.svg?branch=development)](https://github.com/nam20485/OdbDesign/actions/workflows/cmake-multi-platform.yml) | +| Code Scan | | [![CodeQL](https://github.com/nam20485/OdbDesign/actions/workflows/codeql.yml/badge.svg?branch=development)](https://github.com/nam20485/OdbDesign/actions/workflows/codeql.yml) | +| Docker | | [![Docker Publish](https://github.com/nam20485/OdbDesign/actions/workflows/docker-publish.yml/badge.svg?branch=development)](https://github.com/nam20485/OdbDesign/actions/workflows/docker-publish.yml) | + +##### `main` + +| | | | +|-|-|-| +| Build | | [![CMake Build Multi-Platform](https://github.com/nam20485/OdbDesign/actions/workflows/cmake-multi-platform.yml/badge.svg?branch=main)](https://github.com/nam20485/OdbDesign/actions/workflows/cmake-multi-platform.yml) | +| Code Scan | | [![CodeQL](https://github.com/nam20485/OdbDesign/actions/workflows/codeql.yml/badge.svg?branch=main)](https://github.com/nam20485/OdbDesign/actions/workflows/codeql.yml) | +| Docker | | [![Docker Publish](https://github.com/nam20485/OdbDesign/actions/workflows/docker-publish.yml/badge.svg?branch=main)](https://github.com/nam20485/OdbDesign/actions/workflows/docker-publish.yml) | + ### Architecture ## Building from Source @@ -56,7 +76,9 @@ The diagram describes the current state of parser implementation and data availa Get the source code by cloning the GitHub repository: -```$ git clone git@github.com:nam20485/OdbDesign.git``` +```Bash +$ git clone git@github.com:nam20485/OdbDesign.git +``` ### Build diff --git a/scripts/compile-protobuf.ps1 b/scripts/compile-protobuf.ps1 index e053e9db..4357fb14 100644 --- a/scripts/compile-protobuf.ps1 +++ b/scripts/compile-protobuf.ps1 @@ -1,3 +1,3 @@ $PROTOC = 'C:\Source\github\nam20485\OdbDesign\out\build\x64-debug\vcpkg_installed\x64-windows\tools\protobuf\protoc' -. $PROTOC --cpp_out=../proto *.proto +. $PROTOC --cpp_out=../proto --error_format=msvs *.proto diff --git a/scripts/patch-vcpkg-install.ps1 b/scripts/patch-vcpkg-install.ps1 new file mode 100644 index 00000000..bd86cf0c --- /dev/null +++ b/scripts/patch-vcpkg-install.ps1 @@ -0,0 +1,17 @@ +# +# patch-vcpkg-install.ps1 +# + +# have to patch the vcpkg install by copying this file over its counterpart because the vcpkg version +# included with VS has a defect in it (fixed in a preview version, but not in a released version yet) + +# see vcpkg GitHub issue #33506 and comment with workaround: +# https://github.com/microsoft/vcpkg/issues/33506#issuecomment-1704949644 + +$msys_path = "$env:VCPKG_ROOT\scripts\msys" +If (!(Test-Path -PathType container $msys_path)) +{ + New-Item -ItemType Directory -Path $msys_path -Verbose +} + +Copy-Item -Force -Verbose scripts\patch\compile_wrapper_consider_clang-cl.patch "$msys_path\compile_wrapper_consider_clang-cl.patch" diff --git a/scripts/patch/compile_wrapper_consider_clang-cl.patch b/scripts/patch/compile_wrapper_consider_clang-cl.patch new file mode 100644 index 00000000..c3666ecc --- /dev/null +++ b/scripts/patch/compile_wrapper_consider_clang-cl.patch @@ -0,0 +1,12 @@ +diff --git a/usr/share/automake-1.16/compile b/usr/share/automake-1.16/compile +index 2078fc833..dfc946593 100755 +--- a/usr/share/automake-1.16/compile ++++ b/usr/share/automake-1.16/compile +@@ -256,6 +256,7 @@ EOF + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ ++ clang-cl | *[/\\]clang-cl | clang-cl.exe | *[/\\]clang-cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; diff --git a/scripts/patch/mingw-w64-x86_64.cmake b/scripts/patch/mingw-w64-x86_64.cmake new file mode 100644 index 00000000..998ccdf6 --- /dev/null +++ b/scripts/patch/mingw-w64-x86_64.cmake @@ -0,0 +1,24 @@ +# Sample toolchain file for building for Windows from an Ubuntu Linux system. +# +# Typical usage: +# *) install cross compiler: `sudo apt-get install mingw-w64` +# *) cd build +# *) cmake -DCMAKE_TOOLCHAIN_FILE=~/mingw-w64-x86_64.cmake .. +# This is free and unencumbered software released into the public domain. + +set(CMAKE_SYSTEM_NAME Windows) +set(TOOLCHAIN_PREFIX x86_64-w64-mingw32) + +# cross compilers to use for C, C++ and Fortran +set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc) +set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++) +set(CMAKE_Fortran_COMPILER ${TOOLCHAIN_PREFIX}-gfortran) +set(CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres) + +# target environment on the build host system +set(CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX}) + +# modify default behavior of FIND_XXX() commands +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) \ No newline at end of file