summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>2023-05-11 09:44:28 +0000
committervboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>2023-05-11 09:44:28 +0000
commita7b416cb0a29955b896e9babb46dcb69a2c34754 (patch)
tree7e1f78719fce84bfee5f58217aed8a9dc5393a21
parent00709f54cd8de15385e59b5c805a0444dbf0b818 (diff)
downloadVirtualBox-svn-a7b416cb0a29955b896e9babb46dcb69a2c34754.tar.gz
Main: More Clang 13 build fixes (warnings as errors) [build fix, no IPRT stuff within libs/xpcom].
git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@99742 cfe28804-0f27-0410-a406-dd0f0b0b656f
-rw-r--r--src/VBox/Main/Makefile.kmk1
-rw-r--r--src/VBox/Main/testcase/Makefile.kmk1
-rw-r--r--src/libs/xpcom18a4/xpcom/string/public/nsTDependentSubstring.h3
-rw-r--r--src/libs/xpcom18a4/xpcom/string/public/nsTPromiseFlatString.h4
4 files changed, 2 insertions, 7 deletions
diff --git a/src/VBox/Main/Makefile.kmk b/src/VBox/Main/Makefile.kmk
index d52ef4f7fc8..4a74e54af8a 100644
--- a/src/VBox/Main/Makefile.kmk
+++ b/src/VBox/Main/Makefile.kmk
@@ -980,6 +980,7 @@ if !defined(VBOX_ONLY_SDK) && !defined(VBOX_ONLY_EXTPACKS) # Note this goes on f
$$(VBoxSVCM_0_OUTDIR)/VBoxSVCM.def:
$(RM) -f $@
$(APPEND) $@ _NSGetModule
+ VBoxSVCM_CXXFLAGS += -Wno-deprecated-copy # To shut up Clang 13 (-Wdeprecated-copy).
endif
VBoxSVCM_INTERMEDIATES += $(VBOX_IDL_HEADER.XPCOM)
diff --git a/src/VBox/Main/testcase/Makefile.kmk b/src/VBox/Main/testcase/Makefile.kmk
index 51f082c0aa5..c4f0b4c460a 100644
--- a/src/VBox/Main/testcase/Makefile.kmk
+++ b/src/VBox/Main/testcase/Makefile.kmk
@@ -144,6 +144,7 @@ tstVBoxAPIXPCOM_LIBS = \
$(LIB_XPCOM) \
$(LIB_RUNTIME)
tstVBoxAPIXPCOM_CXXFLAGS = -fshort-wchar
+tstVBoxAPIXPCOM_CXXFLAGS.darwin += -Wno-deprecated-copy # To shut up Clang 13 (-Wdeprecated-copy).
ifdef VBOX_WITH_RUNPATH
tstVBoxAPIXPCOM_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)' $(TEMPLATE_VBoxBldProg_LDFLAGS)
else ifdef VBOX_WITH_RELATIVE_RUNPATH
diff --git a/src/libs/xpcom18a4/xpcom/string/public/nsTDependentSubstring.h b/src/libs/xpcom18a4/xpcom/string/public/nsTDependentSubstring.h
index 1cc99bcf407..d9a7265283b 100644
--- a/src/libs/xpcom18a4/xpcom/string/public/nsTDependentSubstring.h
+++ b/src/libs/xpcom18a4/xpcom/string/public/nsTDependentSubstring.h
@@ -79,9 +79,6 @@ class nsTDependentSubstring_CharT : public nsTSubstring_CharT
: substring_type(NS_CONST_CAST(char_type*, start.get()), end.get() - start.get(), F_NONE) {}
// auto-generated copy-constructor OK (XXX really?? what about base class copy-ctor?)
-#if RT_CLANG_PREREQ(13, 0) /* To shut up Clang 13 (-Wdeprecated-copy). */
- nsTDependentSubstring_CharT(nsTDependentSubstring_CharT const&) = default;
-#endif
private:
// we're immutable, you can't assign into a substring
void operator=( const self_type& ) NS_DELETE;
diff --git a/src/libs/xpcom18a4/xpcom/string/public/nsTPromiseFlatString.h b/src/libs/xpcom18a4/xpcom/string/public/nsTPromiseFlatString.h
index 8494b82aabd..6899df7c261 100644
--- a/src/libs/xpcom18a4/xpcom/string/public/nsTPromiseFlatString.h
+++ b/src/libs/xpcom18a4/xpcom/string/public/nsTPromiseFlatString.h
@@ -132,10 +132,6 @@ class nsTPromiseFlatString_CharT : public nsTString_CharT
// into ourselves.
Assign(tuple);
}
-
-#if RT_CLANG_PREREQ(13, 0) /* To shut up Clang 13 (-Wdeprecated-copy). */
- nsTPromiseFlatString_CharT(nsTPromiseFlatString_CharT const&) = default;
-#endif
};
inline