X-Git-Url: http://git.buserror.net/cgi-bin/gitweb.cgi?p=polintos%2Fscott%2Fpriv.git;a=blobdiff_plain;f=idlcomp%2Flanguages%2Fc%2B%2B%2Fserver.cc;h=f773e6f604d30f98017e5ff8a04ee88b53e15186;hp=86d1f9ac8e4dcdb3d2f359271e552325bf8b8b73;hb=162bcbe20500026d447471ea289485cc94fcef05;hpb=2e0cf58da9949572c6e334a07bba6774fdb749f9 diff --git a/idlcomp/languages/c++/server.cc b/idlcomp/languages/c++/server.cc index 86d1f9a..f773e6f 100644 --- a/idlcomp/languages/c++/server.cc +++ b/idlcomp/languages/c++/server.cc @@ -2,23 +2,15 @@ // // This software is copyright (c) 2006 Scott Wood . // -// Permission is hereby granted, free of charge, to any person obtaining a copy of -// this software and associated documentation files (the "Software"), to deal with -// the Software without restriction, including without limitation the rights to -// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -// of the Software, and to permit persons to whom the Software is furnished to do -// so, subject to the following condition: +// This software is provided 'as-is', without any express or implied warranty. +// In no event will the authors or contributors be held liable for any damages +// arising from the use of this software. // -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE -// SOFTWARE. +// Permission is hereby granted to everyone, free of charge, to use, copy, +// modify, prepare derivative works of, publish, distribute, perform, +// sublicense, and/or sell copies of the Software, provided that the above +// copyright notice and disclaimer of warranty be included in all copies or +// substantial portions of this software. #include #include @@ -299,8 +291,8 @@ void cpp_output_iface_table_entry(Interface *super, void *arg) ctx.f << ctx.indent; cpp_output_name(ctx.f, super); - ctx.f << "_ns::_guid.l,\n" - << ctx.indent + ctx.f << "_ns::_info,\n" + << ctx.indent << (ctx.cla->concrete_iface->super_to_chain(super) - ctx.chain) * target->pointer_size << '\n';