diff options
| -rw-r--r-- | cmake/protobuf-config-version.cmake.in | 4 | ||||
| -rw-r--r-- | csharp/src/Google.Protobuf/Google.Protobuf.csproj | 2 | ||||
| -rw-r--r-- | src/google/protobuf/arena.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/cmake/protobuf-config-version.cmake.in b/cmake/protobuf-config-version.cmake.in index ca6da09a..3fa01763 100644 --- a/cmake/protobuf-config-version.cmake.in +++ b/cmake/protobuf-config-version.cmake.in @@ -49,9 +49,9 @@ _check_and_save_build_option(MSVC_STATIC_RUNTIME @protobuf_MSVC_STATIC_RUNTIME@) _check_and_save_build_option(BUILD_SHARED_LIBS @protobuf_BUILD_SHARED_LIBS@) # if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it: -if(NOT "${CMAKE_SIZEOF_VOID_P}" STREQUAL "" AND NOT "@CMAKE_SIZEOF_VOID_P@" STREQUAL "") +if(CMAKE_SIZEOF_VOID_P AND "@CMAKE_SIZEOF_VOID_P@") # check that the installed version has the same 32/64bit-ness as the one which is currently searching: - if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@CMAKE_SIZEOF_VOID_P@") + if(NOT CMAKE_SIZEOF_VOID_P EQUAL "@CMAKE_SIZEOF_VOID_P@") math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8") set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)") set(PACKAGE_VERSION_UNSUITABLE TRUE) diff --git a/csharp/src/Google.Protobuf/Google.Protobuf.csproj b/csharp/src/Google.Protobuf/Google.Protobuf.csproj index 1d21fdc5..4e63646b 100644 --- a/csharp/src/Google.Protobuf/Google.Protobuf.csproj +++ b/csharp/src/Google.Protobuf/Google.Protobuf.csproj @@ -6,7 +6,7 @@ <AssemblyTitle>Google Protocol Buffers</AssemblyTitle> <VersionPrefix>3.4.0</VersionPrefix> <Authors>Google Inc.</Authors> - <TargetFrameworks>netstandard1.0;net451</TargetFrameworks> + <TargetFrameworks>netstandard1.0;net45</TargetFrameworks> <GenerateDocumentationFile>true</GenerateDocumentationFile> <AssemblyOriginatorKeyFile>../../keys/Google.Protobuf.snk</AssemblyOriginatorKeyFile> <SignAssembly>true</SignAssembly> diff --git a/src/google/protobuf/arena.h b/src/google/protobuf/arena.h index f8a94705..78e8d902 100644 --- a/src/google/protobuf/arena.h +++ b/src/google/protobuf/arena.h @@ -853,7 +853,7 @@ class LIBPROTOBUF_EXPORT Arena { template <typename T> GOOGLE_ATTRIBUTE_ALWAYS_INLINE static ::google::protobuf::Arena* GetArenaInternal( - const T* value, google::protobuf::internal::false_type) { + const T* /* value */, google::protobuf::internal::false_type) { return NULL; } |