Mercurial Mercurial > upstream > oracle > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/dasher-04-dashermodel.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 17719 b8026ad7b90c
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
17719
b8026ad7b90c 2010-03-15 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     1
 
--- dasher-4.11/Src/DasherCore/DasherModel.h-orig	2010-03-15 19:04:18.619960775 -0500
b8026ad7b90c 2010-03-15 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     2
 
+++ dasher-4.11/Src/DasherCore/DasherModel.h	2010-03-15 19:03:58.416196316 -0500
b8026ad7b90c 2010-03-15 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     3
 
@@ -56,7 +56,7 @@ namespace Dasher {
b8026ad7b90c 2010-03-15 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     4
 
 ///             knows the current viewpoint
b8026ad7b90c 2010-03-15 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     5
 
 ///             knows how to evolve the viewpoint
b8026ad7b90c 2010-03-15 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     6
 
 ///
b8026ad7b90c 2010-03-15 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     7
 
-class Dasher::CDasherModel:public CFrameRate, private NoClones
b8026ad7b90c 2010-03-15 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     8
 
+class Dasher::CDasherModel:public Dasher::CFrameRate, private NoClones
b8026ad7b90c 2010-03-15 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     9
 
 {
b8026ad7b90c 2010-03-15 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    10
 
  public:
b8026ad7b90c 2010-03-15 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    11
upstream/oracle/spec-files