[ScryMUD] SVN Commit Info r865 - in trunk/mud: . grrmud/server lib/bitfield lib/containers lib/log lib/string2
scrymud at wanfear.com
scrymud at wanfear.com
Thu Feb 8 11:18:39 PST 2007
Author: eroper
Date: 2007-02-08 11:18:38 -0800 (Thu, 08 Feb 2007)
New Revision: 865
Modified:
trunk/mud/MakeInclude.bh
trunk/mud/grrmud/server/ServerConfig.h
trunk/mud/grrmud/server/SkillSpell.h
trunk/mud/grrmud/server/audit.cc
trunk/mud/grrmud/server/battle.cc
trunk/mud/grrmud/server/code_gen.cc
trunk/mud/grrmud/server/code_gen.h
trunk/mud/grrmud/server/command4.cc
trunk/mud/grrmud/server/command5.cc
trunk/mud/grrmud/server/commands.cc
trunk/mud/grrmud/server/grrmud.cc
trunk/mud/grrmud/server/load_wld.cc
trunk/mud/grrmud/server/misc.cc
trunk/mud/grrmud/server/obj_parse.cc
trunk/mud/grrmud/server/parse.cc
trunk/mud/grrmud/server/rm_parse.cc
trunk/mud/grrmud/server/room.cc
trunk/mud/grrmud/server/script.cc
trunk/mud/lib/bitfield/bitfield.cc
trunk/mud/lib/bitfield/bitfield.h
trunk/mud/lib/containers/rb_tree.cc
trunk/mud/lib/log/LogStream.h
trunk/mud/lib/log/Makefile
trunk/mud/lib/string2/string2.h
Log:
Removed -wno-warn-deprecated from the build and removed deprecated headers.
Modified: trunk/mud/MakeInclude.bh
===================================================================
--- trunk/mud/MakeInclude.bh 2007-02-08 09:25:12 UTC (rev 864)
+++ trunk/mud/MakeInclude.bh 2007-02-08 19:18:38 UTC (rev 865)
@@ -15,7 +15,7 @@
# NOTE: Use these variables if you are using EGCS and glibc 5
CCFLAGS = -g -D_GNU_SOURCE $(BG_NEW_GCC_TEMPLATES) $(GUIDING_DECLS) $(HUGE_OBJECTS) \
- -Wall -Wno-deprecated -I$(MUD_HOME)/include
+ -Wall -I$(MUD_HOME)/include
LDLIBS = -lm -lstring2 -lbitfield -lcrypt -lpcre#-lnsl # -lsocket
Modified: trunk/mud/grrmud/server/ServerConfig.h
===================================================================
--- trunk/mud/grrmud/server/ServerConfig.h 2007-02-08 09:25:12 UTC (rev 864)
+++ trunk/mud/grrmud/server/ServerConfig.h 2007-02-08 19:18:38 UTC (rev 865)
@@ -1,6 +1,6 @@
#ifndef __ServerConfig_h__
#define __ServerConfig_h__
-#include <fstream.h>
+#include <fstream>
#include <string.h>
#include <string2.h>
#include <stdlib.h>
Modified: trunk/mud/grrmud/server/SkillSpell.h
===================================================================
--- trunk/mud/grrmud/server/SkillSpell.h 2007-02-08 09:25:12 UTC (rev 864)
+++ trunk/mud/grrmud/server/SkillSpell.h 2007-02-08 19:18:38 UTC (rev 865)
@@ -30,7 +30,6 @@
#include <list2.h>
#include <string2.h>
-#include <iostream.h>
#include <rb_tree.h>
#include <PtrArray.h>
Modified: trunk/mud/grrmud/server/audit.cc
===================================================================
--- trunk/mud/grrmud/server/audit.cc 2007-02-08 09:25:12 UTC (rev 864)
+++ trunk/mud/grrmud/server/audit.cc 2007-02-08 19:18:38 UTC (rev 865)
@@ -38,7 +38,7 @@
*/
#include "audit.h"
-#include <iostream.h>
+#include <iostream>
#include <string.h>
#include <stdlib.h>
Modified: trunk/mud/grrmud/server/battle.cc
===================================================================
--- trunk/mud/grrmud/server/battle.cc 2007-02-08 09:25:12 UTC (rev 864)
+++ trunk/mud/grrmud/server/battle.cc 2007-02-08 19:18:38 UTC (rev 865)
@@ -30,8 +30,6 @@
#include "misc2.h"
#include "spec_prc.h"
#include <math.h>
-#include <iostream.h>
-#include <fstream.h>
#include "commands.h"
#include "command2.h"
#include "command3.h"
Modified: trunk/mud/grrmud/server/code_gen.cc
===================================================================
--- trunk/mud/grrmud/server/code_gen.cc 2007-02-08 09:25:12 UTC (rev 864)
+++ trunk/mud/grrmud/server/code_gen.cc 2007-02-08 19:18:38 UTC (rev 865)
@@ -28,7 +28,7 @@
#include <string2.h>
#include <string.h>
#include "code_gen.h"
-#include <fstream.h>
+#include <fstream>
#include <PtrArray.h>
LogStream mudlog("/tmp/code_gen.log", 65535);
Modified: trunk/mud/grrmud/server/code_gen.h
===================================================================
--- trunk/mud/grrmud/server/code_gen.h 2007-02-08 09:25:12 UTC (rev 864)
+++ trunk/mud/grrmud/server/code_gen.h 2007-02-08 19:18:38 UTC (rev 865)
@@ -27,7 +27,7 @@
#define __CODE_GEN_H__
#include <string2.h>
-#include <fstream.h>
+#include <fstream>
#include <list2.h>
#define ALIASES_ARRAY_LEN 50
Modified: trunk/mud/grrmud/server/command4.cc
===================================================================
--- trunk/mud/grrmud/server/command4.cc 2007-02-08 09:25:12 UTC (rev 864)
+++ trunk/mud/grrmud/server/command4.cc 2007-02-08 19:18:38 UTC (rev 865)
@@ -38,7 +38,6 @@
#include "spec_prc.h"
#include "spells.h"
#include "skills.h"
-#include <fstream.h>
#include <PtrArray.h>
#include "load_wld.h"
#include <time.h>
Modified: trunk/mud/grrmud/server/command5.cc
===================================================================
--- trunk/mud/grrmud/server/command5.cc 2007-02-08 09:25:12 UTC (rev 864)
+++ trunk/mud/grrmud/server/command5.cc 2007-02-08 19:18:38 UTC (rev 865)
@@ -37,7 +37,6 @@
#include "spec_prc.h"
#include "spells.h"
#include "skills.h"
-#include <fstream.h>
#include "batl_prc.h"
#include <PtrArray.h>
#include <unistd.h>
Modified: trunk/mud/grrmud/server/commands.cc
===================================================================
--- trunk/mud/grrmud/server/commands.cc 2007-02-08 09:25:12 UTC (rev 864)
+++ trunk/mud/grrmud/server/commands.cc 2007-02-08 19:18:38 UTC (rev 865)
@@ -30,8 +30,6 @@
#include "dam_spll.h"
#include "ez_spll.h"
#include "trv_spll.h"
-#include <iostream.h>
-#include <fstream.h>
#include "commands.h"
#include "command2.h"
#include "command5.h"
Modified: trunk/mud/grrmud/server/grrmud.cc
===================================================================
--- trunk/mud/grrmud/server/grrmud.cc 2007-02-08 09:25:12 UTC (rev 864)
+++ trunk/mud/grrmud/server/grrmud.cc 2007-02-08 19:18:38 UTC (rev 865)
@@ -50,8 +50,8 @@
#include <fcntl.h>
#include <signal.h>
#include <limits.h>
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
#include <strings.h>
#include <string2.h>
#include <list2.h>
Modified: trunk/mud/grrmud/server/load_wld.cc
===================================================================
--- trunk/mud/grrmud/server/load_wld.cc 2007-02-08 09:25:12 UTC (rev 864)
+++ trunk/mud/grrmud/server/load_wld.cc 2007-02-08 19:18:38 UTC (rev 865)
@@ -25,8 +25,6 @@
#include "misc.h"
#include "commands.h"
-#include <iostream.h>
-#include <fstream.h>
#include <stdio.h>
#include "classes.h"
#include "olc2.h"
Modified: trunk/mud/grrmud/server/misc.cc
===================================================================
--- trunk/mud/grrmud/server/misc.cc 2007-02-08 09:25:12 UTC (rev 864)
+++ trunk/mud/grrmud/server/misc.cc 2007-02-08 19:18:38 UTC (rev 865)
@@ -25,8 +25,6 @@
#include "command4.h"
#include <time.h>
-#include <iostream.h>
-#include <fstream.h>
#include "commands.h"
#include "battle.h"
#include "misc.h"
Modified: trunk/mud/grrmud/server/obj_parse.cc
===================================================================
--- trunk/mud/grrmud/server/obj_parse.cc 2007-02-08 09:25:12 UTC (rev 864)
+++ trunk/mud/grrmud/server/obj_parse.cc 2007-02-08 19:18:38 UTC (rev 865)
@@ -31,7 +31,6 @@
#include "misc.h"
#include "misc2.h"
-#include <fstream.h>
#include <stdio.h>
#include "classes.h"
#include "rm_parse.h"
Modified: trunk/mud/grrmud/server/parse.cc
===================================================================
--- trunk/mud/grrmud/server/parse.cc 2007-02-08 09:25:12 UTC (rev 864)
+++ trunk/mud/grrmud/server/parse.cc 2007-02-08 19:18:38 UTC (rev 865)
@@ -46,7 +46,7 @@
#include "olc.h"
#include "olc2.h"
#include "socials.h"
-#include <fstream.h>
+#include <fstream>
#include <stdio.h>
#include "classes.h"
#include "wep_skll.h"
Modified: trunk/mud/grrmud/server/rm_parse.cc
===================================================================
--- trunk/mud/grrmud/server/rm_parse.cc 2007-02-08 09:25:12 UTC (rev 864)
+++ trunk/mud/grrmud/server/rm_parse.cc 2007-02-08 19:18:38 UTC (rev 865)
@@ -31,7 +31,6 @@
#include "misc.h"
#include "misc2.h"
-#include <fstream.h>
#include <stdio.h>
#include "classes.h"
#include "rm_parse.h"
Modified: trunk/mud/grrmud/server/room.cc
===================================================================
--- trunk/mud/grrmud/server/room.cc 2007-02-08 09:25:12 UTC (rev 864)
+++ trunk/mud/grrmud/server/room.cc 2007-02-08 19:18:38 UTC (rev 865)
@@ -39,7 +39,7 @@
#include "zone.h"
#include "load_wld.h"
#include "Filters.h"
-#include <map.h>
+#include <map>
int KeywordPair::_cnt = 0;
Modified: trunk/mud/grrmud/server/script.cc
===================================================================
--- trunk/mud/grrmud/server/script.cc 2007-02-08 09:25:12 UTC (rev 864)
+++ trunk/mud/grrmud/server/script.cc 2007-02-08 19:18:38 UTC (rev 865)
@@ -41,7 +41,6 @@
#include "spec_prc.h"
#include "spells.h"
#include "skills.h"
-#include <fstream.h>
#include "batl_prc.h"
#include <PtrArray.h>
#include <unistd.h>
Modified: trunk/mud/lib/bitfield/bitfield.cc
===================================================================
--- trunk/mud/lib/bitfield/bitfield.cc 2007-02-08 09:25:12 UTC (rev 864)
+++ trunk/mud/lib/bitfield/bitfield.cc 2007-02-08 19:18:38 UTC (rev 865)
@@ -1,5 +1,5 @@
// $Id$
-// $Revision: 1.10 $ $Author$ $Date$
+// $Revision$ $Author$ $Date$
//
//ScryMUD Server Code
@@ -29,7 +29,6 @@
modification */
#include "bitfield.h"
-#include <iostream.h>
static const short int_len = 8 * sizeof(unsigned short int);
Modified: trunk/mud/lib/bitfield/bitfield.h
===================================================================
--- trunk/mud/lib/bitfield/bitfield.h 2007-02-08 09:25:12 UTC (rev 864)
+++ trunk/mud/lib/bitfield/bitfield.h 2007-02-08 19:18:38 UTC (rev 865)
@@ -1,5 +1,5 @@
// $Id$
-// $Revision: 1.9 $ $Author$ $Date$
+// $Revision$ $Author$ $Date$
//
//ScryMUD Server Code
@@ -27,8 +27,8 @@
#ifndef BEN__BITFIELD_INCLUDE
#define BEN__BITFIELD_INCLUDE
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
#include <string2.h> //my string class
#define MAX_BIT_ALLOWED 65000
Modified: trunk/mud/lib/containers/rb_tree.cc
===================================================================
--- trunk/mud/lib/containers/rb_tree.cc 2007-02-08 09:25:12 UTC (rev 864)
+++ trunk/mud/lib/containers/rb_tree.cc 2007-02-08 19:18:38 UTC (rev 865)
@@ -1,5 +1,5 @@
// $Id$
-// $Revision: 1.4 $ $Author$ $Date$
+// $Revision$ $Author$ $Date$
//
//ScryMUD Server Code
@@ -27,7 +27,7 @@
#include <stdlib.h>
-#include <iostream.h>
+#include <iostream>
#define True 1
Modified: trunk/mud/lib/log/LogStream.h
===================================================================
--- trunk/mud/lib/log/LogStream.h 2007-02-08 09:25:12 UTC (rev 864)
+++ trunk/mud/lib/log/LogStream.h 2007-02-08 19:18:38 UTC (rev 865)
@@ -1,5 +1,5 @@
// $Id$
-// $Revision: 1.11 $ $Author$ $Date$
+// $Revision$ $Author$ $Date$
//
//Copyright (C) 2001 Ben Greear
@@ -39,8 +39,8 @@
#include <iostream>
#include <fstream>
+#include <string>
#include <stdlib.h>
-#include <string>
#include <stdio.h>
#ifndef LOG_STREAM_INCLUDE
Modified: trunk/mud/lib/log/Makefile
===================================================================
--- trunk/mud/lib/log/Makefile 2007-02-08 09:25:12 UTC (rev 864)
+++ trunk/mud/lib/log/Makefile 2007-02-08 19:18:38 UTC (rev 865)
@@ -26,7 +26,8 @@
cp $< $@
test1:
- g++ -g -fhuge-objects -o test1 test1.cc
+ @echo "Compiling $@"
+ @$(CCC) $(CCFLAGS) -o $@ test1.cc
clean:
rm -f test1
Modified: trunk/mud/lib/string2/string2.h
===================================================================
--- trunk/mud/lib/string2/string2.h 2007-02-08 09:25:12 UTC (rev 864)
+++ trunk/mud/lib/string2/string2.h 2007-02-08 19:18:38 UTC (rev 865)
@@ -1,5 +1,5 @@
// $Id$
-// $Revision: 1.18 $ $Author$ $Date$
+// $Revision$ $Author$ $Date$
//
//Copyright (C) 1998-2001 Ben Greear
@@ -38,9 +38,9 @@
#define TRUE 1
#define FALSE 0
+#include <iostream>
+#include <fstream>
#include <stdio.h>
-#include <iostream.h>
-#include <fstream.h>
#include <string.h>
#include <ctype.h>
#include <sys/types.h>
@@ -48,6 +48,8 @@
#include <LogStream.h>
#include <stdarg.h>
+using namespace std;
+
#define LOGFILE (*(String::getLogFile()))
More information about the ScryMUD
mailing list