cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13953 from lemenkov/gcc_12_strings_recognition

Browse Source 
Type recognition workaround for some GCC compilers
This commit is contained in:
Daniel 2023-02-08 19:36:02 +01:00 committed by GitHub
commit 7b35f44622
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libsolidity/ast/ASTJsonExporter.cpp
View File

@ -45,6 +45,7 @@
#include <range/v3/view/map.hpp> #include <range/v3/view/map.hpp>
using namespace std; using namespace std;
using namespace std::string_literals;
using namespace solidity::langutil; using namespace solidity::langutil;
namespace namespace
@ -138,7 +139,7 @@ Json::Value ASTJsonExporter::sourceLocationsToJson(vector<SourceLocation> const&
string ASTJsonExporter::namePathToString(std::vector<ASTString> const& _namePath) string ASTJsonExporter::namePathToString(std::vector<ASTString> const& _namePath)
{ {
return boost::algorithm::join(_namePath, "."); return boost::algorithm::join(_namePath, "."s);
} }
Json::Value ASTJsonExporter::typePointerToJson(Type const* _tp, bool _withoutDataLocation) Json::Value ASTJsonExporter::typePointerToJson(Type const* _tp, bool _withoutDataLocation)

2
libsolidity/codegen/ir/IRGeneratorForStatements.cpp
View File

@ -179,7 +179,7 @@ private:
else else
{ {
solAssert(!IRVariable{*varDecl}.hasPart("offset")); solAssert(!IRVariable{*varDecl}.hasPart("offset"));
value = "0"; value = "0"s;
} }
} }
else if (varDecl->type()->dataStoredIn(DataLocation::CallData)) else if (varDecl->type()->dataStoredIn(DataLocation::CallData))