Fix compilation in OSX

codereader · Apr 25, 2020 · 98d4a7f · 98d4a7f
1 parent c652a7f
commit 98d4a7f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/radiant/map/algorithm/Import.cpp b/radiant/map/algorithm/Import.cpp
@@ -307,7 +307,7 @@ class SimpleMapImportFilter :
 
 public:
     SimpleMapImportFilter() :
-        _root(new scene::BasicRootNode)
+        _root(std::make_shared<scene::BasicRootNode>())
     {}
 
     const scene::IMapRootNodePtr& getRootNode() const

diff --git a/radiant/map/format/portable/PortableMapReader.cpp b/radiant/map/format/portable/PortableMapReader.cpp
@@ -472,10 +472,10 @@ bool PortableMapReader::CanLoad(std::istream& stream)
 	// certain signature parts.
 	// This will fail if the XML is oddly formatted with e.g. line-breaks
 	std::string buffer(512, '\0');
-
+	
 	for (int i = 0; i < 25; ++i)
 	{
-		stream.getline(buffer.data(), buffer.length());
+        std::getline(stream, buffer);
 
 		// Check if the format="portable" string is occurring somewhere
 		std::regex pattern(R"(<map[^>]+format=\"portable\")");

diff --git a/radiant/selection/selectionset/SelectionSetToolmenu.cpp b/radiant/selection/selectionset/SelectionSetToolmenu.cpp
@@ -65,8 +65,8 @@ SelectionSetToolmenu::SelectionSetToolmenu() :
 	// where the label and combobox are supposed to be
 	label->Hide();
 	label->Show();
-	_toolMenu->Hide();
-	_toolMenu->Show();
+	_dropdown->Hide();
+	_dropdown->Show();
 #endif
 
 	_mapEventHandler = GlobalMapModule().signal_mapEvent().connect(