Make GCC much more happier

ryzom · Feb 22, 2023 · 0f1ddfc · 0f1ddfc
1 parent d587e8e
commit 0f1ddfc
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 20 deletions.
diff --git a/ryzom/server/src/ai_service/script_parser_lex.cpp b/ryzom/server/src/ai_service/script_parser_lex.cpp
@@ -4758,9 +4758,9 @@ case YY_STATE_EOF(INITIAL):
 
 static int yy_get_next_buffer()
 	{
-	register char *dest = yy_current_buffer->yy_ch_buf;
-	register char *source = yytext_ptr;
-	register int number_to_move, i;
+	NL_REGISTER char *dest = yy_current_buffer->yy_ch_buf;
+	NL_REGISTER char *source = yytext_ptr;
+	NL_REGISTER int number_to_move, i;
 	int ret_val;
 
 	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
@@ -4890,8 +4890,8 @@ static int yy_get_next_buffer()
 
 static yy_state_type yy_get_previous_state()
 	{
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
+	NL_REGISTER yy_state_type yy_current_state;
+	NL_REGISTER char *yy_cp;
 
 	yy_current_state = yy_start;
 	yy_current_state += YY_AT_BOL();
@@ -4928,8 +4928,8 @@ static yy_state_type yy_try_NUL_trans( yy_current_state )
 yy_state_type yy_current_state;
 #endif
 	{
-	register int yy_is_jam;
-	register char *yy_cp = yy_c_buf_p;
+	NL_REGISTER int yy_is_jam;
+	NL_REGISTER char *yy_cp = yy_c_buf_p;
 
 	yy_current_state = yy_NUL_trans[yy_current_state];
 	yy_is_jam = (yy_current_state == 0);
@@ -4949,25 +4949,25 @@ yy_state_type yy_current_state;
 
 #ifndef YY_NO_UNPUT
 #ifdef YY_USE_PROTOS
-static void yyunput( int c, register char *yy_bp )
+static void yyunput( int c, NL_REGISTER char *yy_bp )
 #else
 static void yyunput( c, yy_bp )
 int c;
-register char *yy_bp;
+NL_REGISTER char *yy_bp;
 #endif
 	{
-	register char *yy_cp = yy_c_buf_p;
+	NL_REGISTER char *yy_cp = yy_c_buf_p;
 
 	/* undo effects of setting up yytext */
 	*yy_cp = yy_hold_char;
 
 	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
 		{ /* need to shift things up to make room */
 		/* +2 for EOB chars. */
-		register int number_to_move = yy_n_chars + 2;
-		register char *dest = &yy_current_buffer->yy_ch_buf[
+		NL_REGISTER int number_to_move = yy_n_chars + 2;
+		NL_REGISTER char *dest = &yy_current_buffer->yy_ch_buf[
 					yy_current_buffer->yy_buf_size + 2];
-		register char *source =
+		NL_REGISTER char *source =
 				&yy_current_buffer->yy_ch_buf[number_to_move];
 
 		while ( source > yy_current_buffer->yy_ch_buf )
@@ -5429,7 +5429,7 @@ yyconst char *s2;
 int n;
 #endif
 	{
-	register int i;
+	NL_REGISTER int i;
 	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
 	}
@@ -5443,7 +5443,7 @@ static int yy_flex_strlen( s )
 yyconst char *s;
 #endif
 	{
-	register int n;
+	NL_REGISTER int n;
 	for ( n = 0; s[n]; ++n )
 		;
 

diff --git a/ryzom/server/src/frontend_service/module_manager.h b/ryzom/server/src/frontend_service/module_manager.h
@@ -99,11 +99,9 @@ class CModuleManager : public NLMISC::IRunnable
 	//@}
 
 private:
-	/// Constructor. WARNING, never create module manager from another manager !!
-	CModuleManager(const CModuleManager &mod) { nlerror("FEMMAN: forbidden constructor used!"); }
-
 	/// WARNING, never initialize module manager from another manager !!
-	CModuleManager	& operator = (const CModuleManager &mod) { nlerror("FEMMAN: forbidden operator = used!");}
+	CModuleManager(const CModuleManager &mod) = delete;
+	CModuleManager &operator=(const CModuleManager &mod) = delete;
 
 public:
 

diff --git a/ryzom/server/src/frontend_service/quic_transceiver.cpp b/ryzom/server/src/frontend_service/quic_transceiver.cpp
@@ -530,6 +530,8 @@ void CQuicTransceiver::shutdown(CQuicUserContext *user)
 
 #else
 
+#define null nullptr
+
 using namespace NLMISC;
 using namespace NLNET;
 
@@ -549,14 +551,22 @@ CQuicTransceiver::~CQuicTransceiver()
 {
 }
 
-void CQuicTransceiver::start()
+void CQuicTransceiver::start(uint16 port)
 {
 }
 
 void CQuicTransceiver::stop()
 {
 }
 
+CQuicUserContext::CQuicUserContext()
+{
+}
+
+CQuicUserContext::~CQuicUserContext()
+{
+}
+
 CInetAddress CQuicTransceiver::generateTokenAddr()
 {
 	return CInetAddress(false);